diff options
| author | Jameson Graef Rollins <jrollins@phys.columbia.edu> | 2008-10-11 15:56:18 -0400 |
|---|---|---|
| committer | Jameson Graef Rollins <jrollins@phys.columbia.edu> | 2008-10-11 16:14:31 -0400 |
| commit | c76c8c71fa9e3106dcf2431144e58466113af654 (patch) | |
| tree | 9890090fa5bf0b697ef27afa399d84f15b53b656 /debian | |
| parent | 936daca4a597838563eccc47b3ec415eaca00666 (diff) | |
fix the *inst scripts to properly handle linking in the gpg.conf files.
Diffstat (limited to 'debian')
| -rwxr-xr-x | debian/monkeysphere.postinst | 4 | ||||
| -rwxr-xr-x | debian/monkeysphere.preinst | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/debian/monkeysphere.postinst b/debian/monkeysphere.postinst index 0e36186..27a50e0 100755 --- a/debian/monkeysphere.postinst +++ b/debian/monkeysphere.postinst @@ -20,9 +20,9 @@ fi # install host gnupg home directory install --owner root --group monkeysphere --mode 750 -d "$VARLIB"/gnupg-host # link in the gpg.conf -ln -sf "$ETC"/gnupg-host.conf "$VARLIB"/gnupg-host/gpg.conf +ln -sTf "$ETC"/gpg-host.conf "$VARLIB"/gnupg-host/gpg.conf # install authentication gnupg home directory install --owner monkeysphere --group monkeysphere --mode 700 -d "$VARLIB"/gnupg-authentication # link in the gpg.conf -ln -sf "$ETC"/gnupg-authentication.conf "$VARLIB"/gnupg-authentication/gpg.conf +ln -sTf "$ETC"/gpg-authentication.conf "$VARLIB"/gnupg-authentication/gpg.conf diff --git a/debian/monkeysphere.preinst b/debian/monkeysphere.preinst index bfa6a91..860286b 100755 --- a/debian/monkeysphere.preinst +++ b/debian/monkeysphere.preinst @@ -12,7 +12,11 @@ VARLIB="/var/lib/monkeysphere" # /etc, where they will be linked back into the GNUPGHOMEs later if [ -f "$VARLIB"/gnupg-host/gpg.conf -a ! -L "$VARLIB"/gnupg-host/gpg.conf ] ; then mv "$VARLIB"/gnupg-host/gpg.conf "$ETC"/gpg-host.conf + chown root:root "$ETC"/gpg-host.conf + ln -s "$ETC"/gpg-host.conf "$VARLIB"/gnupg-host/gpg.conf fi if [ -f "$VARLIB"/gnupg-authentication/gpg.conf -a ! -L "$VARLIB"/gnupg-authentication/gpg.conf ] ; then - mv "$VARLIB"/gnupg-authentication/gpg.conf "$ETC"/gnupg-authentication.conf + mv "$VARLIB"/gnupg-authentication/gpg.conf "$ETC"/gpg-authentication.conf + chown root:root "$ETC"/gpg-authentication.conf + ln -s "$ETC"/gpg-authentication.conf "$VARLIB"/gnupg-authentication/gpg.conf fi |