Merge commit 'dkg/master'

[monkeysphere.git] / packaging / debian / monkeysphere.preinst

diff --git a/packaging/debian/monkeysphere.preinst b/packaging/debian/monkeysphere.preinst
index 528da84ed9d6b594b4d86a886470becc77b2665b..fd22f6faca5e5ed685ca611eecd3abe3f2c93746 100755 (executable)
--- a/packaging/debian/monkeysphere.preinst
+++ b/packaging/debian/monkeysphere.preinst
@@ -2,25 +2,21 @@
 
 # preinst script for monkeysphere
 
-# Author: Jameson Rollins <jrollins@fifthhorseman.net>
-# Copyright 2008
+# Author: Jameson Rollins <jrollins@finestructure.net>
+# Copyright 2008-2009
 
 ETC="/etc/monkeysphere"
-VARLIB="/var/lib/monkeysphere"
-
-# move the gpg.conf files from the GNUPGHOMEs if they're there to
-# /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"/gpg-authentication.conf
-    chown root:root "$ETC"/gpg-authentication.conf
-    ln -s "$ETC"/gpg-authentication.conf "$VARLIB"/gnupg-authentication/gpg.conf
+
+# move the old server conf file to be the authentication conf file
+if [ -f "$ETC"/monkeysphere-server.conf -a \
+    ! -f "$ETC"/monkeysphere-authentication.conf ] ; then
+    mv "$ETC"/monkeysphere-server.conf "$ETC"/monkeysphere-authentication.conf
 fi
 
+# remove the old gpg-*.conf files
+rm -f "$ETC"/gpg-host.conf
+rm -f "$ETC"/gpg-authentication.conf
+
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.