X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=debian%2Fmonkeysphere.postinst;h=27a50e00017f70bb94407f78f6b54b8ae4686d56;hb=1b6ebcddf8226ad4aa29da643060b6410030cf5d;hp=ad96a22bb6a04c498d20c29cee06c01400bb64a6;hpb=dfe9a2c7b13a037f161a55daae52e4cccdae463f;p=monkeysphere.git

diff --git a/debian/monkeysphere.postinst b/debian/monkeysphere.postinst
index ad96a22..27a50e0 100755
--- a/debian/monkeysphere.postinst
+++ b/debian/monkeysphere.postinst
@@ -3,32 +3,26 @@
 # postinst script for monkeysphere
 
 # Author: Jameson Rollins <jrollins@fifthhorseman.net>
-# (c) 2008
+# Copyright 2008
 
+ETC="/etc/monkeysphere"
 VARLIB="/var/lib/monkeysphere"
 
 if ! getent passwd monkeysphere >/dev/null ; then
     echo "adding monkeysphere user..."
     adduser --quiet --system --no-create-home --group \
-	--home '/var/lib/monkeysphere' \
-	--shell '/bin/sh' \
+	--home "$VARLIB" \
+	--shell '/bin/bash' \
 	--gecos 'monkeysphere authentication user,,,' \
 	monkeysphere
 fi
 
 # install host gnupg home directory
 install --owner root --group monkeysphere --mode 750 -d "$VARLIB"/gnupg-host
-# install host gpg.conf
-cat <<EOF > "$VARLIB"/gnupg-host/gpg.conf
-list-options show-uid-validity
-EOF
+# link in the 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
-# install authentication gpg.conf
-cat <<EOF > "$VARLIB"/gnupg-authentication/gpg.conf
-list-options show-uid-validity
-primary-keyring $VARLIB/gnupg-authentication/pubring.gpg
-keyring $VARLIB/gnupg-host/pubring.gpg
-EOF
-chown monkeysphere:monkeysphere "$VARLIB"/gnupg-authentication/gpg.conf
+# link in the gpg.conf
+ln -sTf "$ETC"/gpg-authentication.conf "$VARLIB"/gnupg-authentication/gpg.conf