[DRE-commits] [diaspora-installer] 04/08: move variables to diaspora-common.conf

[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 abcfff0f205c7dcb6c4a58cb0024b3467152d035
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sun Jan 11 14:10:25 2015 +0530

    move variables to diaspora-common.conf
---
 debian/diaspora-common.install | 1 +
 debian/postinst                | 9 +--------
 diaspora-common.conf           | 8 ++++++++
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/debian/diaspora-common.install b/debian/diaspora-common.install
index 9dee7f3..28e7abc 100644
--- a/debian/diaspora-common.install
+++ b/debian/diaspora-common.install
@@ -1,3 +1,4 @@
 adduser.sh usr/lib/diaspora-common/scripts
 grantpriv.sh usr/lib/diaspora-common/scripts
 set-env-nginx.sh usr/lib/diaspora-common/scripts
+diaspora-common.conf /etc/diaspora
diff --git a/debian/postinst b/debian/postinst
index 434e31d..bd8b97a 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -36,14 +36,7 @@ dbc_go diaspora-installer $@
 
 case "$1" in
     configure)
-	export diaspora_version=0.4.1.2
-	export diaspora_user=diaspora
-	export diaspora_conf=/etc/diaspora.conf
-	export diaspora_home=/usr/share/diaspora
-	export diaspora_cache=/var/cache/diaspora-installer
-	export diaspora_scripts=/usr/lib/diaspora-common/scripts
-	export diaspora_nginx_log=/var/log/diaspora
-
+	. /etc/diaspora-common.conf
 	${diaspora_scripts}/adduser.sh
 	${diaspora_scripts}/grantpriv.sh
 	mkdir -p ${diaspora_nginx_log}
diff --git a/diaspora-common.conf b/diaspora-common.conf
new file mode 100644
index 0000000..54e1dea
--- /dev/null
+++ b/diaspora-common.conf
@@ -0,0 +1,8 @@
+export diaspora_version=0.4.1.2
+export diaspora_user=diaspora
+export diaspora_conf=/etc/diaspora.conf
+export diaspora_home=/usr/share/diaspora
+export diaspora_cache=/var/cache/diaspora-installer
+export diaspora_scripts=/usr/lib/diaspora-common/scripts
+export diaspora_nginx_log=/var/log/diaspora
+export diaspora_ssl_path=/etc/diaspora/ssl

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