From d981da056e776e0756cfddb22f18308b9ab913a5 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sun, 3 Jan 2021 23:14:26 +0100 Subject: [PATCH] fix exchange postinst --- debian/taler-exchange.postrm | 29 ----------------------------- debian/taler-exchange.prerm | 7 +++---- 2 files changed, 3 insertions(+), 33 deletions(-) diff --git a/debian/taler-exchange.postrm b/debian/taler-exchange.postrm index 6fc7c9843..b2d132cfd 100644 --- a/debian/taler-exchange.postrm +++ b/debian/taler-exchange.postrm @@ -15,40 +15,11 @@ pathfind() { return 1 } -apache_remove() { - if [ diff /etc/taler-exchange/apache.conf /etc/apache2/conf-available/taler-exchange.conf >/dev/null 2>&1 ]; - then - rm -f /etc/apache2/conf-available/taler-exchange.conf - fi -} - -nginx_remove() { - if [ diff /etc/taler-exchange/nginx.conf /etc/nginx/conf-available/taler-exchange.conf >/dev/null 2>&1 ]; - then - rm -f /etc/nginx/conf-available/taler-exchange.conf - fi -} - if [ -f /usr/share/debconf/confmodule ]; then . /usr/share/debconf/confmodule fi -if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then - db_version 2.0 - db_get taler-exchange/reconfigure-webserver - webservers="$RET" - for webserver in $webservers; do - webserver=${webserver%,} - if [ "$webserver" = "nginx" ] ; then - nginx_remove - else - apache_remove - fi - done -fi - - case "${1}" in purge) db_version 2.0 diff --git a/debian/taler-exchange.prerm b/debian/taler-exchange.prerm index d1dd90ed3..3ba9986a6 100644 --- a/debian/taler-exchange.prerm +++ b/debian/taler-exchange.prerm @@ -2,11 +2,10 @@ set -e - -if [ -f /usr/share/debconf/confmodule ]; then +if [ -f /usr/share/debconf/confmodule ]; +then . /usr/share/debconf/confmodule fi -. /usr/share/dbconfig-common/dpkg/prerm db_stop -exit 0 \ No newline at end of file +exit 0