#140 Remove krb5 config files, and only enable autodiscovery for RHEL6
Closed 7 years ago by puiterwijk. Opened 7 years ago by puiterwijk.
puiterwijk/fedora-packager krb5-config-rhel6  into  master

file modified
-6
@@ -78,9 +78,3 @@ 

  	$(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

file modified
+9 -4
@@ -4,7 +4,7 @@ 

  

  Name:           fedora-packager

  Version:        0.5.10.7

- Release:        1%{?dist}

+ Release:        2%{?dist}

  Summary:        Tools for setting up a fedora maintainer environment

  

  Group:          Applications/Productivity
@@ -19,11 +19,11 @@ 

  Requires:       mock curl openssh-clients

  Requires:       pyOpenSSL

  Requires:       redhat-rpm-config

+ Requires:       pyrpkg >= rpkg-1.46-5

  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

+ Requires:       krb5-workstation

  

  BuildArch:      noarch

  
@@ -58,6 +58,9 @@ 

  make install DESTDIR=$RPM_BUILD_ROOT

  install -d $RPM_BUILD_ROOT%{_libexecdir}

  

+ %post
ausil commented 7 years ago

this looks fragile to be and subject to random reversal in some cases. such as somoen setting up ipa client post install.

+ sed -i -e 's/dns_lookup_kdc = false/dns_lookup_kdc = true/' /etc/krb5.conf

+ 

  

  %clean

  rm -rf $RPM_BUILD_ROOT
@@ -70,7 +73,6 @@ 

  %{_sbindir}/*

  %dir %{_sysconfdir}/koji

  %config(noreplace) %{_sysconfdir}/koji/*

- %config %{_sysconfdir}/krb5.conf.d/*

  %exclude %{_bindir}/fedora-cert

  

  %files -n fedora-cert
@@ -81,6 +83,9 @@ 

  

  

  %changelog

+ * Tue Oct 25 2016 Patrick Uiterwijk <puiterwijk@redhat.com> - 0.5.10.7-2

+ - Use autodiscovery for krb

+ 

  * Wed Aug 10 2016 Patrick Uiterwijk <puiterwijk@redhat.com> - 0.5.10.7-1

  - Add kerberos configuration

  

@@ -1,7 +0,0 @@ 

- [realms]

-  FEDORAPROJECT.ORG = {

-         kdc = https://id.fedoraproject.org/KdcProxy

-  }

- [domain_realm]

-  .fedoraproject.org = FEDORAPROJECT.ORG

-  fedoraproject.org = FEDORAPROJECT.ORG

@@ -1,7 +0,0 @@ 

- [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

This reverts commit 7007fa2.

Signed-off-by: Patrick Uiterwijk puiterwijk@redhat.com

rebased

7 years ago

this looks fragile to be and subject to random reversal in some cases. such as somoen setting up ipa client post install.

Pull-Request has been closed by puiterwijk

7 years ago