[DRE-commits] [diaspora-installer] 01/05: stop diaspora before and start after upgrdaes

[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 ea7531e8cee923ee844784e41010775f33e15ca7
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Thu Aug 27 17:48:00 2015 +0530

    stop diaspora before and start after upgrdaes
---
 debian/postinst | 26 ++++++++++++++------------
 debian/preinst  |  4 ++--
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/debian/postinst b/debian/postinst
index 93c14d0..0c62a56 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -25,6 +25,18 @@ set -e
 #     installation fails and the `postinst' is called with `abort-upgrade',
 #     `abort-remove' or `abort-deconfigure'.
 
+# Run migrations are start diaspora
+
+migrate() {
+	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'
+        echo "Remove backup..."
+        rm -rf ${diaspora_home}-backup.*
+
+        echo "Starting diaspora..."
+        invoke-rc.d diaspora start
+}
 
 case "$1" in
     configure)
@@ -51,15 +63,7 @@ case "$1" in
 
                 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"
-                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'
-                echo "Remove backup..."
-                rm -rf ${diaspora_home}-backup.*
-
-                echo "Starting diaspora..."
-                invoke-rc.d diaspora start
-                 
+		migrate
             else
                 if test $(echo "${installed_diaspora_minor_version} < ${diaspora_minor_version}" |bc) -eq 1
                 then
@@ -73,9 +77,7 @@ case "$1" in
                     gem install bundler
 
                     su diaspora -s /bin/sh -c 'bundle install --without development test'
-                    echo "Running migrations..."
-                    su diaspora -s /bin/sh -c 'bundle exec rake db:migrate'
-                    su diaspora -s /bin/sh -c 'bundle exec rake assets:precompile'
+		    migrate
                 else
                     echo "This version is already installed..."
                 fi
diff --git a/debian/preinst b/debian/preinst
index 9a9c7ea..d4dacd9 100755
--- a/debian/preinst
+++ b/debian/preinst
@@ -37,13 +37,13 @@ case "$1" in
     upgrade)
         if ! test -z $dbexist
         then
+            echo "Stopping diaspora..."
+            invoke-rc.d diaspora stop
             # Show current version of package
             installed_diaspora_version=`echo $2|cut -d+ -f1`
             installed_diaspora_major_version=`echo ${installed_diaspora_version} |cut -d. -f1,2`
             if test $(echo "${installed_diaspora_major_version} < 0.5" |bc) -eq 1
             then
-                echo "Stopping diaspora..."
-                invoke-rc.d diaspora stop
                 cd ${diaspora_home}
                 . ${diaspora_conf}
                 echo "Run bundle install..." 

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