[DRE-commits] [diaspora-installer] 01/02: prvide diaspora.conf inside the package

[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 e2981a52cd991440da97e092aa86e78f4cc4422b
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sun May 10 22:31:32 2015 +0530

    prvide diaspora.conf inside the package
---
 debian/changelog               | 6 ++++++
 debian/diaspora-common.config  | 2 +-
 debian/diaspora-common.install | 1 +
 diaspora.conf                  | 2 ++
 set-env-nginx.sh               | 2 +-
 5 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b9dc18c..651ce06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+diaspora-installer (0.5.0.1+debian2) UNRELEASED; urgency=medium
+
+  * Provide diaspora.conf from diaspora-common (so it gets removed when purged)
+
+ -- Pirate Praveen <praveen at debian.org>  Sun, 10 May 2015 22:20:38 +0530
+
 diaspora-installer (0.5.0.1+debian1) unstable; urgency=medium
 
   * Make SSL configuration optional
diff --git a/debian/diaspora-common.config b/debian/diaspora-common.config
index 87168e7..ed708ca 100644
--- a/debian/diaspora-common.config
+++ b/debian/diaspora-common.config
@@ -29,7 +29,7 @@ else
 	# Configure pod address.
 	db_get diaspora-common/url
 	echo "SSL disabled, skip nginx configuration for ${RET}..."
-	if ! test -f /etc/diaspora.conf
+	if ! grep SERVERNAME /etc/diaspora.conf
         then
 		echo export SERVERNAME=${RET} >> /etc/diaspora.conf
 	        export SERVERNAME=${RET}
diff --git a/debian/diaspora-common.install b/debian/diaspora-common.install
index bd32766..45cf63f 100644
--- a/debian/diaspora-common.install
+++ b/debian/diaspora-common.install
@@ -4,5 +4,6 @@ set-env-nginx.sh usr/lib/diaspora-common/scripts
 set-env-diaspora.sh usr/lib/diaspora-common/scripts
 rake-tasks.sh usr/lib/diaspora-common/scripts
 diaspora-common.conf /etc/diaspora
+diaspora.conf /etc
 database.yml usr/share/diaspora/config
 diaspora.yml usr/share/diaspora/config
diff --git a/diaspora.conf b/diaspora.conf
new file mode 100644
index 0000000..85e65d3
--- /dev/null
+++ b/diaspora.conf
@@ -0,0 +1,2 @@
+export RAILS_ENV=production
+export DB=postgres
diff --git a/set-env-nginx.sh b/set-env-nginx.sh
index 200eff3..61ae76d 100755
--- a/set-env-nginx.sh
+++ b/set-env-nginx.sh
@@ -10,7 +10,7 @@ fi
 
 nginx_conf_example=/usr/share/doc/diaspora-common/nginx.conf.example
  
-if ! test -f ${diaspora_conf}
+if ! grep SERVERNAME ${diaspora_conf}
 	then 
 		echo export SERVERNAME=$1 >> ${diaspora_conf}
 		export SERVERNAME=$1

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