fix apache2 related lintian issues

This commit is contained in:
Timo Aaltonen
2014-10-15 15:26:24 +03:00
parent b03cf5ab09
commit 2480ff9cdb
4 changed files with 15 additions and 12 deletions

View File

@@ -1,4 +1,4 @@
etc/apache2/conf-enabled/* etc/apache2/conf-available/*
etc/default/ipa-memcached etc/default/ipa-memcached
etc/ipa/html/* etc/ipa/html/*
lib/systemd/system/* lib/systemd/system/*

View File

@@ -2,7 +2,10 @@
set -e set -e
if [ "$1" = configure ]; then if [ "$1" = configure ]; then
/usr/sbin/a2enmod auth_kerb expires headers proxy rewrite if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
. /usr/share/apache2/apache2-maintscript-helper
apache2_invoke enmod auth_kerb expires headers proxy rewrite || exit $?
fi
fi fi
#DEBHELPER# #DEBHELPER#

View File

@@ -68,12 +68,12 @@ Date: Fri Mar 1 12:21:00 2013 +0200
+ HTTPD_ALIAS_DIR = "/etc/apache2/nssdb" + HTTPD_ALIAS_DIR = "/etc/apache2/nssdb"
+ ALIAS_CACERT_ASC = "/etc/apache2/nssdb/cacert.asc" + ALIAS_CACERT_ASC = "/etc/apache2/nssdb/cacert.asc"
+ ALIAS_PWDFILE_TXT = "/etc/apache2/nssdb/pwdfile.txt" + ALIAS_PWDFILE_TXT = "/etc/apache2/nssdb/pwdfile.txt"
+ HTTPD_CONF_D_DIR = "/etc/apache2/conf-enabled/" + HTTPD_CONF_D_DIR = "/etc/apache2/conf-available/"
+ HTTPD_IPA_PKI_PROXY_CONF = "/etc/apache2/conf-enabled/ipa-pki-proxy.conf" + HTTPD_IPA_PKI_PROXY_CONF = "/etc/apache2/conf-available/ipa-pki-proxy.conf"
+ HTTPD_IPA_REWRITE_CONF = "/etc/apache2/conf-enabled/ipa-rewrite.conf" + HTTPD_IPA_REWRITE_CONF = "/etc/apache2/conf-available/ipa-rewrite.conf"
+ HTTPD_IPA_CONF = "/etc/apache2/conf-enabled/ipa.conf" + HTTPD_IPA_CONF = "/etc/apache2/conf-available/ipa.conf"
+ HTTPD_NSS_CONF = "/etc/apache2/mods-enabled/nss.conf" + HTTPD_NSS_CONF = "/etc/apache2/mods-available/nss.conf"
+ HTTPD_SSL_CONF = "/etc/apache2/conf-enabled/ssl.conf" + HTTPD_SSL_CONF = "/etc/apache2/conf-available/ssl.conf"
+ IPA_KEYTAB = "/etc/apache2/ipa.keytab" + IPA_KEYTAB = "/etc/apache2/ipa.keytab"
+ HTTPD_PASSWORD_CONF = "/etc/apache2/password.conf" + HTTPD_PASSWORD_CONF = "/etc/apache2/password.conf"
+ SYSCONFIG_PKI = "/etc/dogtag/" + SYSCONFIG_PKI = "/etc/dogtag/"

8
debian/rules vendored
View File

@@ -68,13 +68,13 @@ ifneq ($(ONLY_CLIENT), 1)
mkdir -m 700 $(DESTDIR)/var/lib/ipa/backup mkdir -m 700 $(DESTDIR)/var/lib/ipa/backup
mkdir -p $(DESTDIR)/etc/apache2/conf-enabled \ mkdir -p $(DESTDIR)/etc/apache2/conf-available \
$(DESTDIR)/etc/bash_completion.d \ $(DESTDIR)/etc/bash_completion.d \
$(DESTDIR)/etc/default \ $(DESTDIR)/etc/default \
$(DESTDIR)/usr/share/ipa/html $(DESTDIR)/usr/share/ipa/html
touch $(DESTDIR)/etc/apache2/conf-enabled/ipa.conf touch $(DESTDIR)/etc/apache2/conf-available/ipa.conf
touch $(DESTDIR)/etc/apache2/conf-enabled/ipa-pki-proxy.conf touch $(DESTDIR)/etc/apache2/conf-available/ipa-pki-proxy.conf
touch $(DESTDIR)/etc/apache2/conf-enabled/ipa-rewrite.conf touch $(DESTDIR)/etc/apache2/conf-available/ipa-rewrite.conf
touch $(DESTDIR)/usr/share/ipa/html/krb5.ini touch $(DESTDIR)/usr/share/ipa/html/krb5.ini
install -m 0644 contrib/completion/ipa.bash_completion $(DESTDIR)/etc/bash_completion.d/ipa install -m 0644 contrib/completion/ipa.bash_completion $(DESTDIR)/etc/bash_completion.d/ipa
install -m 0644 init/ipa_memcached.conf $(DESTDIR)/etc/default/ipa-memcached install -m 0644 init/ipa_memcached.conf $(DESTDIR)/etc/default/ipa-memcached