X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=debian%2Fmonkeysphere.postinst;h=02d63046ff66db0cfc2ffbd457f30cfba4b8131c;hb=8181382eb56607ee13d0eb7848487ac685c5f6cd;hp=d3c3b96fb341e16b10749f92485a2a5b5135acde;hpb=4e5ac7b2fe553ce2f24dacb5d812fa8542bd89ca;p=monkeysphere.git

diff --git a/debian/monkeysphere.postinst b/debian/monkeysphere.postinst
index d3c3b96..02d6304 100755
--- a/debian/monkeysphere.postinst
+++ b/debian/monkeysphere.postinst
@@ -5,30 +5,24 @@
 # Author: Jameson Rollins <jrollins@fifthhorseman.net>
 # 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 "$VARLIB" \
-	--shell '/bin/sh' \
+	--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"/gnupg-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"/gnupg-authentication.conf "$VARLIB"/gnupg-authentication/gpg.conf