commit b7aab78ab124884cac44339203721f9609e56548 Author: Ximin Luo <infinity0@gmx.com> Date: Thu Nov 21 14:17:26 2013 +0000 more specific rm in remove-{secrets,symlinks} and add remove-daemon-data to purge logs and other data - also don't symlink no-longer-existant appengine/README --- facilitator/Makefile.am | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/facilitator/Makefile.am b/facilitator/Makefile.am index 10811e8..9e56a19 100644 --- a/facilitator/Makefile.am +++ b/facilitator/Makefile.am @@ -60,7 +60,7 @@ pre-install: meta-install-sanity install-user post-install: meta-install-sanity install-secrets install-symlinks install-daemon pre-remove: meta-install-sanity remove-daemon remove-symlinks post-remove: meta-install-sanity -pre-purge: pre-remove remove-secrets +pre-purge: pre-remove remove-secrets remove-daemon-data post-purge: post-remove remove-user meta-install-sanity: @@ -74,13 +74,13 @@ install-user: --system \ --group \ --disabled-password \ - --home ${sysconfdir}/flashproxy \ + --home ${pkgconfdir} \ --no-create-home \ --shell /bin/false \ ${fpfacilitatoruser} || \ useradd \ --system \ - --home ${sysconfdir}/flashproxy \ + --home ${pkgconfdir} \ -M \ --shell /bin/false \ ${fpfacilitatoruser} ; } @@ -105,15 +105,19 @@ install-secrets: cat ${exampledir}/reg-email.pass > ${pkgconfdir}/reg-email.pass; } remove-secrets: - rm -f ${pkgconfdir}/reg-* + for i in reg-daemon.key reg-daemon.pub reg-email.pass; do \ + rm -f ${pkgconfdir}/$$i; \ + done install-symlinks: - for i in fp-reg.go app.yaml README; do \ + for i in fp-reg.go app.yaml; do \ $(LN_S) -f ${appenginedir}/$$i ${appengineconfdir}/$$i; \ done remove-symlinks: - rm -rf ${appengineconfdir} + for i in fp-reg.go app.yaml; do \ + rm -f ${appengineconfdir}/$$i; \ + done # initscripts: assume that if the user wanted to install them, then they also # wanted to configure them, and that the system supports them. if this isn't the @@ -141,6 +145,14 @@ if DO_INITSCRIPTS done endif +remove-daemon-data: +if DO_INITSCRIPTS + for i in facilitator facilitator-email-poller facilitator-reg-daemon; do \ + rm -f ${localstatedir}/log/$$i.log* \ + rm -f ${localstatedir}/run/$$i.pid \ + done +endif + .PHONY: pre-install post-install pre-remove post-remove pre-purge post-purge .PHONY: install-user install-secrets install-symlinks install-daemon .PHONY: remove-user remove-secrets remove-symlinks remove-daemon