[DRE-commits] [diaspora-installer] 14/55: remove pristine suffix, we won't support both

[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 687cfe9219e753e8f0f4805292b6cec71a1e4d9e
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue Dec 2 18:25:20 2014 +0530

    remove pristine suffix, we won't support both
---
 debian/config   | 14 +++++++-------
 debian/install  |  4 ++--
 debian/postinst | 15 ++++++++-------
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/debian/config b/debian/config
index b5d4bc6..7c44c4b 100644
--- a/debian/config
+++ b/debian/config
@@ -10,8 +10,8 @@ set -e
 if [ -f /usr/share/dbconfig-common/dpkg/config.pgsql ]; then
    . /usr/share/dbconfig-common/dpkg/config.pgsql
 
-   dbc_dbname="diaspora_pristine_production"
-   dbc_dbuser="diasporapristine"
+   dbc_dbname="diaspora_production"
+   dbc_dbuser="diaspora"
 
    dbc_go diaspora-installer $@
 fi
@@ -22,12 +22,12 @@ db_go
 
 # Configure pod address.
 db_get diaspora-installer/url
-if ! test -f /etc/diaspora-pristine.conf
+if ! test -f /etc/diaspora.conf
 	then 
-		echo export SERVERNAME=$RET >> /etc/diaspora-pristine.conf
-		echo export ENVIRONMENT_URL=https://$SERVERNAME >> /etc/diaspora-pristine.conf
-		sed -e "s/SERVERNAME_FIXME/$RET/" -e "s/DIASPORA_SSL_PATH_FIXME/\\/etc\\/diaspora-pristine/" -e "s/DIASPORA_ROOT_FIXME/\\/usr\\/share\\/diaspora-pristine/" /usr/share/doc/diaspora-installer/nginx.conf.example >/etc/nginx/sites-available/pristine-$RET
-		ln -fs /etc/nginx/sites-available/pristine-$RET /etc/nginx/sites-enabled/
+		echo export SERVERNAME=$RET >> /etc/diaspora.conf
+		echo export ENVIRONMENT_URL=https://$SERVERNAME >> /etc/diaspora.conf
+		sed -e "s/SERVERNAME_FIXME/$RET/" -e "s/DIASPORA_SSL_PATH_FIXME/\\/etc\\/diaspora/" -e "s/DIASPORA_ROOT_FIXME/\\/usr\\/share\\/diaspora/" /usr/share/doc/diaspora-installer/nginx.conf.example >/etc/nginx/sites-available/$RET
+		ln -fs /etc/nginx/sites-available/$RET /etc/nginx/sites-enabled/
 fi
 
 if [ "$RET" = "false" ]; then
diff --git a/debian/install b/debian/install
index eca6d7f..8ae8c4d 100644
--- a/debian/install
+++ b/debian/install
@@ -1,4 +1,4 @@
 debian/adduser.sh usr/lib/diaspora-installer/scripts
 debian/grantpriv.sh usr/lib/diaspora-installer/scripts
-debian/database.yml usr/share/diaspora-pristine/config
-debian/diaspora.yml usr/share/diaspora-pristine/config
+debian/database.yml usr/share/diaspora/config
+debian/diaspora.yml usr/share/diaspora/config
diff --git a/debian/postinst b/debian/postinst
index 587eb07..64e6eed 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -29,8 +29,8 @@ set -e
 . /usr/share/debconf/confmodule
 . /usr/share/dbconfig-common/dpkg/postinst.pgsql
 
-dbc_dbname="diaspora_pristine_production"
-dbc_dbuser="diasporapristine"
+dbc_dbname="diaspora_production"
+dbc_dbuser="diaspora"
 
 dbc_go diaspora-installer $@
 
@@ -39,11 +39,12 @@ case "$1" in
 
 	/usr/lib/diaspora-installer/scripts/adduser.sh
 	/usr/lib/diaspora-installer/scripts/grantpriv.sh
-	mkdir -p /var/log/diaspora-pristine
-	chown -R diasporapristine: /usr/share/diaspora-pristine
-	cd /usr/share/diaspora-pristine
-	echo "Cloning diaspora..."
-	sudo -u diasporapristine git clone -b master git://github.com/diaspora/diaspora.git .
+	mkdir -p /var/log/diaspora
+	chown -R diaspora: /usr/share/diaspora
+	cd /usr/share/diaspora
+	echo "Download diaspora..."
+	wget -O /var/cache/diaspora-installer/diaspora-0.4.1.2.tar.gz https://github.com/diaspora/diaspora/archive/v0.4.1.2.tar.gz
+	exit 1
 	echo "Installing gems with rubygems ..."
 	
 	if ! grep RAILS_ENV /etc/diaspora-pristine.conf

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