[DRE-commits] [diaspora-installer] 01/01: copy config files from /usr/share to /var

[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 50fb411dde00818db504d10556e294b482982c2c
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sun Jul 10 11:48:52 2016 +0530

    copy config files from /usr/share to /var
---
 debian/changelog                |  7 +++++++
 debian/diaspora-common.install  |  4 ++--
 debian/diaspora-common.postinst |  2 ++
 diaspora-common.conf            |  4 +++-
 grantpriv.sh                    |  3 +++
 set-env-diaspora.sh             | 10 +++++-----
 6 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 01161dd..a8a121e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+diaspora-installer (0.5.9.1+debian2) unstable; urgency=medium
+
+  * Install diaspora.conf and database.yml to /usr/share, copy to /var
+    and modify (Closes: #820073)
+
+ -- Pirate Praveen <praveen at debian.org>  Sun, 10 Jul 2016 11:48:41 +0530
+
 diaspora-installer (0.5.9.1+debian1) unstable; urgency=medium
 
   * Install 0.5.9.1 version
diff --git a/debian/diaspora-common.install b/debian/diaspora-common.install
index 2f12d5d..1817f0f 100644
--- a/debian/diaspora-common.install
+++ b/debian/diaspora-common.install
@@ -1,9 +1,9 @@
 adduser.sh usr/lib/diaspora-common/scripts
-debian/database.yml /var/lib/diaspora-common/
+debian/database.yml /usr/share/diaspora-common/
 diaspora-common.conf /etc/diaspora
 diaspora-download.sh usr/lib/diaspora-common/scripts
 diaspora-versions.sh usr/lib/diaspora-common/scripts
-diaspora.conf /var/lib/diaspora-common/
+diaspora.conf /usr/share/diaspora-common/
 debian/diaspora.yml etc/diaspora
 grantpriv.sh usr/lib/diaspora-common/scripts
 rake-tasks.sh usr/lib/diaspora-common/scripts
diff --git a/debian/diaspora-common.postinst b/debian/diaspora-common.postinst
index 82429af..869fc66 100755
--- a/debian/diaspora-common.postinst
+++ b/debian/diaspora-common.postinst
@@ -70,6 +70,8 @@ case "$1" in
                 echo "SSL disabled, skip nginx configuration for ${RET}..."
                 if ! grep SERVERNAME ${diaspora_conf}
                 then
+		    test -f ${diaspora_conf_private} ||\
+		    cp ${diaspora_conf_example} ${diaspora_conf_private}
                     echo export SERVERNAME=${RET} >> ${diaspora_conf_private}
                     export SERVERNAME=${RET}
                     echo export ENVIRONMENT_URL="http://$SERVERNAME:3000" >> ${diaspora_conf_private}
diff --git a/diaspora-common.conf b/diaspora-common.conf
index 61244c9..2ee2858 100644
--- a/diaspora-common.conf
+++ b/diaspora-common.conf
@@ -3,8 +3,10 @@ export diaspora_version=0.5.9.1
 export diaspora_release_type=tag
 export github_archive_url=https://github.com/diaspora/diaspora/archive
 export diaspora_user=diaspora
-export diaspora_conf=/etc/diaspora.conf
+export diaspora_conf_example=/usr/share/diaspora-common/diaspora.conf
 export diaspora_conf_private=/var/lib/diaspora-common/diaspora.conf
+export diaspora_conf=/etc/diaspora.conf
+export diaspora_database_yml_example=/usr/share/diaspora-common/database.yml
 export diaspora_database_yml_private=/var/lib/diaspora-common/database.yml
 export diaspora_database_yml=/etc/diaspora/database.yml
 export diaspora_home=/usr/share/diaspora
diff --git a/grantpriv.sh b/grantpriv.sh
index feb24bb..52ba417 100755
--- a/grantpriv.sh
+++ b/grantpriv.sh
@@ -8,6 +8,9 @@ dbname=diaspora_production
 # Find out dbtype and run only for pgsql
 test -f /etc/dbconfig-common/diaspora-common.conf && . /etc/dbconfig-common/diaspora-common.conf
 
+test -f ${diaspora_database_yml_private} ||\
+cp ${diaspora_database_yml_example} ${diaspora_database_yml_private}
+
 if [ "$dbc_dbtype" = "mysql" ]; then
   # Switch to mysql adapter, ugly hack, see #818863
   sed -i 's/DB=postgres/DB=mysql/' ${diaspora_conf}
diff --git a/set-env-diaspora.sh b/set-env-diaspora.sh
index 23bf3bf..a1e09e2 100755
--- a/set-env-diaspora.sh
+++ b/set-env-diaspora.sh
@@ -3,14 +3,14 @@
 # Read configuration from file
 . /etc/diaspora/diaspora-common.conf
 echo "Using ${diaspora_conf}..."
-if ! grep RAILS_ENV ${diaspora_conf}
-	then echo export RAILS_ENV=production >> ${diaspora_conf}
+if ! grep RAILS_ENV ${diaspora_conf_private}
+	then echo export RAILS_ENV=production >> ${diaspora_conf_private}
 fi
 
-if ! grep DB ${diaspora_conf} 
-		then echo export DB=postgres >> ${diaspora_conf}
+if ! grep DB ${diaspora_conf_private} 
+	then echo export DB=postgres >> ${diaspora_conf_private}
 fi
 	
 # source diaspora variables	
-. ${diaspora_conf}
+. ${diaspora_conf_private}
 

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