February 2014 - Adminsys-commits - mailman.cloud.codelutin.com

r51 - in scripts: maven-release redmine-tools
by tchemit＠users.forge.codelutin.com Feb. 28, 2014

Feb. 28, 2014

Author: tchemit Date: 2014-02-28 17:59:28 +0100 (Fri, 28 Feb 2014) New Revision: 51 Url: http://codelutin.com/projects/adminsys/repository/revisions/51 Log: refs #4147 am?\195?\169lioration du nightly cron Added: scripts/maven-release/clean-nightly-builds.sh scripts/maven-release/cron-nightly-build scripts/maven-release/deploy-nightly-snapshot-site.sh Removed: scripts/redmine-tools/nightly-clean.sh scripts/redmine-tools/nightly-site-deploy.sh Copied: scripts/maven-release/clean-nightly-builds.sh (from rev 38, scripts/redmine-tools/nightly-clean.sh) =================================================================== --- scripts/maven-release/clean-nightly-builds.sh (rev 0) +++ scripts/maven-release/clean-nightly-builds.sh 2014-02-28 16:59:28 UTC (rev 51) @@ -0,0 +1,28 @@ +#! /bin/sh + +# nettoye les projets de toutes les forges + +forges="nuiton.org chorem.org codelutin.com" +forgesContainer=/home/maven-release/projets + +for forge in $forges ; do + for p in $( ls $forgesContainer/$forge ) ; do + forgeBasedir=$forgesContainer/$forge + if [ -f $forgeBasedir/$p/pom.xml ]; then + # directly on a svn path + #logger -id -p cron.info [nightly-maven-clean] clean $forge/$p + (cd $forgeBasedir/$p ; mvn clean >/dev/null) + else + if [ -d $forgeBasedir/$p ]; then + # try on a subdir (this is a directory) + for i in $(find $forgeBasedir/$p/* -maxdepth 0 -type d); do + if [ -f "$i/pom.xml" ]; then + # found a project + #logger -id -p cron.info [nightly-maven-clean] clean $forge/$p/$(basename $i) + (cd $i ; mvn clean >/dev/null) + fi + done + fi + fi + done +done Added: scripts/maven-release/cron-nightly-build =================================================================== --- scripts/maven-release/cron-nightly-build (rev 0) +++ scripts/maven-release/cron-nightly-build 2014-02-28 16:59:28 UTC (rev 51) @@ -0,0 +1,5 @@ +#! /bin/sh + +./deploy-nightly-builds-to-demo.sh +./deploy-nightly-snapshot-site.sh +./clean-nightly-builds.sh Copied: scripts/maven-release/deploy-nightly-snapshot-site.sh (from rev 38, scripts/redmine-tools/nightly-site-deploy.sh) =================================================================== --- scripts/maven-release/deploy-nightly-snapshot-site.sh (rev 0) +++ scripts/maven-release/deploy-nightly-snapshot-site.sh 2014-02-28 16:59:28 UTC (rev 51) @@ -0,0 +1,19 @@ +#! /bin/sh +MAILTO=dev(a)codelutin.com + +# deploie les site pour tous les projets marque dans /var/cache/redmine/nightly-build/x/y.site +# ou x est le nom de la forge et y le nom du projet +# le projet doit alors se trouver dans /home/maven-release/projets/x/y +# Une fois le site deployee, on supprimer le fichier de marquage + +cachedir=/var/cache/redmine/nightly-build +for forge in $( ls $cachedir ) ; do + for f in $( ls $cachedir/$forge | grep .site ) ; do + project=$(basename $f .site) + logfile=/var/log/nightly-site-deploy-$forge-$project.log + date >> $logFile + msgerror="Probleme de construction du site du projet '$project' de la forge '$forge'.\nPlus de detailles sur goh:$logFile" + ./deploy-snapshot-site.sh $forge $project >> $logFile 2>&1 || echo -e $msgerror + rm -rfv $cachedir/$forge/$f >> $logFile + done +done Deleted: scripts/redmine-tools/nightly-clean.sh =================================================================== --- scripts/redmine-tools/nightly-clean.sh 2014-02-25 22:49:21 UTC (rev 50) +++ scripts/redmine-tools/nightly-clean.sh 2014-02-28 16:59:28 UTC (rev 51) @@ -1,35 +0,0 @@ -#! /bin/sh - -# Avec quelques variable ca devrait etre mieux (pour utiliser le bon jdk) -# poussin 20121023 -export JAVA_HOME=/opt/jdk -export JDK_HOME=$JAVA_HOME -export M2_HOME=/opt/maven - - -# nettoye les projets de toutes les forges - -forges="nuiton.org chorem.org forge.codelutin.com" -forgesContainer=/home/maven-release/projets - -for forge in $forges ; do - for p in $( ls $forgesContainer/$forge ) ; do - forgeBasedir=$forgesContainer/$forge - if [ -f $forgeBasedir/$p/pom.xml ]; then - # directly on a svn path - logger -id -p cron.info [nightly-maven-clean] clean $forge/$p - (cd $forgeBasedir/$p ; /opt/maven/bin/mvn clean >/dev/null) - else - if [ -d $forgeBasedir/$p ]; then - # try on a subdir (this is a directory) - for i in $(find $forgeBasedir/$p/* -maxdepth 0 -type d); do - if [ -f "$i/pom.xml" ]; then - # found a project - logger -id -p cron.info [nightly-maven-clean] clean $forge/$p/$(basename $i) - (cd $i ; /opt/maven/bin/mvn clean >/dev/null) - fi - done - fi - fi - done -done Deleted: scripts/redmine-tools/nightly-site-deploy.sh =================================================================== --- scripts/redmine-tools/nightly-site-deploy.sh 2014-02-25 22:49:21 UTC (rev 50) +++ scripts/redmine-tools/nightly-site-deploy.sh 2014-02-28 16:59:28 UTC (rev 51) @@ -1,18 +0,0 @@ -#! /bin/sh -MAILTO=dev(a)codelutin.com - -# deploie les site pour tous les projets marque dans /var/cache/redmine/nightly-build/x/y.site -# ou x est le nom de la forge et y le nom du projet -# le projet doit alors se trouver dans /home/maven-release/projets/x/y -# Une fois le site deployee, on supprimer le fichier de marquage - -cachedir=/var/cache/redmine/nightly-build -for forge in $( ls $cachedir ) ; do - for f in $( ls $cachedir/$forge | grep .site ) ; do - project=$(basename $f .site) - date >> /var/log/nightly-site-deploy-$forge-$project.log - msgerror="Probleme de construction du site du projet '$project' de la forge '$forge'.\nPlus de detailles sur goh:/var/log/nightly-site-deploy-$forge-$project.log" - su -l maven-release -c "/home/maven-release/bin/deploy-snapshot-site.sh $forge $project" >> /var/log/nightly-site-deploy-$forge-$project.log 2>&1 || echo -e $msgerror - rm -rfv $cachedir/$forge/$f >> /var/log/nightly-site-deploy-$forge-$project.log - done -done

1 0

r50 - scripts/redmine-tools
by maven-release＠users.forge.codelutin.com Feb. 25, 2014

Feb. 25, 2014

Author: maven-release Date: 2014-02-25 23:49:21 +0100 (Tue, 25 Feb 2014) New Revision: 50 Url: http://codelutin.com/projects/adminsys/repository/revisions/50 Log: fix svn post-commit email (at last) Modified: scripts/redmine-tools/redmine-post-commit.sh Modified: scripts/redmine-tools/redmine-post-commit.sh =================================================================== --- scripts/redmine-tools/redmine-post-commit.sh 2014-02-25 22:43:54 UTC (rev 49) +++ scripts/redmine-tools/redmine-post-commit.sh 2014-02-25 22:49:21 UTC (rev 50) @@ -8,10 +8,9 @@ PROJECT_NAME="$3" DOMAIN="$4" SVN_API_KEY="$5" - MAIL_DOMAIN="$DOMAIN" -if [ "codelutin.com" == $MAIL_DOMAIN ]; then +if [ -n "$(echo $MAIL_DOMAIN |grep codelutin.com)" ]; then MAIL_DOMAIN=forge.codelutin.com fi

1 0

r44 - scripts/redmine-tools
by maven-release＠users.forge.codelutin.com Feb. 25, 2014

Feb. 25, 2014

Author: maven-release Date: 2014-02-25 09:35:07 +0100 (Tue, 25 Feb 2014) New Revision: 44 Url: http://codelutin.com/projects/adminsys/repository/revisions/44 Log: refs #4152 more scripts for redmine-tools Added: scripts/redmine-tools/cron-clean-readmine-session scripts/redmine-tools/cron-isis-docs Added: scripts/redmine-tools/cron-clean-readmine-session =================================================================== --- scripts/redmine-tools/cron-clean-readmine-session (rev 0) +++ scripts/redmine-tools/cron-clean-readmine-session 2014-02-25 08:35:07 UTC (rev 44) @@ -0,0 +1,12 @@ +#! /bin/sh +# +# cron script to clean /tmp. + +find /tmp ! -type d -atime +10 -exec rm -f '{}' ';' +find /var/tmp ! -type d -atime +10 -exec rm -f '{}' ';' + +find /tmp -type d -atime +10 -exec rmdir '{}' ';' +find /var/tmp -type d -atime +10 -exec rmdir '{}' ';' + +find /opt/redmine-nuiton/tmp/sessions/ ! -type d -ctime +2 -exec rm -f '{}' ';' +find /opt/redmine-chorem/tmp/sessions/ ! -type d -ctime +2 -exec rm -f '{}' ';' Property changes on: scripts/redmine-tools/cron-clean-readmine-session ___________________________________________________________________ Added: svn:executable + * Added: scripts/redmine-tools/cron-isis-docs =================================================================== --- scripts/redmine-tools/cron-isis-docs (rev 0) +++ scripts/redmine-tools/cron-isis-docs 2014-02-25 08:35:07 UTC (rev 44) @@ -0,0 +1,9 @@ +#!/bin/sh + +# +# Lance la generation de la doc isis chaque nuit en forcant un clean avant +# + +su -l -c "/home/maven-release/bin/isis-fish-docs-site.sh clean" maven-release + +exit 0 Property changes on: scripts/redmine-tools/cron-isis-docs ___________________________________________________________________ Added: svn:executable + *

1 0

r43 - scripts/redmine-tools
by maven-release＠users.forge.codelutin.com Feb. 25, 2014

Feb. 25, 2014

Author: maven-release Date: 2014-02-25 02:19:54 +0100 (Tue, 25 Feb 2014) New Revision: 43 Url: http://codelutin.com/projects/adminsys/repository/revisions/43 Log: refs #4152: Mettre les scripts sur le svn d'adminsys (update redmine-tools) Added: scripts/redmine-tools/cron-redmine Modified: scripts/redmine-tools/check-post-commit.sh scripts/redmine-tools/redmine-post-commit.sh Modified: scripts/redmine-tools/check-post-commit.sh =================================================================== --- scripts/redmine-tools/check-post-commit.sh 2014-02-25 00:53:36 UTC (rev 42) +++ scripts/redmine-tools/check-post-commit.sh 2014-02-25 01:19:54 UTC (rev 43) @@ -10,6 +10,8 @@ # $3 if this arg exist (no specific value) then force file creation (overwrite) # # changelog +# 20140224 chemit(a)codelutin.com +# - use new forge layout # 20120321 chemit(a)codelutin.com # - use a unify script (bored to generated everywhere same script for maintin purpose...) # 20120209 chemit(a)codelutin.com @@ -25,23 +27,20 @@ # chorem or nuiton hostname=$1 if [ -n "$(echo $hostname |grep nuiton)" ];then - hostname=nuiton domain=nuiton.org svnapikey="q6aM3bhpwi9w5Y0Q4tLA" elif [ -n "$(echo $hostname |grep chorem)" ];then - hostname=chorem domain=chorem.org svnapikey="03WmG5DuFqdlp75GyAeT" else - hostname=forge - domain=forge.codelutin.com + domain=codelutin.com svnapikey="UDh19sTvBsU7HmzbxSlk" fi projectname=$2 force=$3 svnroot="/var/lib/svn/svn-$domain/$projectname" -postcommitfile="/var/lib/svn/svn-$domain/$projectname/hooks/post-commit" +postcommitfile="$svnroot/hooks/post-commit" if [ -n $(list_lists | grep -i '$projectname-commits') ]; then echo "list exists for $projectname" Added: scripts/redmine-tools/cron-redmine =================================================================== --- scripts/redmine-tools/cron-redmine (rev 0) +++ scripts/redmine-tools/cron-redmine 2014-02-25 01:19:54 UTC (rev 43) @@ -0,0 +1,40 @@ +#!/bin/sh +# +# cron-jobs for redmine +# + +PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin +#MAILTO=root + +nuiton_log=/var/log/redmine-nuiton.org.log +chorem_log=/var/log/redmine-chorem.org.log +codelutin_log=/var/log/redmine-codelutin.com.log + +nuiton_key=q6aM3bhpwi9w5Y0Q4tLA +chorem_key=03WmG5DuFqdlp75GyAeT +codelutin_key=UDh19sTvBsU7HmzbxSlk + +date >> $nuiton_log +date >> $chorem_log +date >> $codelutin_log + +ruby /opt/redmine-tools/project-list.rb --redmine-host forge.nuiton.org --admin-email moderate(a)codelutin.com --list-domain list.nuiton.org --list-suffix commits --key $nuiton_key >> $nuiton_log +ruby /opt/redmine-tools/project-list.rb --redmine-host forge.nuiton.org --admin-email moderate(a)codelutin.com --list-domain list.nuiton.org --list-suffix users --key $nuiton_key >> $nuiton_log +ruby /opt/redmine-tools/project-list.rb --redmine-host forge.nuiton.org --admin-email moderate(a)codelutin.com --list-domain list.nuiton.org --list-suffix devel --key $nuiton_key >> $nuiton_log + +ruby /opt/redmine-tools/project-list.rb --redmine-host forge.chorem.org --admin-email moderate(a)codelutin.com --list-domain list.chorem.org --list-suffix commits --key $chorem_key >> $chorem_log +ruby /opt/redmine-tools/project-list.rb --redmine-host forge.chorem.org --admin-email moderate(a)codelutin.com --list-domain list.chorem.org --list-suffix users --key $chorem_key >> $chorem_log +ruby /opt/redmine-tools/project-list.rb --redmine-host forge.chorem.org --admin-email moderate(a)codelutin.com --list-domain list.chorem.org --list-suffix devel --key $chorem_key >> $chorem_log + +ruby /opt/redmine-tools/project-list.rb --redmine-host forge.codelutin.com --admin-email moderate(a)codelutin.com --list-domain list.forge.codelutin.com --list-suffix commits --key $codelutin_key >> $codelutin_log +ruby /opt/redmine-tools/project-list.rb --redmine-host forge.codelutin.com --admin-email moderate(a)codelutin.com --list-domain list.forge.codelutin.com --list-suffix users --key $codelutin_key >> $codelutin_log +ruby /opt/redmine-tools/project-list.rb --redmine-host forge.codelutin.com --admin-email moderate(a)codelutin.com --list-domain list.forge.codelutin.com --list-suffix devel --key $codelutin_key >> $codelutin_log +ruby /opt/redmine-tools/project-list.rb --redmine-host forge.codelutin.com --admin-email moderate(a)codelutin.com --list-domain list.forge.codelutin.com --list-suffix private --key $codelutin_key >> $codelutin_log + +ruby /opt/redmine-tools/reposman.rb --redmine-host forge.nuiton.org --svn-dir /var/lib/svn/svn-nuiton.org --owner www-data --group publish --url http://forge.nuiton.org/svn-private/ --key $nuiton_key >> $nuiton_log +ruby /opt/redmine-tools/reposman.rb --redmine-host forge.chorem.org --svn-dir /var/lib/svn/svn-chorem.org --owner www-data --group publish --url http://forge.chorem.org/svn-private/ --key $chorem_key >> $chorem_log +ruby /opt/redmine-tools/reposman.rb --redmine-host forge.codelutin.com --svn-dir /var/lib/svn/svn-codelutin.com --owner www-data --group publish --url http://forge.codelutin.com/svn-private/ --key $codelutin_key >> $codelutin_log + +ruby /opt/redmine-tools/project-site.rb -s /var/lib/doc/nuiton.org -r forge.nuiton.org --owner publish --key $nuiton_key >> $nuiton_log +ruby /opt/redmine-tools/project-site.rb -s /var/lib/doc/chorem.org -r forge.chorem.org --owner publish --key $chorem_key >> $chorem_log +ruby /opt/redmine-tools/project-site.rb -s /var/lib/doc/codelutin.com -r forge.codelutin.com --owner publish --key $codelutin_key >> $codelutin_log Property changes on: scripts/redmine-tools/cron-redmine ___________________________________________________________________ Added: svn:executable + * Modified: scripts/redmine-tools/redmine-post-commit.sh =================================================================== --- scripts/redmine-tools/redmine-post-commit.sh 2014-02-25 00:53:36 UTC (rev 42) +++ scripts/redmine-tools/redmine-post-commit.sh 2014-02-25 01:19:54 UTC (rev 43) @@ -1,5 +1,5 @@ # -# Script lancé à chaque commit +# Script lance a chaque commit # REPOS="$1" @@ -12,7 +12,7 @@ /opt/redmine-tools/commit-email.pl -h users.$DOMAIN "$REPOS" "$REV" $PROJECT_NAME-commits(a)list.$DOMAIN # refresh redmine svn viewer -wget "http://$DOMAIN/sys/fetch_changesets?key=$SVN_API_KEY" --spider & +wget "http://forge.$DOMAIN/sys/fetch_changesets?key=$SVN_API_KEY" --spider & # touch project for nightly build touch /var/cache/redmine/nightly-build/$DOMAIN/$PROJECT_NAME.site

1 0

r42 - in forge-tools/sys: chorem.org/jenkins/jobs codelutin.com/jenkins/jobs nuiton.org/jenkins/jobs
by maven-release＠users.forge.codelutin.com Feb. 25, 2014

Feb. 25, 2014

Author: maven-release Date: 2014-02-25 01:53:36 +0100 (Tue, 25 Feb 2014) New Revision: 42 Url: http://codelutin.com/projects/adminsys/repository/revisions/42 Log: refs #4210 use new svn path Modified: forge-tools/sys/chorem.org/jenkins/jobs/ci forge-tools/sys/chorem.org/jenkins/jobs/nightly forge-tools/sys/codelutin.com/jenkins/jobs/ci forge-tools/sys/codelutin.com/jenkins/jobs/nightly forge-tools/sys/nuiton.org/jenkins/jobs/ci forge-tools/sys/nuiton.org/jenkins/jobs/nightly Modified: forge-tools/sys/chorem.org/jenkins/jobs/ci =================================================================== --- forge-tools/sys/chorem.org/jenkins/jobs/ci 2014-02-24 17:02:50 UTC (rev 41) +++ forge-tools/sys/chorem.org/jenkins/jobs/ci 2014-02-25 00:53:36 UTC (rev 42) @@ -15,7 +15,7 @@ <scm class="hudson.scm.SubversionSCM" plugin="subversion(a)2.0"> <locations> <hudson.scm.SubversionSCM_-ModuleLocation> - <remote>https://chorem.org/svn/@PROJECT_NAME@/trunk</remote> + <remote>https://svn.chorem.org/@PROJECT_NAME@/trunk</remote> <depthOption>infinity</depthOption> <ignoreExternalsOption>false</ignoreExternalsOption> </hudson.scm.SubversionSCM_-ModuleLocation> Modified: forge-tools/sys/chorem.org/jenkins/jobs/nightly =================================================================== --- forge-tools/sys/chorem.org/jenkins/jobs/nightly 2014-02-24 17:02:50 UTC (rev 41) +++ forge-tools/sys/chorem.org/jenkins/jobs/nightly 2014-02-25 00:53:36 UTC (rev 42) @@ -15,7 +15,7 @@ <scm class="hudson.scm.SubversionSCM" plugin="subversion(a)2.0"> <locations> <hudson.scm.SubversionSCM_-ModuleLocation> - <remote>https://chorem.org/svn/@PROJECT_NAME@/trunk</remote> + <remote>https://svn.chorem.org/@PROJECT_NAME@/trunk</remote> <depthOption>infinity</depthOption> <ignoreExternalsOption>false</ignoreExternalsOption> </hudson.scm.SubversionSCM_-ModuleLocation> Modified: forge-tools/sys/codelutin.com/jenkins/jobs/ci =================================================================== --- forge-tools/sys/codelutin.com/jenkins/jobs/ci 2014-02-24 17:02:50 UTC (rev 41) +++ forge-tools/sys/codelutin.com/jenkins/jobs/ci 2014-02-25 00:53:36 UTC (rev 42) @@ -18,7 +18,7 @@ <scm class="hudson.scm.SubversionSCM" plugin="subversion(a)2.0"> <locations> <hudson.scm.SubversionSCM_-ModuleLocation> - <remote>https://forge.codelutin.com/svn/@PROJECT_NAME@/trunk</remote> + <remote>https://svn.codelutin.com/@PROJECT_NAME@/trunk</remote> <depthOption>infinity</depthOption> <ignoreExternalsOption>false</ignoreExternalsOption> </hudson.scm.SubversionSCM_-ModuleLocation> Modified: forge-tools/sys/codelutin.com/jenkins/jobs/nightly =================================================================== --- forge-tools/sys/codelutin.com/jenkins/jobs/nightly 2014-02-24 17:02:50 UTC (rev 41) +++ forge-tools/sys/codelutin.com/jenkins/jobs/nightly 2014-02-25 00:53:36 UTC (rev 42) @@ -18,7 +18,7 @@ <scm class="hudson.scm.SubversionSCM" plugin="subversion(a)2.0"> <locations> <hudson.scm.SubversionSCM_-ModuleLocation> - <remote>https://forge.codelutin.com/svn/@PROJECT_NAME@/trunk</remote> + <remote>https://svn.codelutin.com/@PROJECT_NAME@/trunk</remote> <depthOption>infinity</depthOption> <ignoreExternalsOption>false</ignoreExternalsOption> </hudson.scm.SubversionSCM_-ModuleLocation> Modified: forge-tools/sys/nuiton.org/jenkins/jobs/ci =================================================================== --- forge-tools/sys/nuiton.org/jenkins/jobs/ci 2014-02-24 17:02:50 UTC (rev 41) +++ forge-tools/sys/nuiton.org/jenkins/jobs/ci 2014-02-25 00:53:36 UTC (rev 42) @@ -15,7 +15,7 @@ <scm class="hudson.scm.SubversionSCM" plugin="subversion(a)2.0"> <locations> <hudson.scm.SubversionSCM_-ModuleLocation> - <remote>https://nuiton.org/svn/@PROJECT_NAME@/trunk</remote> + <remote>https://svn.nuiton.org/@PROJECT_NAME@/trunk</remote> <depthOption>infinity</depthOption> <ignoreExternalsOption>false</ignoreExternalsOption> </hudson.scm.SubversionSCM_-ModuleLocation> Modified: forge-tools/sys/nuiton.org/jenkins/jobs/nightly =================================================================== --- forge-tools/sys/nuiton.org/jenkins/jobs/nightly 2014-02-24 17:02:50 UTC (rev 41) +++ forge-tools/sys/nuiton.org/jenkins/jobs/nightly 2014-02-25 00:53:36 UTC (rev 42) @@ -15,7 +15,7 @@ <scm class="hudson.scm.SubversionSCM" plugin="subversion(a)2.0"> <locations> <hudson.scm.SubversionSCM_-ModuleLocation> - <remote>https://nuiton.org/svn/@PROJECT_NAME@/trunk</remote> + <remote>https://svn.nuiton.org/@PROJECT_NAME@/trunk</remote> <depthOption>infinity</depthOption> <ignoreExternalsOption>false</ignoreExternalsOption> </hudson.scm.SubversionSCM_-ModuleLocation>

1 0

r41 - in forge-tools/sys: chorem.org codelutin.com nuiton.org
by maven-release＠users.forge.codelutin.com Feb. 24, 2014

Feb. 24, 2014

Author: maven-release Date: 2014-02-24 18:02:50 +0100 (Mon, 24 Feb 2014) New Revision: 41 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/41 Log: refs #4210 improve sonar apache conf Modified: forge-tools/sys/chorem.org/apache.conf forge-tools/sys/codelutin.com/apache.conf forge-tools/sys/nuiton.org/apache.conf Modified: forge-tools/sys/chorem.org/apache.conf =================================================================== --- forge-tools/sys/chorem.org/apache.conf 2014-02-24 15:46:38 UTC (rev 40) +++ forge-tools/sys/chorem.org/apache.conf 2014-02-24 17:02:50 UTC (rev 41) @@ -42,7 +42,7 @@ ProxyRequests Off ProxyPass / http://localhost:19092/ - ProxyPassReverse / http://qa.chorem.org/ + ProxyPassReverse / http://localhost:19092/ <Proxy *> Order deny,allow @@ -120,7 +120,7 @@ ProxyRequests Off ProxyPass / http://localhost:19092/ - ProxyPassReverse / https://qa.chorem.org/ + ProxyPassReverse / https://localhost:19092/ <Proxy *> Order deny,allow Modified: forge-tools/sys/codelutin.com/apache.conf =================================================================== --- forge-tools/sys/codelutin.com/apache.conf 2014-02-24 15:46:38 UTC (rev 40) +++ forge-tools/sys/codelutin.com/apache.conf 2014-02-24 17:02:50 UTC (rev 41) @@ -42,7 +42,7 @@ ProxyPreserveHost On ProxyPass / http://localhost:19093/ - ProxyPassReverse / http://qa.codelutin.com/ + ProxyPassReverse / http://localhost:19093/ <Proxy *> Order deny,allow @@ -120,8 +120,8 @@ ProxyPreserveHost On ProxyRequests Off - ProxyPass / http://localhost:18093/ - ProxyPassReverse / https//qa.codelutin.com/ + ProxyPass / http://localhost:19093/ + ProxyPassReverse / http://localhost:19093/ <Proxy *> Order deny,allow Modified: forge-tools/sys/nuiton.org/apache.conf =================================================================== --- forge-tools/sys/nuiton.org/apache.conf 2014-02-24 15:46:38 UTC (rev 40) +++ forge-tools/sys/nuiton.org/apache.conf 2014-02-24 17:02:50 UTC (rev 41) @@ -42,7 +42,7 @@ ProxyPreserveHost On ProxyPass / http://localhost:19091/ - ProxyPassReverse / http://qa.nuiton.org/ + ProxyPassReverse / http://localhost:19091/ <Proxy *> Order deny,allow @@ -120,7 +120,7 @@ ProxyPreserveHost On ProxyPass / http://localhost:19091/ - ProxyPassReverse / https://qa.nuiton.org/ + ProxyPassReverse / https://localhost:19091/ <Proxy *> Order deny,allow

1 0

r40 - in forge-tools/sys: chorem.org/jenkins/jobs codelutin.com/jenkins/jobs nuiton.org/jenkins/jobs
by maven-release＠users.forge.codelutin.com Feb. 24, 2014

Feb. 24, 2014

Author: maven-release Date: 2014-02-24 16:46:38 +0100 (Mon, 24 Feb 2014) New Revision: 40 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/40 Log: refs #4210 update after revert for jenkins jobs Modified: forge-tools/sys/chorem.org/jenkins/jobs/ci forge-tools/sys/chorem.org/jenkins/jobs/nightly forge-tools/sys/codelutin.com/jenkins/jobs/ci forge-tools/sys/codelutin.com/jenkins/jobs/nightly forge-tools/sys/nuiton.org/jenkins/jobs/ci forge-tools/sys/nuiton.org/jenkins/jobs/nightly Modified: forge-tools/sys/chorem.org/jenkins/jobs/ci =================================================================== --- forge-tools/sys/chorem.org/jenkins/jobs/ci 2014-02-19 21:29:07 UTC (rev 39) +++ forge-tools/sys/chorem.org/jenkins/jobs/ci 2014-02-24 15:46:38 UTC (rev 40) @@ -25,7 +25,7 @@ <excludedUsers></excludedUsers> <excludedRevprop></excludedRevprop> <excludedCommitMessages></excludedCommitMessages> - <workspaceUpdater class="hudson.scm.subversion.UpdateUpdater"/> + <workspaceUpdater class="hudson.scm.subversion.UpdateWithRevertUpdater"/> <ignoreDirPropChanges>false</ignoreDirPropChanges> <filterChangelog>false</filterChangelog> </scm> Modified: forge-tools/sys/chorem.org/jenkins/jobs/nightly =================================================================== --- forge-tools/sys/chorem.org/jenkins/jobs/nightly 2014-02-19 21:29:07 UTC (rev 39) +++ forge-tools/sys/chorem.org/jenkins/jobs/nightly 2014-02-24 15:46:38 UTC (rev 40) @@ -25,7 +25,7 @@ <excludedUsers></excludedUsers> <excludedRevprop></excludedRevprop> <excludedCommitMessages></excludedCommitMessages> - <workspaceUpdater class="hudson.scm.subversion.UpdateUpdater"/> + <workspaceUpdater class="hudson.scm.subversion.UpdateWithRevertUpdater"/> <ignoreDirPropChanges>false</ignoreDirPropChanges> <filterChangelog>false</filterChangelog> </scm> Modified: forge-tools/sys/codelutin.com/jenkins/jobs/ci =================================================================== --- forge-tools/sys/codelutin.com/jenkins/jobs/ci 2014-02-19 21:29:07 UTC (rev 39) +++ forge-tools/sys/codelutin.com/jenkins/jobs/ci 2014-02-24 15:46:38 UTC (rev 40) @@ -28,7 +28,7 @@ <excludedUsers></excludedUsers> <excludedRevprop></excludedRevprop> <excludedCommitMessages></excludedCommitMessages> - <workspaceUpdater class="hudson.scm.subversion.UpdateUpdater"/> + <workspaceUpdater class="hudson.scm.subversion.UpdateWithRevertUpdater"/> <ignoreDirPropChanges>false</ignoreDirPropChanges> <filterChangelog>false</filterChangelog> </scm> Modified: forge-tools/sys/codelutin.com/jenkins/jobs/nightly =================================================================== --- forge-tools/sys/codelutin.com/jenkins/jobs/nightly 2014-02-19 21:29:07 UTC (rev 39) +++ forge-tools/sys/codelutin.com/jenkins/jobs/nightly 2014-02-24 15:46:38 UTC (rev 40) @@ -28,7 +28,7 @@ <excludedUsers></excludedUsers> <excludedRevprop></excludedRevprop> <excludedCommitMessages></excludedCommitMessages> - <workspaceUpdater class="hudson.scm.subversion.UpdateUpdater"/> + <workspaceUpdater class="hudson.scm.subversion.UpdateWithRevertUpdater"/> <ignoreDirPropChanges>false</ignoreDirPropChanges> <filterChangelog>false</filterChangelog> </scm> Modified: forge-tools/sys/nuiton.org/jenkins/jobs/ci =================================================================== --- forge-tools/sys/nuiton.org/jenkins/jobs/ci 2014-02-19 21:29:07 UTC (rev 39) +++ forge-tools/sys/nuiton.org/jenkins/jobs/ci 2014-02-24 15:46:38 UTC (rev 40) @@ -25,7 +25,7 @@ <excludedUsers></excludedUsers> <excludedRevprop></excludedRevprop> <excludedCommitMessages></excludedCommitMessages> - <workspaceUpdater class="hudson.scm.subversion.UpdateUpdater"/> + <workspaceUpdater class="hudson.scm.subversion.UpdateWithRevertUpdater"/> <ignoreDirPropChanges>false</ignoreDirPropChanges> <filterChangelog>false</filterChangelog> </scm> Modified: forge-tools/sys/nuiton.org/jenkins/jobs/nightly =================================================================== --- forge-tools/sys/nuiton.org/jenkins/jobs/nightly 2014-02-19 21:29:07 UTC (rev 39) +++ forge-tools/sys/nuiton.org/jenkins/jobs/nightly 2014-02-24 15:46:38 UTC (rev 40) @@ -25,7 +25,7 @@ <excludedUsers></excludedUsers> <excludedRevprop></excludedRevprop> <excludedCommitMessages></excludedCommitMessages> - <workspaceUpdater class="hudson.scm.subversion.UpdateUpdater"/> + <workspaceUpdater class="hudson.scm.subversion.UpdateWithRevertUpdater"/> <ignoreDirPropChanges>false</ignoreDirPropChanges> <filterChangelog>false</filterChangelog> </scm>

1 0

r39 - / demo-tools demo-tools/tomcat
by tchemit＠users.forge.codelutin.com Feb. 19, 2014

Feb. 19, 2014

Author: tchemit Date: 2014-02-19 22:29:07 +0100 (Wed, 19 Feb 2014) New Revision: 39 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/39 Log: add demo-tools scripts Added: demo-tools/ demo-tools/tomcat/ demo-tools/tomcat/apache-demo-ng demo-tools/tomcat/check-get-tomcat.sh demo-tools/tomcat/deploy.cgi demo-tools/tomcat/deploy.html demo-tools/tomcat/deploy.sh demo-tools/tomcat/tomcat-crondaily demo-tools/tomcat/tomcat-default demo-tools/tomcat/tomcat-init.d Added: demo-tools/tomcat/apache-demo-ng =================================================================== --- demo-tools/tomcat/apache-demo-ng (rev 0) +++ demo-tools/tomcat/apache-demo-ng 2014-02-19 21:29:07 UTC (rev 39) @@ -0,0 +1,179 @@ +<VirtualHost *:80> + ServerName demo-ng.codelutin.com + ServerAlias demo.codelutin.com + ServerAlias *.demo.codelutin.com + ServerAlias *.demo-ng.codelutin.com + ServerAlias demo-ng.* + ServerAlias *.demo-ng.* + ServerAlias demo.* + ServerAlias *.demo.* + + DocumentRoot /var/local/demo/app/ + + <Directory /var/local/demo/app/> + # ce repertoire n'est pas accessible, il faut connaitre directement + # les sous repertoires + Options ExecCGI FollowSymLinks + AllowOverride None + Order Deny,Allow + Allow from All + AddHandler cgi-script .cgi + </Directory> + + <Directory /var/local/demo/app/*/> + # le repertoire des applictions permet a chaque application de + # modifier sa configuration via le fichier .apache.conf inclus en + # fin de fichier. Chaque application peut aussi mettre un fichier + # index.html pour presenter l'application + Options All + AllowOverride All + Order Deny,Allow + Allow from All + </Directory> + + <Directory /var/local/demo/app/*/*/> + # Le repertoire contenant les war, conf, log, db, ... n'est pas + # accessible depuis le web + Options None + # en fait ce n'est pas une vrai interdiction, car ca marche pas :( + # c'est simplement une interdiction de lister les fichiers, mais si + # on connait le nom d'un fichier on peut le recuperer. + # (TODO: trouver la bonne config) +# Order Deny,Allow +# Deny from All + </Directory> + + <Files ".apache.conf"> + # on interdit la recuperation des fichiers inclus (.apache.conf) + Order Deny,Allow + Deny from All + </Files> + + + + # Possible values include: debug, info, notice, warn, error, crit, alert, emerg. + LogLevel warn + ErrorLog ${APACHE_LOG_DIR}/demo-ng-error.log + CustomLog ${APACHE_LOG_DIR}/demo-ng-access.log combined + + # inclusion des fichiers de configuration pour chaque application, soit + # globalement pour toutes les demo (latest, staging, stable) soit + # individuellement + # l'inclusion avec un * pour un repertoire n'est pas possible, on fait + # donc en perl :( + <Perl> + foreach $file (glob '/var/local/demo/app/*/.apache.conf') { + push @Include, $file; + } + foreach $file (glob '/var/local/demo/app/*/*/.apache.conf') { + push @Include, $file; + } + </Perl> + + # les proxy en dernier pour permettre a chaque projet de le surcharger + + # pour ne pas servir de proxy a la terre entiere + ProxyRequests off + + ProxyPassMatch ^/(.*)-stable/?(.*)$ ajp://localhost:18971/$1-stable/$2 + ProxyPassMatch ^/(.*)-staging/?(.*)$ ajp://localhost:18972/$1-staging/$2 + ProxyPassMatch ^/(.*)-latest/?(.*)$ ajp://localhost:18973/$1-latest/$2 + +# ProxyPassMatch ^/(.*)/(latest|staging|stable)(/?.*)$ http://www.codelutin.com/$1$3 + +</VirtualHost> + +<VirtualHost *:443> + ServerName demo-ng.codelutin.com + ServerAlias demo.codelutin.com + ServerAlias *.demo.codelutin.com + ServerAlias *.demo-ng.codelutin.com + ServerAlias demo-ng.* + ServerAlias *.demo-ng.* + ServerAlias demo.* + ServerAlias *.demo.* + + DocumentRoot /var/local/demo/app/ + + <IfModule mod_ssl.c> + SSLEngine on + SSLCertificateFile /etc/ssl/certs/wildcard.codelutin.com.crt + SSLCertificateKeyFile /etc/ssl/private/wildcard.codelutin.com.key + SSLCACertificateFile /etc/ssl/certs/GandiStandardSSLCA.pem + SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown + SSLVerifyClient None + </IfModule> + + + <Directory /var/local/demo/app/> + # ce repertoire n'est pas accessible, il faut connaitre directement + # les sous repertoires + Options ExecCGI FollowSymLinks + AllowOverride None + Order Deny,Allow + Allow from All + AddHandler cgi-script .cgi + </Directory> + + <Directory /var/local/demo/app/*/> + # le repertoire des applictions permet a chaque application de + # modifier sa configuration via le fichier .apache.conf inclus en + # fin de fichier. Chaque application peut aussi mettre un fichier + # index.html pour presenter l'application + Options All + AllowOverride All + Order Deny,Allow + Allow from All + </Directory> + + <Directory /var/local/demo/app/*/*/> + # Le repertoire contenant les war, conf, log, db, ... n'est pas + # accessible depuis le web + Options None + # en fait ce n'est pas une vrai interdiction, car ca marche pas :( + # c'est simplement une interdiction de lister les fichiers, mais si + # on connait le nom d'un fichier on peut le recuperer. + # (TODO: trouver la bonne config) +# Order Deny,Allow +# Deny from All + </Directory> + + <Files ".apache.conf"> + # on interdit la recuperation des fichiers inclus (.apache.conf) + Order Deny,Allow + Deny from All + </Files> + + + + # Possible values include: debug, info, notice, warn, error, crit, alert, emerg. + LogLevel warn + ErrorLog ${APACHE_LOG_DIR}/demo-ng-error.log + CustomLog ${APACHE_LOG_DIR}/demo-ng-access.log combined + + # inclusion des fichiers de configuration pour chaque application, soit + # globalement pour toutes les demo (latest, staging, stable) soit + # individuellement + # l'inclusion avec un * pour un repertoire n'est pas possible, on fait + # donc en perl :( + <Perl> + foreach $file (glob '/var/local/demo/app/*/.apache.conf') { + push @Include, $file; + } + foreach $file (glob '/var/local/demo/app/*/*/.apache.conf') { + push @Include, $file; + } + </Perl> + + # les proxy en dernier pour permettre a chaque projet de le surcharger + + # pour ne pas servir de proxy a la terre entiere + ProxyRequests off + + ProxyPassMatch ^/(.*)-stable/?(.*)$ ajp://localhost:18971/$1-stable/$2 + ProxyPassMatch ^/(.*)-staging/?(.*)$ ajp://localhost:18972/$1-staging/$2 + ProxyPassMatch ^/(.*)-latest/?(.*)$ ajp://localhost:18973/$1-latest/$2 + +# ProxyPassMatch ^/(.*)/(latest|staging|stable)(/?.*)$ http://www.codelutin.com/$1$3 + +</VirtualHost> Added: demo-tools/tomcat/check-get-tomcat.sh =================================================================== --- demo-tools/tomcat/check-get-tomcat.sh (rev 0) +++ demo-tools/tomcat/check-get-tomcat.sh 2014-02-19 21:29:07 UTC (rev 39) @@ -0,0 +1,91 @@ +#!/bin/sh + +# +# USAGE: check-get-tomcat.sh [debug] +# +# verifie s'il y a ou non une nouvelle version tomcat par rapport a celle installee +# si c'est le cas: +# - telecharge le fichier +# - le decompresse +# - le met en place pour les diffentes instances souhaite +# - affiche le chemin des nouvelles instances mise en place si besoin +# +# l'administrateur devra alors faire un +# - /etc/init.d/tomcat stop [6|7] +# - /etc/init.d/tomcat start [6|7] +# + +DEBUG=false +MIRROR=http://mirrors.linsrv.net/apache/tomcat +TARGET_DIR=/opt/repository +LINK_DIR=/opt + +if [ "$1" = "debug" ]; then + export DEBUG=true +fi + +debug () { + if [ "$DEBUG" = "true" ]; then + echo "$1" + fi +} + +getFileURL () { + local RELEASE=$2 + local VERSION=${2%%.*} + local result="$MIRROR/tomcat-$VERSION/v$RELEASE/bin/apache-tomcat-$RELEASE.tar.gz" + debug "getFileURL: $result" + eval $1=\$result +} + +# get the last release for specified tomcat version +# @param $1 returned value +# @param $2 tomcat version 6, 7 or 8 +getLastRelease () { + local VERSION=$2 + local result=$(curl -s http://mirrors.linsrv.net/apache/tomcat/tomcat-$VERSION/ |grep "href=.v" |sed -re 's/.*>v([0-9]+.[0-9]+.[0-9]+).*/\1/') + debug "last version is $result" + eval $1=\$result +} + +getCurrentRelease () { + local VERSION=$2 + local LINK=$(readlink $LINK_DIR/apache-tomcat-$VERSION) + local DIR=$(basename $LINK) + local result=${DIR##*-} + debug "getCurrentRelease: $result" + eval $1="$result" +} + +installRelease () { + local RELEASE=$1 + local VERSION=${RELEASE%%.*} + local URL + getFileURL URL $RELEASE + mkdir -p $TARGET_DIR + curl -s "$URL" | tar --no-same-owner -C "$TARGET_DIR" -xz + + local DIR=$(basename $URL .tar.gz) + local UNPACK_DIR=$TARGET_DIR/$DIR + local LINK=$LINK_DIR/${DIR%%.*} + rm -f $LINK + ln -s $UNPACK_DIR $LINK + + echo "new release installed in $LINK -> $UNPACK_DIR" +} + +update () { + local VERSION=$1 + local CURRENT_RELEASE + local LAST_RELEASE + + getCurrentRelease CURRENT_RELEASE $VERSION + getLastRelease LAST_RELEASE $VERSION + + if [ "$CURRENT_RELEASE" != "$LAST_RELEASE" ]; then + installRelease $LAST_RELEASE + fi +} + +update 6 +update 7 Property changes on: demo-tools/tomcat/check-get-tomcat.sh ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: demo-tools/tomcat/deploy.cgi =================================================================== --- demo-tools/tomcat/deploy.cgi (rev 0) +++ demo-tools/tomcat/deploy.cgi 2014-02-19 21:29:07 UTC (rev 39) @@ -0,0 +1,127 @@ +#!/usr/bin/env python + +print "Content-Type: text/plain" # plain is following +print # blank line, end of headers + +import os +import sys +import cgi +import cgitb +import shutil +import time +import subprocess + +cgitb.enable() + +form = cgi.FieldStorage() + +def mkdirForFile(file): + dir = os.path.dirname(file) + if not os.path.exists(dir): + os.makedirs(dir) + +def copy(filein, filename): + mkdirForFile(filename) + fileout = open(filename, "w") + shutil.copyfileobj(filein, fileout) + fileout.close() + +TODAY=time.strftime('%Y%m%d') + +# APP_NAME +APP_NAME=form.getvalue("APP_NAME") +if not APP_NAME: + print "<h1>APP_NAME mandatory</h1>" + +# TOMCAT_INSTANCE +TOMCAT_INSTANCE=form.getvalue("TOMCAT_INSTANCE") +TOMCAT_INSTANCE_UNIVERSE=['latest', 'staging', 'stable'] + +if not TOMCAT_INSTANCE in TOMCAT_INSTANCE_UNIVERSE: + print "<h1>TOMCAT_INSTANCE must be in %s but was <strong>%s</strong></h1>" % (TOMCAT_INSTANCE_UNIVERSE, TOMCAT_INSTANCE) + sys.exit() + +# TARGET_DIR (where to install application) +TARGET_DIR="/var/local/demo/app/%s/%s" % (APP_NAME, TOMCAT_INSTANCE) + +# WAR_NAME (name of war to deploy in tomcat) +WAR_LINK="%s/%s-%s.war" % (TARGET_DIR, APP_NAME, TOMCAT_INSTANCE) + +# VERSION_FILE (contains the last version of tomcat used for this application, not exist at first deploy for an application) +VERSION_FILE="%s/.tomcat" % (TARGET_DIR) + +# TOMCAT_VERSION +TOMCAT_VERSION=form.getvalue("TOMCAT_VERSION") +if not TOMCAT_VERSION: + if os.path.exists(VERSION_FILE): + f = open(VERSION_FILE, "r") + TOMCAT_VERSION=f.read() + f.close() + else: + TOMCAT_VERSION=7 +else: + TOMCAT_VERSION_UNIVERSE = ['6','7'] + if not TOMCAT_VERSION in TOMCAT_VERSION_UNIVERSE: + print "<h1>TOMCAT_VERSION must be in %s but was <strong>%s</strong></h1>" % (TOMCAT_VERSION_UNIVERSE, TOMCAT_VERSION) + sys.exit() + + mkdirForFile(VERSION_FILE) + f = open(VERSION_FILE, "w") + f.write(TOMCAT_VERSION) + f.close() + +# TOMCAT_HOME +TOMCAT_HOME='/var/local/demo/tomcat/tomcat-%s-%s' % (TOMCAT_VERSION, TOMCAT_INSTANCE) + +# APP_WAR_FILE war to deploy in tomcat +APP_WAR_FILE=None +if "APP_WAR" in form and form["APP_WAR"].done != -1: + APP_WAR=form["APP_WAR"] + filename = os.path.basename(APP_WAR.filename) + if os.path.splitext(filename)[1] != ".war": + print "<h1>Only war file can be uploaded as war</h1>" + sys.exit() + filepath = "%s/war/%s-%s" % (TARGET_DIR, TODAY, filename) + copy(APP_WAR.file, filepath) + if os.path.exists(WAR_LINK): + os.unlink(WAR_LINK) + os.symlink(filepath, WAR_LINK) + APP_WAR_FILE="%s -> %s" % (WAR_LINK, filepath) + +#TODO tchemit 17/10/2013, Deal other extra download files + +# APP_CONF_FILE (configuration file to place on root directory of the tomcat instance) +APP_CONF_FILE=None + +if "APP_CONF" in form and form["APP_CONF"].done != -1: + APP_CONF=form["APP_CONF"] + filename = os.path.basename(APP_CONF.filename) + + # tchemit 18/10/2013, no need to check the extension, some app don't have a such thing... + # fileextension = os.path.splitext(filename)[1] + # if not fileextension in [".properties", ".conf", ".config"]: + # print "<h1>Only file with exension (.properties, .conf, .config) can be uploaded as config file</h1>" + # sys.exit() + filepath = "%s/conf/%s-%s" % (TARGET_DIR, TODAY, filename) + copy(APP_CONF.file, filepath) + CONF_LINK = "%s/%s" % (TARGET_DIR, filename) + if os.path.exists(CONF_LINK): + os.unlink(CONF_LINK) + os.symlink(filepath, CONF_LINK) + APP_CONF_FILE="%s -> %s" % (CONF_LINK, filepath) + +print "<h1>Deploy summary</h1>\n<ul>\n<li>application %s</li>\n<li>tomcat %s %s</li>\n<li>war %s</li>\n<li>conf %s</li>\n</ul>" % (APP_NAME, TOMCAT_VERSION, TOMCAT_INSTANCE, APP_WAR_FILE, APP_CONF_FILE) + +# create link du fichier de conf dans le $HOME_TOMCAT +# copy du war dans le $HOME_TOMCAT +# move du war dans $HOME_TOMCAT/webapps +#devnull = open(os.devnull, 'w') + +# logger for deploy.sh script +logger = open("/tmp/deploy.sh-%s-%s-%s.log" % (TOMCAT_VERSION, TOMCAT_INSTANCE, APP_NAME), 'w') + +subprocess.check_call(['/opt/script-tools/tomcat/deploy.sh %s %s %s' % (TOMCAT_HOME, WAR_LINK, CONF_LINK)], shell=True, executable='/bin/bash', stdout=logger, stderr=logger) + +# DO NOT REMOVE THIS, USED BY SOME CLIENT TO CHECK DEPLOY WAS OK" +print "<h1>Deploy success</h1>" +# DO NOT REMOVE THIS, USED BY SOME CLIENT TO CHECK DEPLOY WAS OK" Property changes on: demo-tools/tomcat/deploy.cgi ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: demo-tools/tomcat/deploy.html =================================================================== --- demo-tools/tomcat/deploy.html (rev 0) +++ demo-tools/tomcat/deploy.html 2014-02-19 21:29:07 UTC (rev 39) @@ -0,0 +1,28 @@ +<html> +<body> +<form action="deploy.cgi" method="post" enctype="multipart/form-data"> +<p> +*APP_NAME:<input name="APP_NAME"/> +</p><p> +TOMCAT_VERSION: met a jour la version du tomcat cible, si None est choisi la +derniere version choisi est reutilise et par defaut tomcat 7 est +utilise<br/> +<input type="radio" name="TOMCAT_VERSION" value="" checked> None +<input type="radio" name="TOMCAT_VERSION" value="6"> 6 +<input type="radio" name="TOMCAT_VERSION" value="7"> 7 +</p> +</p> +*TOMCAT_INSTANCE: +<input type="radio" name="TOMCAT_INSTANCE" value="stable"> stable +<input type="radio" name="TOMCAT_INSTANCE" value="staging"> staging +<input type="radio" name="TOMCAT_INSTANCE" value="latest" checked> latest +</p><p> +APP_WAR:<input type="file" name="APP_WAR"/> +</p><p> +APP_CONF:<input type="file" name="APP_CONF"/> +</p><p> +<input type="submit"/> +</p> +</form> +</body> +</html> Property changes on: demo-tools/tomcat/deploy.html ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: demo-tools/tomcat/deploy.sh =================================================================== --- demo-tools/tomcat/deploy.sh (rev 0) +++ demo-tools/tomcat/deploy.sh 2014-02-19 21:29:07 UTC (rev 39) @@ -0,0 +1,77 @@ +#!/bin/bash + +if [ "$#" -lt 2 ]; then + echo "Usage: $0 \$TOMCAT_HOME file.war [conf.properties]" + exit 1 +fi + +TOMCAT_HOME=$1 +WAR_LINK=$2 +CONF_LINK=$3 + +if [ -n "$CONF_LINK" ]; then + ln -fs $CONF_LINK $TOMCAT_HOME +fi + +APP_HOME=$(dirname $WAR_LINK) +WAR_NAME=$(basename $WAR_LINK) +CONTEXT=$(basename $WAR_NAME .war) + +echo "Based on ${WAR_LINK}, APP_HOME=${APP_HOME}, WAR_NAME=${WAR_NAME} and CONTEXT=${CONTEXT}" + + + + +# +# Undeploy war +# +if [ -f $TOMCAT_HOME/webapps/$WAR_NAME ] +then + rm $TOMCAT_HOME/webapps/$WAR_NAME -f +fi + +# +# wait until war is gone from tomcat +# +i=0 +while [ -d $TOMCAT_HOME/webapps/$CONTEXT -a $i -lt 60 ]; do + i=$(($i + 1)) + echo "Waiting for app $CONTEXT to be undeployed... (since ${i}s)" + sleep 1 +done + +# +# Context undeployed or not, make sure the folder is removed +# +rm $TOMCAT_HOME/webapps/$CONTEXT -rf + + +# +# after-deploy hook +# +UNDEPLOY_SCRIPT=$APP_HOME/scripts/after-undeploy.sh +if [ -f $UNDEPLOY_SCRIPT ] +then + echo "Applying undeploy script: ${UNDEPLOY_SCRIPT}..." + $UNDEPLOY_SCRIPT +fi + +# +# before deploy hook +# +DEPLOY_SCRIPT=$APP_HOME/scripts/before-deploy.sh +if [ -f $DEPLOY_SCRIPT ] +then + echo "Applying deploy script: ${DEPLOY_SCRIPT}..." + $DEPLOY_SCRIPT +fi + +# +# deploy new war +# + +# on copie puis on move pour que le war arrive instantanement dans webapps et +# qu'il n'y ait pas de probleme de deploiement d'un fichier pas encore entier + +cp -fL $WAR_LINK $TOMCAT_HOME +mv $TOMCAT_HOME/$WAR_NAME $TOMCAT_HOME/webapps Property changes on: demo-tools/tomcat/deploy.sh ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: demo-tools/tomcat/tomcat-crondaily =================================================================== --- demo-tools/tomcat/tomcat-crondaily (rev 0) +++ demo-tools/tomcat/tomcat-crondaily 2014-02-19 21:29:07 UTC (rev 39) @@ -0,0 +1,21 @@ +#!/bin/sh + +NAME=tomcat +DEFAULT=/etc/default/$NAME + +# The following variables can be overwritten in $DEFAULT + +# Default for number of days to keep old log files in /var/log/tomcatN/ +LOGFILE_DAYS=14 + +# End of variables that can be overwritten in $DEFAULT + +# overwrite settings from default file +if [ -f "$DEFAULT" ]; then + . "$DEFAULT" +fi + +if [ -d /var/log/$NAME ]; then + find /var/log/$NAME/ -name \*.log -mtime +$LOGFILE_DAYS -print0 \ + | xargs --no-run-if-empty -0 rm -- +fi Property changes on: demo-tools/tomcat/tomcat-crondaily ___________________________________________________________________ Added: svn:executable + * Added: demo-tools/tomcat/tomcat-default =================================================================== --- demo-tools/tomcat/tomcat-default (rev 0) +++ demo-tools/tomcat/tomcat-default 2014-02-19 21:29:07 UTC (rev 39) @@ -0,0 +1,8 @@ +TOMCAT_USER=www-data +TOMCAT_GROUP=www-data +JAVA_HOME=/opt/jdk +JAVA_OPTS="-Djava.awt.headless=true -XX:+UseConcMarkSweepGC -Dfile.encoding=UTF-8" +JAVA_OPTS="$JAVA_OPTS -XX:MaxPermSize=400m -Xms512m -Xmx1024m -XX:-UseGCOverheadLimit" +JTOMCAT_SECURITY=no +LOGFILE_DAYS=30 +JVM_TMP=/tmp/tomcat-temp Added: demo-tools/tomcat/tomcat-init.d =================================================================== --- demo-tools/tomcat/tomcat-init.d (rev 0) +++ demo-tools/tomcat/tomcat-init.d 2014-02-19 21:29:07 UTC (rev 39) @@ -0,0 +1,356 @@ +#!/bin/bash +# +# /etc/init.d/tomcat -- startup script for the Tomcat servlet engine +# +# Written by Miquel van Smoorenburg <miquels(a)cistron.nl>. +# Modified for Debian GNU/Linux by Ian Murdock <imurdock(a)gnu.ai.mit.edu>. +# Modified for Tomcat by Stefan Gybas <sgybas(a)debian.org>. +# Modified for Tomcat6 by Thierry Carrez <thierry.carrez(a)ubuntu.com>. +# Modified for Tomcat7 by Ernesto Hernandez-Novich <emhn(a)itverx.com.ve>. +# Additional improvements by Jason Brittain <jason.brittain(a)mulesoft.com>. +# Modified for Multiple Tomcat instance by Benjamin POUSSIN <poussin(a)codelutin.com>. +# +### BEGIN INIT INFO +# Provides: tomcat +# Required-Start: $local_fs $remote_fs $network +# Required-Stop: $local_fs $remote_fs $network +# Should-Start: $named +# Should-Stop: $named +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Start Tomcat. +# Description: Start the Tomcat servlet engine. +### END INIT INFO + +set -e + +PATH=/bin:/usr/bin:/sbin:/usr/sbin +NAME=tomcat +DESC="Tomcat servlet engine" +DEFAULT=/etc/default/$NAME +JVM_TMP=/tmp/tomcat-$NAME-tmp + +if [ `id -u` -ne 0 ]; then + echo "You need root privileges to run this script" + exit 1 +fi + +# Make sure tomcat is started with system locale +if [ -r /etc/default/locale ]; then + . /etc/default/locale + export LANG +fi + +. /lib/lsb/init-functions + +if [ -r /etc/default/rcS ]; then + . /etc/default/rcS +fi + + +# The following variables can be overwritten in $DEFAULT + +# Run Tomcat 7 as this user ID and group ID +TOMCAT_USER=www-data +TOMCAT_GROUP=www-data + +# this is a work-around until there is a suitable runtime replacement +# for dpkg-architecture for arch:all packages +# this function sets the variable OPENJDKS +find_openjdks() +{ + for jvmdir in /usr/lib/jvm/java-7-openjdk-* + do + if [ -d "${jvmdir}" -a "${jvmdir}" != "/usr/lib/jvm/java-7-openjdk-common" ] + then + OPENJDKS=$jvmdir + fi + done + for jvmdir in /usr/lib/jvm/java-6-openjdk-* + do + if [ -d "${jvmdir}" -a "${jvmdir}" != "/usr/lib/jvm/java-6-openjdk-common" ] + then + OPENJDKS="${OPENJDKS} ${jvmdir}" + fi + done +} + +OPENJDKS="" +find_openjdks +# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not +# defined in $DEFAULT) +JDK_DIRS="/opt/jdk /usr/lib/jvm/default-java ${OPENJDKS} /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-sun" + +# Look for the right JVM to use +for jdir in $JDK_DIRS; do + if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then + JAVA_HOME="$jdir" + fi +done +export JAVA_HOME + +# Directory where the Tomcat 6 binary distribution resides +CATALINA_HOME=/usr/share/$NAME + +# Directory for per-instance configuration files and webapps +CATALINA_BASE=/var/lib/$NAME + +# Use the Java security manager? (yes/no) +TOMCAT_SECURITY=no + +# Default Java options +# Set java.awt.headless=true if JAVA_OPTS is not set so the +# Xalan XSL transformer can work without X11 display on JDK 1.4+ +# It also looks like the default heap size of 64M is not enough for most cases +# so the maximum heap size is set to 128M +if [ -z "$JAVA_OPTS" ]; then + JAVA_OPTS="-Djava.awt.headless=true -Xmx128M" +fi + +SECURITY="" +if [ "$TOMCAT_SECURITY" = "yes" ]; then + SECURITY="-security" +fi + +# End of variables that can be overwritten in $DEFAULT + +# overwrite settings from default file +if [ -f "$DEFAULT" ]; then + . "$DEFAULT" +fi + +# BP create function for variable +define_variable () { + + if [ ! -f "$CATALINA_HOME/bin/bootstrap.jar" ]; then + log_failure_msg "$NAME is not installed" + exit 1 + fi + + POLICY_CACHE="$CATALINA_BASE/work/catalina.policy" + + if [ -z "$CATALINA_TMPDIR" ]; then + CATALINA_TMPDIR="$JVM_TMP" + fi + + # Set the JSP compiler if set in the tomcat.default file + if [ -n "$JSP_COMPILER" ]; then + JAVA_OPTS="$JAVA_OPTS -Dbuild.compiler=\"$JSP_COMPILER\"" + fi + + # Define other required variables + CATALINA_PID="/var/run/$NAME.pid" + CATALINA_SH="$CATALINA_HOME/bin/catalina.sh" +} + +# Look for Java Secure Sockets Extension (JSSE) JARs +if [ -z "${JSSE_HOME}" -a -r "${JAVA_HOME}/jre/lib/jsse.jar" ]; then + JSSE_HOME="${JAVA_HOME}/jre/" +fi + +catalina_sh() { + # Escape any double quotes in the value of JAVA_OPTS + JAVA_OPTS="$(echo $JAVA_OPTS | sed 's/\"/\\\"/g')" + + AUTHBIND_COMMAND="" + if [ "$AUTHBIND" = "yes" -a "$1" = "start" ]; then + JAVA_OPTS="$JAVA_OPTS -Djava.net.preferIPv4Stack=true" + AUTHBIND_COMMAND="/usr/bin/authbind --deep /bin/bash -c " + fi + + # Define the command to run Tomcat's catalina.sh as a daemon + # set -a tells sh to export assigned variables to spawned shells. + TOMCAT_SH="set -a; JAVA_HOME=\"$JAVA_HOME\"; source \"$DEFAULT\"; \ + CATALINA_HOME=\"$CATALINA_HOME\"; \ + CATALINA_BASE=\"$CATALINA_BASE\"; \ + JAVA_OPTS=\"$JAVA_OPTS\"; \ + CATALINA_PID=\"$CATALINA_PID\"; \ + CATALINA_TMPDIR=\"$CATALINA_TMPDIR\"; \ + LANG=\"$LANG\"; JSSE_HOME=\"$JSSE_HOME\"; \ + cd \"$CATALINA_BASE\"; \ + \"$CATALINA_SH\" $@" + + if [ "$AUTHBIND" = "yes" -a "$1" = "start" ]; then + TOMCAT_SH="'$TOMCAT_SH'" + fi + + # Run the catalina.sh script as a daemon + set +e + touch "$CATALINA_PID" "$CATALINA_BASE"/logs/catalina.out + chown $TOMCAT_USER "$CATALINA_PID" "$CATALINA_BASE"/logs/catalina.out + start-stop-daemon --start -b -u "$TOMCAT_USER" -g "$TOMCAT_GROUP" \ + -c "$TOMCAT_USER" -d "$CATALINA_TMPDIR" -p "$CATALINA_PID" \ + -x /bin/bash -- -c "$AUTHBIND_COMMAND $TOMCAT_SH" + status="$?" + set +a -e + return $status +} + +# BP create function for action +do_action () { +case "$1" in + start) + if [ -z "$JAVA_HOME" ]; then + log_failure_msg "no JDK found - please set JAVA_HOME" + exit 1 + fi + + if [ ! -d "$CATALINA_BASE/conf" ]; then + log_failure_msg "invalid CATALINA_BASE: $CATALINA_BASE" + exit 1 + fi + + log_daemon_msg "Starting $NAME" "$NAME" + if start-stop-daemon --test --start --pidfile "$CATALINA_PID" \ + --user $TOMCAT_USER --exec "$JAVA_HOME/bin/java" \ + >/dev/null; then + + # Regenerate POLICY_CACHE file + umask 022 + if [ -d /etc/tomcat/policy.d/ ]; then + echo "// AUTO-GENERATED FILE from /etc/tomcat/policy.d/" \ + > "$POLICY_CACHE" + echo "" >> "$POLICY_CACHE" + cat $CATALINA_BASE/conf/policy.d/*.policy \ + >> "$POLICY_CACHE" + fi + + # Remove / recreate JVM_TMP directory + rm -rf "$JVM_TMP" + mkdir -p "$JVM_TMP" || { + log_failure_msg "could not create JVM temporary directory" + exit 1 + } + chown $TOMCAT_USER "$JVM_TMP" + + catalina_sh start $SECURITY + sleep 5 + if start-stop-daemon --test --start --pidfile "$CATALINA_PID" \ + --user $TOMCAT_USER --exec "$JAVA_HOME/bin/java" \ + >/dev/null; then + if [ -f "$CATALINA_PID" ]; then + rm -f "$CATALINA_PID" + fi + log_end_msg 1 + else + log_end_msg 0 + fi + else + log_progress_msg "(already running)" + log_end_msg 0 + fi + ;; + stop) + log_daemon_msg "Stopping $NAME" "$NAME" + + set +e + if [ -f "$CATALINA_PID" ]; then + start-stop-daemon --stop --pidfile "$CATALINA_PID" \ + --user "$TOMCAT_USER" \ + --retry=TERM/20/KILL/5 >/dev/null + if [ $? -eq 1 ]; then + log_progress_msg "$NAME is not running but pid file exists, cleaning up" + elif [ $? -eq 3 ]; then + PID="`cat $CATALINA_PID`" + log_failure_msg "Failed to stop $NAME (pid $PID)" + exit 1 + fi + rm -f "$CATALINA_PID" + rm -rf "$JVM_TMP" + else + log_progress_msg "(not running)" + fi + log_end_msg 0 + set -e + ;; + status) + set +e + start-stop-daemon --test --start --pidfile "$CATALINA_PID" \ + --user $TOMCAT_USER --exec "$JAVA_HOME/bin/java" \ + >/dev/null 2>&1 + if [ "$?" = "0" ]; then + + if [ -f "$CATALINA_PID" ]; then + log_success_msg "$NAME is not running, but pid file exists." + exit 1 + else + log_success_msg "$NAME is not running." + exit 3 + fi + else + log_success_msg "$NAME is running with pid `cat $CATALINA_PID`" + fi + set -e + ;; + restart|force-reload) + if [ -f "$CATALINA_PID" ]; then + do_action stop + sleep 1 + fi + do_action start + ;; + try-restart) + if start-stop-daemon --test --start --pidfile "$CATALINA_PID" \ + --user $TOMCAT_USER --exec "$JAVA_HOME/bin/java" \ + >/dev/null; then + do_action start + fi + ;; + *) + log_failure_msg "Usage: $0 {start|stop|restart|try-restart|force-reload|status} {6|7|all} {stable|staging|latest|all}" + exit 1 + ;; +esac +} + +if [ "$#" -lt 1 ]; then + log_failure_msg "Usage: $0 {start|stop|restart|try-restart|force-reload|status} {6|7|all (default)} {stable|staging|latest|all (default)}" + exit 1 +fi + +# ACTION +ACTION=$1 +# 6|7|all +TOMCAT_VERSION=${2:-all} +TOMCAT_VERSION=${TOMCAT_VERSION/all/6 7} +# stable|staging|latest|all +TOMCAT_INSTANCE=${3:-all} +TOMCAT_INSTANCE=${TOMCAT_INSTANCE/all/stable staging latest} + +stable=1 +staging=2 +latest=3 + +for v in $TOMCAT_VERSION; do + for i in $TOMCAT_INSTANCE; do + +#echo "version to test : $v" +#echo "instance to test : $i" + + NAME=tomcat-$v-$i + CATALINA_HOME=/opt/apache-tomcat-$v + CATALINA_BASE=/var/local/demo/tomcat/tomcat-$v-$i + JVM_TMP=/tmp/tomcat-$v-$i-tmp + TOMCAT_WRITABLE_DIR="$CATALINA_BASE/webapps $CATALINA_BASE/work $CATALINA_BASE/logs" + + # creation du repertoire CATALINA_BASE si besoin + mkdir -p $TOMCAT_WRITABLE_DIR + if [ ! -d "$CATALINA_BASE/conf" ]; then + cp -a $CATALINA_HOME/conf $CATALINA_BASE + # TODO faire modif port, user et utf + sed -i "s/8005/180$v${!i}/g" $CATALINA_BASE/conf/server.xml + sed -i "s/8080/188$v${!i}/g" $CATALINA_BASE/conf/server.xml + sed -i "s/8443/184$v${!i}/g" $CATALINA_BASE/conf/server.xml + sed -i "s/8009/189$v${!i}/g" $CATALINA_BASE/conf/server.xml + fi + chown -R root.$TOMCAT_GROUP $CATALINA_BASE + chmod -R g+r $CATALINA_BASE + chmod -R g+w $TOMCAT_WRITABLE_DIR + + define_variable +#echo "$ACTION $CATALINA_HOME $CATALINA_BASE $CATALINA_SH" + do_action $ACTION + done +done + +exit 0 Property changes on: demo-tools/tomcat/tomcat-init.d ___________________________________________________________________ Added: svn:executable + *

1 0

r38 - in forge-tools/sys: chorem.org codelutin.com nuiton.org
by maven-release＠users.forge.codelutin.com Feb. 18, 2014

Feb. 18, 2014

Author: maven-release Date: 2014-02-18 11:28:22 +0100 (Tue, 18 Feb 2014) New Revision: 38 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/38 Log: refs #4210 (add android support) Modified: forge-tools/sys/chorem.org/tomcat-default forge-tools/sys/codelutin.com/tomcat-default forge-tools/sys/nuiton.org/tomcat-default Modified: forge-tools/sys/chorem.org/tomcat-default =================================================================== --- forge-tools/sys/chorem.org/tomcat-default 2014-02-17 16:27:00 UTC (rev 37) +++ forge-tools/sys/chorem.org/tomcat-default 2014-02-18 10:28:22 UTC (rev 38) @@ -1,3 +1,4 @@ export JAVA_HOME=/opt/jdk export JAVA_OPTS="-XX:MaxPermSize=256m -Xmx448m -Dhudson.DNSMultiCast.disabled=true -Djava.awt.headless=true -Dsvnkit.http.sslProtocols="SSLv3"" export JENKINS_HOME=/var/local/forge/data/chorem.org/jenkins +export ANDROID_HOME=/opt/android Modified: forge-tools/sys/codelutin.com/tomcat-default =================================================================== --- forge-tools/sys/codelutin.com/tomcat-default 2014-02-17 16:27:00 UTC (rev 37) +++ forge-tools/sys/codelutin.com/tomcat-default 2014-02-18 10:28:22 UTC (rev 38) @@ -1,3 +1,4 @@ export JAVA_HOME=/opt/jdk export JAVA_OPTS="-XX:MaxPermSize=256m -Xmx448m -Dhudson.DNSMultiCast.disabled=true -Djava.awt.headless=true -Dsvnkit.http.sslProtocols="SSLv3"" export JENKINS_HOME=/var/local/forge/data/codelutin.com/jenkins +export ANDROID_HOME=/opt/android Modified: forge-tools/sys/nuiton.org/tomcat-default =================================================================== --- forge-tools/sys/nuiton.org/tomcat-default 2014-02-17 16:27:00 UTC (rev 37) +++ forge-tools/sys/nuiton.org/tomcat-default 2014-02-18 10:28:22 UTC (rev 38) @@ -1,3 +1,4 @@ export JAVA_HOME=/opt/jdk export JAVA_OPTS="-XX:MaxPermSize=256m -Xmx448m -Dhudson.DNSMultiCast.disabled=true -Djava.awt.headless=true -Dsvnkit.http.sslProtocols="SSLv3"" export JENKINS_HOME=/var/local/forge/data/nuiton.org/jenkins +export ANDROID_HOME=/opt/android

1 0

r37 - forge-tools/data/codelutin.com/maven
by maven-release＠users.forge.codelutin.com Feb. 17, 2014

Feb. 17, 2014

Author: maven-release Date: 2014-02-17 17:27:00 +0100 (Mon, 17 Feb 2014) New Revision: 37 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/37 Log: add password in settings.xml Modified: forge-tools/data/codelutin.com/maven/settings.xml Modified: forge-tools/data/codelutin.com/maven/settings.xml =================================================================== --- forge-tools/data/codelutin.com/maven/settings.xml 2014-02-17 16:21:44 UTC (rev 36) +++ forge-tools/data/codelutin.com/maven/settings.xml 2014-02-17 16:27:00 UTC (rev 37) @@ -19,7 +19,7 @@ <id>redmine-forge.codelutin.com</id> <username>ci</username>  - <password>{4Ki7Bo0f/OEHNAz4xjQGSiu2KkxyJlxLxZ5bCF/Z6xs=}</password> + <password>{bQbsv6xJ5OQH0ZJVDDLCA+E3epcD5JgrZ73Je6qx/pI=}</password> <privateKey>{dDRCGmV78GIHxK8hGRoswd+bgBpomlTrvmz7oHvrIeTWh5avk41HXGgT4aLmlnqfoSA3YWq6Gxl6tVb8P0Punw==}</privateKey> </server>

1 0