From 5d9e91f20216702ad675244465157ad54cde75a4 Mon Sep 17 00:00:00 2001 From: Jameson Graef Rollins Date: Sat, 31 Jan 2009 21:25:37 -0500 Subject: [PATCH] remove things i think will no longer be needed from the debian packaging scripts. --- packaging/debian/monkeysphere.postinst | 17 +++++------------ packaging/debian/monkeysphere.postrm | 4 ++-- packaging/debian/monkeysphere.preinst | 20 ++------------------ packaging/debian/monkeysphere.prerm | 11 ++--------- 4 files changed, 11 insertions(+), 41 deletions(-) diff --git a/packaging/debian/monkeysphere.postinst b/packaging/debian/monkeysphere.postinst index 8f1fe77..c697ae2 100755 --- a/packaging/debian/monkeysphere.postinst +++ b/packaging/debian/monkeysphere.postinst @@ -2,12 +2,12 @@ # postinst script for monkeysphere -# Author: Jameson Rollins -# Copyright 2008 +# Author: Jameson Rollins +# Copyright 2008-2009 -ETC="/etc/monkeysphere" VARLIB="/var/lib/monkeysphere" +# add a monkeysphere user if one does not already exist if ! getent passwd monkeysphere >/dev/null ; then echo "adding monkeysphere user..." adduser --quiet --system --no-create-home --group \ @@ -17,15 +17,8 @@ if ! getent passwd monkeysphere >/dev/null ; then monkeysphere fi -# install host gnupg home directory -install --owner root --group monkeysphere --mode 750 -d "$VARLIB"/gnupg-host -# 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 -# link in the gpg.conf -ln -sTf "$ETC"/gnupg-authentication.conf "$VARLIB"/gnupg-authentication/gpg.conf +# import the host ssh key into the monkeysphere, with no expiration +# FIXME: figure out how to do this best # dh_installdeb will replace this with shell code automatically # generated by other debhelper scripts. diff --git a/packaging/debian/monkeysphere.postrm b/packaging/debian/monkeysphere.postrm index 7c0fede..79f7245 100755 --- a/packaging/debian/monkeysphere.postrm +++ b/packaging/debian/monkeysphere.postrm @@ -2,8 +2,8 @@ # postrm script for monkeysphere -# Author: Jameson Rollins -# Copyright 2008 +# Author: Jameson Rollins +# Copyright 2008-2009 case $1 in purge) diff --git a/packaging/debian/monkeysphere.preinst b/packaging/debian/monkeysphere.preinst index 528da84..73c4169 100755 --- a/packaging/debian/monkeysphere.preinst +++ b/packaging/debian/monkeysphere.preinst @@ -2,24 +2,8 @@ # preinst script for monkeysphere -# Author: Jameson Rollins -# Copyright 2008 - -ETC="/etc/monkeysphere" -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 -fi +# Author: Jameson Rollins +# Copyright 2008-2009 # dh_installdeb will replace this with shell code automatically # generated by other debhelper scripts. diff --git a/packaging/debian/monkeysphere.prerm b/packaging/debian/monkeysphere.prerm index 00523a1..1fb2636 100755 --- a/packaging/debian/monkeysphere.prerm +++ b/packaging/debian/monkeysphere.prerm @@ -2,15 +2,8 @@ # prerm script for monkeysphere -# Author: Jameson Rollins -# Copyright 2008 - -VARLIB="/var/lib/monkeysphere" - -rm -f "$VARLIB"/gnupg-host/gpg.conf -rm -f "$VARLIB"/gnupg-authentication/gpg.conf -rmdir --ignore-fail-on-non-empty "$VARLIB"/gnupg-host -rmdir --ignore-fail-on-non-empty "$VARLIB"/gnupg-authentication +# Author: Jameson Rollins +# Copyright 2008-2009 # dh_installdeb will replace this with shell code automatically # generated by other debhelper scripts. -- 2.25.1