2 files changed, 6 insertions, 4 deletions
diff --git a/debian/anastasis-httpd.postinst b/debian/anastasis-httpd.postinst
index 6caf699..9f65341 100644
--- a/debian/anastasis-httpd.postinst
+++ b/debian/anastasis-httpd.postinst
@@ -31,12 +31,9 @@ configure)
     adduser --quiet --system --ingroup ${_GROUPNAME} --no-create-home --home ${ANASTASIS_HOME} ${_USERNAME}
   fi
 
-  if ! dpkg-statoverride --list /etc/anastasis/secrets/anastasis-db.secret.conf >/dev/null 2>&1; then
-    dpkg-statoverride --add --update \
+  dpkg-statoverride --add --update \
       anastasis-httpd root 460 \
       /etc/anastasis/secrets/anastasis-db.secret.conf
-  fi
-
   ;;
 
 abort-upgrade | abort-remove | abort-deconfigure) ;;
diff --git a/debian/anastasis-httpd.postrm b/debian/anastasis-httpd.postrm
index 3dd76af..ee84d38 100644
--- a/debian/anastasis-httpd.postrm
+++ b/debian/anastasis-httpd.postrm
@@ -2,6 +2,8 @@
 
 set -e
 
+_USERNAME=anastasis-httpd
+
 if [ -f /usr/share/debconf/confmodule ]; then
   . /usr/share/debconf/confmodule
 fi
@@ -10,6 +12,9 @@ case "${1}" in
 purge)
   rm -rf /var/lib/anastasis/httpd/
   rm -f /etc/anastasis/override.conf
+  deluser --system --quiet ${_USERNAME} || true
+  dpkg-statoverride --remove \
+     /etc/anastasis/secrets/anastasis-db.secret.conf || true
   ;;
 remove | upgrade | failed-upgrade | abort-install | abort-upgrade | disappear)
   ;;