Changeset 1113

Timestamp:

Nov 10, 2010, 10:33:49 AM (12 years ago)

Author:

work@…

Message:

some fixes / improvements in the deploy script

File:

• misc/scripts/deploy.sh (modified) (5 diffs)

misc/scripts/deploy.sh

@@ -90 +90 @@
 SVN=`which svn`
 DEV_PLUGINS=( nadd-neutralizer )
-MANAGER_URL=http://$TYPE.manager.nmcdsp.org/manager/html/undeploy?path=
+#MANAGER_URL=http://$TYPE.manager.nmcdsp.org/manager/html/undeploy?path=
+MANAGER_URL=http://$TYPE.manager.nmcdsp.org/manager/html
 MANAGER_USER=ci
 MANAGER_PASSWORD=berterni3
-# Keys registered by t.w.abma[at]umcutrecht address (gscf.nmcdsp.org)
-OAUTHKEY=Xhu1RtLtB43yIy29EYw
-OAUTHSECRET=gYO5ps6JLDMEdJLOQkSBoTTbq11s8CrORqvrBkc6k
-
-# Keys registered by t.w.abma[at]gmail address (gscf.nmcdsp.org)
-#OAUTHKEY=M07bnXDthzcbWD7KKSlDYw
-#OAUTHSECRET=odfnT08AUBYhh2z0PVMS9JT11D2jASwGNzAj9YFk7s
 
 # are we user tomcat?
@@ -124 +118 @@
 #SVN_REVISION=`$SVN update .| sed -n 's/At revision \(.*\)\./\1/p'`
 SVN_REVISION=`$SVN update|sed -n 's/At revision \(.*\)\./\1/p'`
+SVN_REVISION=`$SVN update|sed -n 's/At revision \(.*\)\./\1/p'`
 RUNNING_REVISION=`cat $TEMP/$PROJECT-$TYPE.revision`
 
@@ -131 +126 @@
         # builds to stop building because they have
         # the same revision...
+        echo $STAMP setting internal old revision to 0 so that deployment will always happen...
         RUNNING_REVISION=0
 fi
@@ -235 +231 @@
 echo $STAMP setting build information variables in application.properties
 TIMESTAMP=`date +'%s'`
-sed -i 's/app\.build\.type=\w\+/app.build.type=$TYPE/gi' application.properties
+sed -i 's/app\.build\.type=\w\+/app.build.type='$TYPE'/gi' application.properties
 sed -i 's/app\.build\.timestamp=\w\+/app.build.timestamp='$TIMESTAMP'/gi' application.properties
 sed -i 's/app\.build\.svn\.revision=\w\+/app.build.svn.revision='$SVN_REVISION'/gi' application.properties
@@ -245 +241 @@
 
 # patch datasource.groovy
-echo $STAMP patching datasource for $TYPE instance
-sed -i 's/5432\/'$PROJECT'/5432\/'$PROJECT'-$TYPE/g' grails-app/conf/DataSource.groovy
+#echo $STAMP patching datasource for $TYPE instance
+#sed -i 's/5432\/'$PROJECT'/5432\/'$PROJECT'-'$TYPE'/g' grails-app/conf/DataSource.groovy
 
 # patch Searchable
-if [ -f grails-app/conf/Searchable.groovy ]; then
-        echo $STAMP patching searchable configuration for $TYPE instance
-        sed -i 's/$PROJECT/$PROJECT-$TYPE/gi' grails-app/conf/Searchable.groovy
-fi
-
-# adding patch for OAuth configuration file (consumer key and consumer secret generated by myExperiment).
-if [ "$PROJECT" = "gscf" ]
-then
-        echo $STAMP GSCF project given as argument, patching Config.groovy with OAuth [key:$OAUTHKEY, SECRET:$OAUTHSECRET]...
-        sed -i 's/\$oauthkey\$/'$OAUTHKEY'/gi' grails-app/conf/Config.groovy
-        sed -i 's/\$oauthsecret\$/'$OAUTHSECRET'/gi' grails-app/conf/Config.groovy
-fi
+#if [ -f grails-app/conf/Searchable.groovy ]; then
+#       echo $STAMP patching searchable configuration for $TYPE instance
+#       sed -i 's/'$PROJECT'/'$PROJECT'-'$TYPE'/gi' grails-app/conf/Searchable.groovy
+#fi
 
 # build new war
 PWD=$(pwd)
 echo $STAMP current workdirectory: $PWD
-echo $STAMP building new war...
-grails prod war --non-interactive > /dev/null
-
-# undeploying gscf releases
-echo $STAMP undeploying $PROJECT-$OLD_APP_VERSION-ci
-curl --silent --user $MANAGER_USER:$MANAGER_PASSWORD --url $MANAGER_URL/$PROJECT-$OLD_APP_VERSION-ci > /dev/null
+echo $STAMP building new $TYPE war...
+grails -Dgrails.env=$TYPE war --non-interactive > /dev/null
+
+# stopping old release
+echo $STAMP stopping $PROJECT-$OLD_APP_VERSION-$TYPE
+curl --silent --user $MANAGER_USER:$MANAGER_PASSWORD --url $MANAGER_URL/stop?path=/$PROJECT-$OLD_APP_VERSION-ci > /dev/null
 sleep 5
 
+# undeploying old release
+echo $STAMP undeploying $PROJECT-$OLD_APP_VERSION-$TYPE
+curl --silent --user $MANAGER_USER:$MANAGER_PASSWORD --url $MANAGER_URL/undeploy?path=/$PROJECT-$OLD_APP_VERSION-ci > /dev/null
+sleep 5
+
 # deploying new build
-echo $STAMP deploying new production WAR
+echo $STAMP deploying new $TYPE WAR
 cp target/$PROJECT-$APP_VERSION.war $PATH_TOMCAT_WEBAPPS/$PROJECT-$APP_VERSION-$TYPE.war