-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