summaryrefslogtreecommitdiff
path: root/packaging/freebsd/pkg-install
diff options
context:
space:
mode:
authorMatt Goins <mjgoins@openflows.com>2008-10-29 12:20:42 -0400
committerMatt Goins <mjgoins@openflows.com>2008-10-29 12:20:42 -0400
commit680d7340d29d16325eb991feb37885d6faa955e2 (patch)
tree928830b83f7b248c448ccc7309aaa45ceecba8ba /packaging/freebsd/pkg-install
parent1b6ebcddf8226ad4aa29da643060b6410030cf5d (diff)
parent6ed72efb63d7111acc7fb1f2e4f28757ad485b77 (diff)
Merge commit 'dkg/master'
Diffstat (limited to 'packaging/freebsd/pkg-install')
-rwxr-xr-xpackaging/freebsd/pkg-install15
1 files changed, 5 insertions, 10 deletions
diff --git a/packaging/freebsd/pkg-install b/packaging/freebsd/pkg-install
index 5e520cd..d7e4dbe 100755
--- a/packaging/freebsd/pkg-install
+++ b/packaging/freebsd/pkg-install
@@ -15,6 +15,7 @@
# MySQL puts its data in /var/db/mysql
VARLIB="/var/monkeysphere"
+ETCDIR="/usr/local/etc/monkeysphere"
case $2 in
POST-INSTALL)
@@ -56,20 +57,14 @@ POST-INSTALL)
fi
fi
- ## set up the cache directories:
+ ## set up the cache directories, and link them to the config files:
install -d -o root -g monkeysphere -m 750 "$VARLIB"/gnupg-host
- cat <<EOF > "$VARLIB"/gnupg-host/gpg.conf
-list-options show-uid-validity
-EOF
+ ln -sf "$ETCDIR"/gnupg-host.conf "$VARLIB"/gnupg-host/gpg.conf
install -d -o monkeysphere -g monkeysphere -m 700 "$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
+ ln -sf "$ETCDIR"/gnupg-authentication.conf "$VARLIB"/gnupg-authentication/gpg.conf
+
chown monkeysphere:monkeysphere "$VARLIB"/gnupg-authentication/gpg.conf
monkeysphere-server diagnostics