[DRE-commits] [diaspora-installer] 07/23: handle nginx configuration via ucf

[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 f69854aa2348af455acd782d054535e04426d345
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue Jan 24 23:29:46 2017 +0530

    handle nginx configuration via ucf
---
 debian/diaspora-common.postrm | 6 ++++++
 set-env-nginx.sh              | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/debian/diaspora-common.postrm b/debian/diaspora-common.postrm
index db314e2..27f3378 100644
--- a/debian/diaspora-common.postrm
+++ b/debian/diaspora-common.postrm
@@ -21,6 +21,7 @@ case "$1" in
     
     rm -rf /var/lib/diaspora-common/diaspora.conf
     rm -rf /var/lib/diaspora-common/database.yml
+    rm -rf /var/lib/diaspora-common/nginx-site-diaspora
 
     # Remove diversion
     # ldconfig is NOT needed during removal of a library, only during
@@ -46,21 +47,26 @@ case "$1" in
     for ext in '~' '%' .bak .ucf-new .ucf-old .ucf-dist;  do
 	rm -f /etc/diaspora.conf$ext
 	rm -f /etc/diaspora/database.yml$ext
+	rm -f /etc/nginx/sites-available/diaspora$ext
     done
  
     # remove the configuration file itself
     rm -f /etc/diaspora.conf
     rm -f /etc/diaspora/database.yml
+    rm -f /etc/nginx/sites-available/diaspora
+    rm -f /etc/nginx/sites-enabled/diaspora
     rm -rf /etc/diaspora/ssl
 
     # 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
+        ucf --purge /etc/nginx/sites-available/diaspora
     fi    
     if which ucfr >/dev/null; then
         ucfr --purge diaspora-common /etc/diaspora.conf
         ucfr --purge diaspora-common /etc/diaspora/database.yml
+        ucfr --purge diaspora-common /etc/nginx/sites-available/diaspora
     fi    
 
     ;;
diff --git a/set-env-nginx.sh b/set-env-nginx.sh
index 9bb36b0..7e531f5 100755
--- a/set-env-nginx.sh
+++ b/set-env-nginx.sh
@@ -7,6 +7,7 @@ fi
 
 # Read configuration values
 . /etc/diaspora/diaspora-common.conf
+nginx-site-private=/var/lib/diaspora-common/nginx-site-diaspora
 
 if test -f /etc/nginx/sites-available/diaspora; then
   echo "/etc/nginx/sites-available/diaspora already exist, skipping nginx configuration..."
@@ -14,8 +15,10 @@ else
   if test -f ${nginx_conf_example}; then
     sed -e "s/SERVERNAME_FIXME/$1/g" -e "s/DIASPORA_SSL_PATH_FIXME/\\/etc\\/diaspora/"\
     -e "s/DIASPORA_ROOT_FIXME/\\/usr\\/share\\/diaspora/"\
-    ${nginx_conf_example} >/etc/nginx/sites-available/diaspora
+    ${nginx_conf_example} > ${nginx-site-private}
+    ucf --debconf-ok --three-way ${nginx-site-private} /etc/nginx/sites-available/diaspora
     ln -fs /etc/nginx/sites-available/diaspora /etc/nginx/sites-enabled/
+    ucfr diaspora-common /etc/nginx/sites-available/diaspora
   else
     echo "nginx.conf.example not found"
     exit 1

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