From 7007fa293c6b9e2c225745d6591ee318f8d46936 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Aug 11 2016 14:22:58 +0000 Subject: Add krb5 configuration files Signed-off-by: Patrick Uiterwijk --- diff --git a/Makefile.am b/Makefile.am index 971b825..0ed368e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -78,3 +78,9 @@ kojiconf_DATA = $(srcdir)/configs/arm-config \ $(srcdir)/configs/s390-config \ $(srcdir)/configs/stg-config kojiconfdir = $(sysconfdir)/koji + +EXTRA_DIST += krb-configs/fedoraproject_org \ + krb-configs/stg_fedoraproject_org +krb5conf_DATA = $(srcdir)/krb-configs/fedoraproject_org \ + $(srcdir)/krb-configs/stg_fedoraproject_org +krb5confdir = $(sysconfdir)/krb5.conf.d diff --git a/fedora-packager.spec b/fedora-packager.spec index 6f4fd7d..825de7e 100644 --- a/fedora-packager.spec +++ b/fedora-packager.spec @@ -3,7 +3,7 @@ %endif Name: fedora-packager -Version: 0.5.10.6 +Version: 0.5.10.7 Release: 1%{?dist} Summary: Tools for setting up a fedora maintainer environment @@ -22,6 +22,8 @@ Requires: redhat-rpm-config Requires: fedpkg >= 1.0 Requires: fedora-cert = %{version}-%{release} Requires: python-yubico +# This is the version in which SNI was fixed +Requires: krb5-workstation >= 1.14.3-4 BuildArch: noarch @@ -68,6 +70,7 @@ rm -rf $RPM_BUILD_ROOT %{_sbindir}/* %dir %{_sysconfdir}/koji %config(noreplace) %{_sysconfdir}/koji/* +%config %{_sysconfdir}/krb5.conf.d/* %exclude %{_bindir}/fedora-cert %files -n fedora-cert @@ -78,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Aug 10 2016 Patrick Uiterwijk - 0.5.10.7-1 +- Add kerberos configuration + * Tue Aug 11 2015 Patrick Uiterwijk - 0.5.10.6-1 - Reworked yubikey code to use python-yubico rather than subprocess (puiterwijk) - Use python API to write yubikey (puiterwijk) diff --git a/krb-configs/fedoraproject_org b/krb-configs/fedoraproject_org new file mode 100644 index 0000000..4f1342d --- /dev/null +++ b/krb-configs/fedoraproject_org @@ -0,0 +1,7 @@ +[realms] + FEDORAPROJECT.ORG = { + kdc = https://id.fedoraproject.org/KdcProxy + } +[domain_realm] + .fedoraproject.org = FEDORAPROJECT.ORG + fedoraproject.org = FEDORAPROJECT.ORG diff --git a/krb-configs/stg_fedoraproject_org b/krb-configs/stg_fedoraproject_org new file mode 100644 index 0000000..1d7b132 --- /dev/null +++ b/krb-configs/stg_fedoraproject_org @@ -0,0 +1,7 @@ +[realms] + STG.FEDORAPROJECT.ORG = { + kdc = https://id.stg.fedoraproject.org/KdcProxy + } +[domain_realm] + .stg.fedoraproject.org = STG.FEDORAPROJECT.ORG + stg.fedoraproject.org = STG.FEDORAPROJECT.ORG