Build: fix KDC proxy installation and remove unused kdcproxy.conf

The only useful file is /etc/ipa/kdcproxy/kdcproxy.conf so I've removed
the other copy of the file in /usr.

https://fedorahosted.org/freeipa/ticket/6418

Reviewed-By: Martin Basti <mbasti@redhat.com>
Reviewed-By: Christian Heimes <cheimes@redhat.com>
This commit is contained in:
Petr Spacek
2016-11-04 14:00:01 +01:00
committed by Martin Babinsky
parent 4ce3aa3b12
commit 75a944e980
2 changed files with 4 additions and 6 deletions

View File

@@ -796,10 +796,6 @@ mkdir -p %{buildroot}%{_initrddir}
# Web UI plugin dir
mkdir -p %{buildroot}%{_usr}/share/ipa/ui/js/plugins
# KDC proxy config (Apache config sets KDCPROXY_CONFIG to load this file)
mkdir -p %{buildroot}%{_sysconfdir}/ipa/kdcproxy/
install -m 644 install/share/kdcproxy.conf %{buildroot}%{_sysconfdir}/ipa/kdcproxy/kdcproxy.conf
mkdir -p %{buildroot}%{_libdir}/krb5/plugins/libkrb5
touch %{buildroot}%{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so
@@ -1176,7 +1172,6 @@ fi
%{_usr}/share/ipa/ipa.conf
%{_usr}/share/ipa/ipa-rewrite.conf
%{_usr}/share/ipa/ipa-pki-proxy.conf
%{_usr}/share/ipa/kdcproxy.conf
%ghost %attr(0644,root,apache) %config(noreplace) %{_usr}/share/ipa/html/ca.crt
%ghost %attr(0644,root,apache) %{_usr}/share/ipa/html/kerberosauth.xpi
%ghost %attr(0644,root,apache) %{_usr}/share/ipa/html/krb.con

View File

@@ -83,11 +83,14 @@ dist_app_DATA = \
sasl-mapping-fallback.ldif \
schema-update.ldif \
vault.ldif \
kdcproxy.conf \
kdcproxy-enable.uldif \
kdcproxy-disable.uldif \
ipa-httpd.conf.template
kdcproxyconfdir = $(IPA_SYSCONF_DIR)/kdcproxy
dist_kdcproxyconf_DATA = \
kdcproxy.conf
MAINTAINERCLEANFILES = \
*~ \
Makefile.in