[DRE-commits] [diaspora-installer] 03/12: remove version specific postinst

[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 896f000dee415f0b495195485369a144f3175bb1
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sat Aug 27 23:41:10 2016 +0530

    remove version specific postinst
---
 debian/postinst | 84 ++++++++++++++++-----------------------------------------
 rake-tasks.sh   |  4 ---
 2 files changed, 23 insertions(+), 65 deletions(-)

diff --git a/debian/postinst b/debian/postinst
index ab4cc24..134463b 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -28,14 +28,17 @@ set -e
 # Run migrations are start diaspora
 
 migrate() {
+	echo "Initializing database..."
+	su diaspora -s /bin/sh -c 'bundle exec rake db:create db:schema:load'
+
 	echo "Running migrations..."
         su diaspora -s /bin/sh -c 'bundle exec rake db:migrate'
-        su diaspora -s /bin/sh -c 'bundle exec rake tmp:cache:clear assets:precompile'
+	su diaspora -s /bin/sh -c 'bundle exec rake tmp:cache:clear assets:precompile'
         echo "Remove backup..."
         rm -rf ${diaspora_home}-backup.*
 
         echo "Starting diaspora..."
-        invoke-rc.d diaspora start
+        service diaspora reload
 }
 
 install_gems() {
@@ -52,65 +55,24 @@ case "$1" in
         # Source varibales
 	. /etc/diaspora/diaspora-common.conf
 	cd ${diaspora_home}
-        if ! test -z $2
-        then
-            # Find our major and minor versions of diaspora
-            . /usr/lib/diaspora-common/scripts/diaspora-versions.sh
-
-            if test $(echo "${installed_diaspora_major_version} < 0.5" |bc) -eq 1
-            then
-                # source diaspora variables	
-                . ${diaspora_conf}
-                echo "This update involves long running migrations..."
-                echo "Some migrations may take upto 2 hours in large pods..."
-               # Download diaspora from github
-                . /usr/lib/diaspora-common/scripts/diaspora-download.sh
-
-	        cd ${diaspora_home}
-
-                install_gems
-
-                su diaspora -s /bin/sh -c 'bundle install'
-                su diaspora -s /bin/sh -c "sed -i s/Rails.application.config.secret_token/Diaspora::Application.config.secret_key_base/ ${diaspora_home}/config/initializers/secret_token.rb"
-		migrate
-            else
-                if test $(echo "${installed_diaspora_minor_version} < ${diaspora_minor_version}" |bc) -eq 1
-                then
-                    # Download diaspora from github
-                    . /usr/lib/diaspora-common/scripts/diaspora-download.sh
-
-	            cd ${diaspora_home}
-                    # source diaspora variables	
-                    . ${diaspora_conf}
-		    install_gems
-
-                    su diaspora -s /bin/sh -c 'bundle install --without development test'
-		    migrate
-                else
-                    echo "This version is already installed..."
-                fi
-            fi
-        else
-            # Download diaspora from github
-            . /usr/lib/diaspora-common/scripts/diaspora-download.sh
-	    cd ${diaspora_home}
-            echo "Setting up environment varibales..."
-	    . /usr/lib/diaspora-common/scripts/set-env-diaspora.sh
-	    echo RAILS_ENV=$RAILS_ENV DB=$DB ENVIRONMENT_URL=$ENVIRONMENT_URL
-
-            install_gems
-
-	    echo "Installing gems with rubygems ..."
-	    sudo -u diaspora -E -H bundle install --path vendor/bundle --without development test
-
-#	echo "Setting up secret_token..."
-#	if ! grep config.secret_token ${diaspora_home}/config/initializers/secret_token.rb
-#		then 
-#		echo Diaspora::Application.config.secret_token = \'$(sudo -u diaspora -E bundle exec rake secret)\' >> ${diaspora_home}/config/initializers/secret_token.rb
-#	fi
-	    echo "Running final rake tasks..."
-	    . /usr/lib/diaspora-common/scripts/rake-tasks.sh
-        fi
+        # Download diaspora from github
+        . /usr/lib/diaspora-common/scripts/diaspora-download.sh
+	cd ${diaspora_home}
+        echo "Setting up environment varibales..."
+	. /usr/lib/diaspora-common/scripts/set-env-diaspora.sh
+	echo RAILS_ENV=$RAILS_ENV DB=$DB ENVIRONMENT_URL=$ENVIRONMENT_URL
+
+        # Install special case gems
+        install_gems
+
+	echo "Installing gems with rubygems ..."
+	sudo -u diaspora -E -H bundle install --path vendor/bundle --without development test
+
+	echo "Running migrations..."
+	migrate
+
+	echo "Running final rake tasks..."
+	. /usr/lib/diaspora-common/scripts/rake-tasks.sh
         ;;
 
         abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/rake-tasks.sh b/rake-tasks.sh
index 832c224..ec18a06 100755
--- a/rake-tasks.sh
+++ b/rake-tasks.sh
@@ -2,10 +2,6 @@
 # Read configuration values	
 . /etc/diaspora/diaspora-common.conf
 
-echo "Initializing database..."
-su diaspora -s /bin/sh -c 'bundle exec rake db:create db:schema:load'
-echo "Precompiling assets..."
-su diaspora -s /bin/sh -c 'bundle exec rake assets:precompile'
 su diaspora -s /bin/sh -c 'touch public/source.tar.gz'
 
 #Starting diaspora service...

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