[DRE-commits] [diaspora-installer] 02/15: remove database.yml on purge

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository diaspora-installer.

commit d78fbaf2377428ab7cfa8eb9496cda553387e5ad
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue Sep 27 09:18:46 2016 +0530

    remove database.yml on purge
---
 debian/changelog              | 3 ++-
 debian/diaspora-common.postrm | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 68a9358..7b385f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 diaspora-installer (0.6.0.0+debian3) UNRELEASED; urgency=medium
 
-  * Fix SERVERNAME variable creation 
+  * Fix SERVERNAME variable creation
+  * Remove database.yml on purge 
 
  -- Pirate Praveen <praveen at debian.org>  Tue, 27 Sep 2016 09:15:31 +0530
 
diff --git a/debian/diaspora-common.postrm b/debian/diaspora-common.postrm
index fe72dad..bf77be4 100644
--- a/debian/diaspora-common.postrm
+++ b/debian/diaspora-common.postrm
@@ -34,17 +34,21 @@ case "$1" in
     ### Some of the following is from Tore Anderson:
     for ext in '~' '%' .bak .ucf-new .ucf-old .ucf-dist;  do
 	rm -f /etc/diaspora.conf$ext
+	rm -f /etc/diaspora/database.yml$ext
     done
  
     # remove the configuration file itself
     rm -f /etc/diaspora.conf
+    rm -f /etc/diaspora/database.yml
 
     # and finally clear it out from the ucf database
     if which ucf >/dev/null; then
         ucf --purge /etc/diaspora.conf
+        ucf --purge /etc/diaspora/database.yml
     fi    
     if which ucfr >/dev/null; then
         ucfr --purge diaspora-common /etc/diaspora.conf
+        ucfr --purge diaspora-common /etc/diaspora/database.yml
     fi    
 
     ;;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/diaspora-installer.git