diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2008-10-29 02:46:44 -0400 |
|---|---|---|
| committer | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2008-10-29 02:46:44 -0400 |
| commit | 4885662fcaaad9a065a5ef43e0e243609ee8ac60 (patch) | |
| tree | d1f3233fbf3e034b63609b1058cac7348bb97149 /packaging/freebsd/pkg-install | |
| parent | 37c5b03dbe70f8f3fe24d15318645e1678841879 (diff) | |
fixing symlinks created in packaging; updated FreeBSD port to handle centrally-linked gpg.conf files too.
Diffstat (limited to 'packaging/freebsd/pkg-install')
| -rwxr-xr-x | packaging/freebsd/pkg-install | 15 |
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 |