IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

drop generate-rndc-key.sh, bind generates the keyfile already

Browse Source
This commit is contained in:
Timo Aaltonen
2016-03-28 00:35:43 +03:00
parent 0bae0fe6a0
commit c171947a9d
4 changed files with 1 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
debian/freeipa-server.install vendored
View File

@@ -26,7 +26,6 @@ usr/lib/*/krb5/plugins/kdb/*.so
usr/lib/certmonger/dogtag-ipa-ca-renew-agent-submit
usr/lib/certmonger/ipa-server-guard
usr/lib/ipa/certmonger/*
usr/lib/ipa/generate-rndc-key.sh
usr/lib/ipa/ipa-dnskeysync-replica
usr/lib/ipa/ipa-dnskeysyncd
usr/lib/ipa/ipa-httpd-kdcproxy

19
debian/generate-rndc-key.sh vendored
View File

@@ -1,19 +0,0 @@
#!/bin/bash
. /lib/lsb/init-functions
# This script generates /etc/bind/rndc.key if doesn't exist AND if there is no rndc.conf
if [ ! -s /etc/rndc.key -a ! -s /etc/rndc.conf ]; then
echo -n $"Generating /etc/bind/rndc.key:"
if /usr/sbin/rndc-confgen -a -r /dev/urandom > /dev/null 2>&1; then
chmod 640 /etc/bind/rndc.key
chown root.bind /etc/bind/rndc.key
[ -x /sbin/restorecon ] && /sbin/restorecon /etc/bind/rndc.key
log_success_msg "/etc/bind/rndc.key generation"
echo
else
log_failure_msg $"/etc/bind/rndc.key generation"
echo
fi
fi

2
debian/patches/add-debian-platform.diff vendored
View File

@@ -238,7 +238,7 @@ Date: Fri Mar 1 12:21:00 2013 +0200
+ DOGTAG_IPA_CA_RENEW_AGENT_SUBMIT = "/usr/lib/certmonger/dogtag-ipa-ca-renew-agent-submit"
+ DOGTAG_IPA_RENEW_AGENT_SUBMIT = "/usr/lib/certmonger/dogtag-ipa-renew-agent-submit"
+ IPA_SERVER_GUARD = "/usr/lib/certmonger/ipa-server-guard"
+ GENERATE_RNDC_KEY = "/usr/lib/ipa/generate-rndc-key.sh"
+ GENERATE_RNDC_KEY = "/bin/true"
+ IPA_DNSKEYSYNCD_REPLICA = "/usr/lib/ipa/ipa-dnskeysync-replica"
+ IPA_DNSKEYSYNCD = "/usr/lib/ipa/ipa-dnskeysyncd"
+ IPA_ODS_EXPORTER = "/usr/lib/ipa/ipa-ods-exporter"

1
debian/rules vendored
View File

@@ -93,7 +93,6 @@ ifneq ($(ONLY_CLIENT), 1)
install -m 0644 init/systemd/ipa.service $(DESTDIR)/lib/systemd/system
install -m 0644 init/systemd/ipa-custodia.service $(DESTDIR)/lib/systemd/system
install -m 0644 contrib/completion/ipa.bash_completion $(DESTDIR)/usr/share/bash-completion/completions/ipa
install -m 0755 debian/generate-rndc-key.sh $(DESTDIR)/usr/lib/ipa
for i in $(DESTDIR)/etc/oddjobd.conf.d/ipa-server.conf \
$(DESTDIR)/etc/oddjobd.conf.d/oddjobd-ipa-trust.conf; do \