diff options
| author | Rob Austein <sra@hactrn.net> | 2013-02-04 05:36:12 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2013-02-04 05:36:12 +0000 |
| commit | 1e2bfc38278f05b2dab3005c2ca1f611e9503687 (patch) | |
| tree | 485f19b744c8b1364cdf684468b063a41f4ae57a | |
| parent | f6902e5ab90e8927b01dbb102270e7bf8386cefa (diff) | |
Tweak directory ownerships on Debian install, and add a few more bits
to rpki-ca.upstart while we're at it.
svn path=/branches/tk377/; revision=5025
| -rw-r--r-- | buildtools/debian-package-skeleton.py | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/buildtools/debian-package-skeleton.py b/buildtools/debian-package-skeleton.py index 43042d72..777f4618 100644 --- a/buildtools/debian-package-skeleton.py +++ b/buildtools/debian-package-skeleton.py @@ -528,20 +528,29 @@ author "Rob Austein <sra@hactrn.net>" # welcome, but please first read the Python code to understand what it # is doing. -# Our only real dependency is on mysqld. +# Our only real dependencies are on mysqld and our config file. start on started mysql stop on stopping mysql pre-start script - install -m 755 -o rpki -g rpki -d /var/run/rpki - sudo -u rpki /usr/sbin/rpki-start-servers + if test -f /etc/rpki.conf + then + install -m 755 -o rpki -g rpki -d /var/run/rpki + sudo -u rpki /usr/sbin/rpki-start-servers + else + stop + exit 0 + fi end script post-stop script for i in rpkid pubd irdbd rootd do - [ -f /var/run/rpki/$i.pid ] && kill `/bin/cat /var/run/rpki/$i.pid` + if test -f /var/run/rpki/$i.pid + then + kill `cat /var/run/rpki/$i.pid` + fi done end script ''') @@ -590,7 +599,11 @@ with open('debian/rpki-rp.postinst', "wb") as f: set -e setup_rcynic_ownership() { - chown rcynic:rcynic /var/rcynic/data /var/rcynic/rpki-rtr + install -o rcynic -g rcynic -d /var/rcynic/data /var/rcynic/rpki-rtr /var/rcynic/rpki-rtr + if test -d /var/www + then + install -o rcynic -g rcynic -d /var/www/rcynic + fi } setup_rcynic_user() { |