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

r58 - scripts/redmine-tools
by maven-release＠users.forge.codelutin.com 18 Mar '14

18 Mar '14

Author: maven-release Date: 2014-03-18 11:21:20 +0100 (Tue, 18 Mar 2014) New Revision: 58 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/58 Log: refs #4626 (fix codelutin.com release email sender) Modified: scripts/redmine-tools/list-default-option.cfg Modified: scripts/redmine-tools/list-default-option.cfg =================================================================== --- scripts/redmine-tools/list-default-option.cfg 2014-03-05 10:18:15 UTC (rev 57) +++ scripts/redmine-tools/list-default-option.cfg 2014-03-18 10:21:20 UTC (rev 58) @@ -3,6 +3,8 @@ # config_list -i list-default-option.cfg <list_name> # # actually: +# 20130318 chemit(a)codelutin.com +# - add '^.*(a)users.codelutin.com' and 'noreply(a)codelutin.com' as permanent possible poster # 20111026 chemit(a)codelutin.com # - add '^.*(a)users.forge.codelutin.com' and 'noreply(a)forge.codelutin.com' as permanent possible poster # 20100106 chemit @@ -47,7 +49,7 @@ # expression match. A line consisting of the @ character followed by a # list name specifies another Mailman list in this installation, all of # whose member addresses will be accepted for this list. -accept_these_nonmembers = ['^.*(a)codelutin.com', '^.*(a)users.nuiton.org', '^.*(a)users.chorem.org', '^.*(a)users.forge.codelutin.com', 'noreply(a)nuiton.org', 'noreply(a)chorem.org', 'noreply(a)forge.codelutin.com'] +accept_these_nonmembers = ['^.*(a)codelutin.com', '^.*(a)users.nuiton.org', '^.*(a)users.chorem.org', '^.*(a)users.forge.codelutin.com', '^.*(a)users.codelutin.com', 'noreply(a)nuiton.org', 'noreply(a)chorem.org', 'noreply(a)forge.codelutin.com', 'noreply(a)codelutin.com'] # When a post from a non-member is received, the message's sender is # matched against the list of explicitly <a

1 0

r57 - scripts/maven-release
by maven-release＠users.forge.codelutin.com 05 Mar '14

05 Mar '14

Author: maven-release Date: 2014-03-05 11:18:15 +0100 (Wed, 05 Mar 2014) New Revision: 57 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/57 Log: refs #3653 (improve doc) Modified: scripts/maven-release/deploy-to-demo-from-GAV.sh Modified: scripts/maven-release/deploy-to-demo-from-GAV.sh =================================================================== --- scripts/maven-release/deploy-to-demo-from-GAV.sh 2014-03-05 10:15:52 UTC (rev 56) +++ scripts/maven-release/deploy-to-demo-from-GAV.sh 2014-03-05 10:18:15 UTC (rev 57) @@ -32,7 +32,8 @@ echo " -v version version of war to collect" echo " deployType type of deploy to do (must be one amoung [$DEPLOY_TYPES])" echo "" - echo "example: $(basename $0) -b -s cerqual-nexus-repository -r http://nexus.nuiton.org/nexus/content/repositories/agrosyst-release -g fr.cerqual -a nflogement-extranet-web -v 1.1.5 latest" + echo "example (anon): $(basename $0) -b -g org.chorem.pollen -a pollen-ui-struts2 -v 1.5.5 latest" + echo "example (auth): $(basename $0) -b -s cerqual-nexus-repository -r http://nexus.nuiton.org/nexus/content/repositories/agrosyst-release -g fr.cerqual -a nflogement-extranet-web -v 1.1.5 latest" echo "-----------------------------------------------------------------------------------" bye_bye $1

1 0

r56 - scripts/maven-release
by maven-release＠users.forge.codelutin.com 05 Mar '14

05 Mar '14

Author: maven-release Date: 2014-03-05 11:15:52 +0100 (Wed, 05 Mar 2014) New Revision: 56 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/56 Log: refs #3653 (add authenticate mode) Modified: scripts/maven-release/deploy-to-demo-from-GAV.sh Modified: scripts/maven-release/deploy-to-demo-from-GAV.sh =================================================================== --- scripts/maven-release/deploy-to-demo-from-GAV.sh 2014-03-05 10:15:00 UTC (rev 55) +++ scripts/maven-release/deploy-to-demo-from-GAV.sh 2014-03-05 10:15:52 UTC (rev 56) @@ -32,7 +32,7 @@ echo " -v version version of war to collect" echo " deployType type of deploy to do (must be one amoung [$DEPLOY_TYPES])" echo "" - echo "example: $(basename $0) -b -s cerqual-nexus-repository -g fr.cerqual -a nflogement-extranet-web -v 1.1.5 latest" + echo "example: $(basename $0) -b -s cerqual-nexus-repository -r http://nexus.nuiton.org/nexus/content/repositories/agrosyst-release -g fr.cerqual -a nflogement-extranet-web -v 1.1.5 latest" echo "-----------------------------------------------------------------------------------" bye_bye $1

1 0

r55 - scripts/maven-release
by maven-release＠users.forge.codelutin.com 05 Mar '14

05 Mar '14

Author: maven-release Date: 2014-03-05 11:15:00 +0100 (Wed, 05 Mar 2014) New Revision: 55 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/55 Log: refs #3653 (add authenticate mode) Modified: scripts/maven-release/deploy-to-demo-from-GAV.pom scripts/maven-release/deploy-to-demo-from-GAV.sh Modified: scripts/maven-release/deploy-to-demo-from-GAV.pom =================================================================== --- scripts/maven-release/deploy-to-demo-from-GAV.pom 2014-03-03 11:39:09 UTC (rev 54) +++ scripts/maven-release/deploy-to-demo-from-GAV.pom 2014-03-05 10:15:00 UTC (rev 55) @@ -110,6 +110,10 @@ <property>file</property> <message>You must set a file property!</message> </requireProperty> + <requireProperty> + <property>repo</property> + <message>You must set a repo property!</message> + </requireProperty> </rules> <ignoreCache>true</ignoreCache> <failFast>true</failFast> @@ -137,9 +141,7 @@ <packaging>${packaging}</packaging> <classifier>${classifier}</classifier> <transitive>false</transitive> - <remoteRepositories> - http://nexus.nuiton.org/nexus/content/repositories/other-releases - </remoteRepositories> + <remoteRepositories>${repo}</remoteRepositories> </configuration> </execution> </executions> Modified: scripts/maven-release/deploy-to-demo-from-GAV.sh =================================================================== --- scripts/maven-release/deploy-to-demo-from-GAV.sh 2014-03-03 11:39:09 UTC (rev 54) +++ scripts/maven-release/deploy-to-demo-from-GAV.sh 2014-03-05 10:15:00 UTC (rev 55) @@ -18,13 +18,15 @@ print_usage_and_exit() { echo "-----------------------------------------------------------------------------------" - echo "usage $(basename $0) [-h] [-b] [-d] [-c classifier] [-p packaging] [-e deployFile] -g groupId -a artifactId -v version deployType" + echo "usage $(basename $0) [-h] [-b] [-d] [-c classifier] [-p packaging] [-e deployFile] [-s serverId] [-r repositoryUrl] -g groupId -a artifactId -v version deployType" echo " -h show usage and exit" echo " -b for batch mode (no question asked)" echo " -d for dryRun mode (nothing is deployed)" echo " -c optional classifier of war to grab" echo " -p optional packaging, if not set will use war" echo " -e optional deploy file to use, if not set will use deploy (the file must exists in $DEPLOY_TYPE directory)" + echo " -s optional serverId to use (must then fill the -r option)" + echo " -r optional repository url to use" echo " -g groupId groupId of war to collect" echo " -a artifactId artifactId of war to collect" echo " -v version version of war to collect" @@ -55,8 +57,10 @@ PACKAGING=war CLASSIFIER= DEPLOY_FILE=deploy +REPOSITORY_URL= +SERVER_ID= -while getopts ":g:a:v:c:p:e:hbd" opt; do +while getopts ":g:a:v:c:p:e:s:r:hbd" opt; do case $opt in h) echo "OK" @@ -86,6 +90,12 @@ e) DEPLOY_FILE=$OPTARG ;; + s) + SERVER_ID=$OPTARG + ;; + r) + REPOSITORY_URL=$OPTARG + ;; \?) echo "KO" echo "Invalid option: -$OPTARG" >&2 @@ -108,6 +118,22 @@ fi DEPLOY_TYPE="$1" +# check serverId and repositoryUrl options +if [ ! "$SERVER_ID" = "" ]; then + if [ "$REPOSITORY_URL" = "" ]; then + echo "KO" + echo "Mandatory repository url required (-r) if serverId filled" + print_usage_and_exit 1 + fi + REPOSITORY="$SERVER_ID::::$REPOSITORY_URL" +else + if [ ! "$REPOSITORY_URL" = "" ]; then + REPOSITORY="$REPOSITORY_URL" + else + REPOSITORY="http://nexus.nuiton.org/nexus/content/repositories/other-releases" + fi +fi + # check deploy type exist if [ ! -d $DEPLOY_TYPE ]; then echo "KO" @@ -136,6 +162,7 @@ echo "----------------------------------------------------------" echo "- application = $APPLICATION_NAME" echo "- deployType = $DEPLOY_TYPE" +echo "- repository = $REPOSITORY" echo "- GAV = $GROUP_ID:$ARTIFACT_ID:$PACKAGING:$VERSION" if [ $BATCH_MODE -eq 1 ]; then echo "- batchMode = ON" @@ -148,15 +175,13 @@ fi echo "- file = $DEPLOY_TYPE/$FILE" echo "- deploy file = $DEPLOY_TYPE/$DEPLOY_FILE" - - echo "----------------------------------------------------------" if [ $BATCH_MODE -eq 0 ]; then # ask user to confirm echo -n "Accept the change ? [Y/n]" read r - if [ ! -z "$r" -o "$r" = "Y" -o "$r" = "y" ]; then + if [ -n "$r" -a ! "$r" = "Y" -a ! "$r" = "y" ]; then echo "User cancel operation" bye_bye 1 fi @@ -167,7 +192,7 @@ # get war to deploy echo -n "2/3 Get war $FILE to deploy..." -MVN_OPTIONS="-DgroupId=$GROUP_ID -DartifactId=$ARTIFACT_ID -Dversion=$VERSION -DserverId=$SERVER_ID -Dfile=$FILE -Dpackaging=$PACKAGING -Dclassifier=$CLASSIFIER" +MVN_OPTIONS="-DgroupId=$GROUP_ID -DartifactId=$ARTIFACT_ID -Dversion=$VERSION -Drepo=$REPOSITORY -Dfile=$FILE -Dpackaging=$PACKAGING -Dclassifier=$CLASSIFIER" ${M2_HOME}/bin/mvn -f ~/bin/deploy-to-demo-from-GAV.pom $MVN_OPTIONS > $LOG_FILE test_ok_or_bye_bye $? "Error while executing '${M2_HOME}/bin/mvn $MVN_OPTIONS ..."

1 0

r54 - scripts/redmine-tools
by tchemit＠users.forge.codelutin.com 03 Mar '14

03 Mar '14

Author: tchemit Date: 2014-03-03 12:39:09 +0100 (Mon, 03 Mar 2014) New Revision: 54 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/54 Log: refs #4626: Normalisation des forges (fix svn commit email) Modified: scripts/redmine-tools/commit-email.pl Modified: scripts/redmine-tools/commit-email.pl =================================================================== --- scripts/redmine-tools/commit-email.pl 2014-03-02 13:37:30 UTC (rev 53) +++ scripts/redmine-tools/commit-email.pl 2014-03-03 11:39:09 UTC (rev 54) @@ -342,11 +342,12 @@ if ($redminePlatform =~ /^svn-(.*)$/) { $redminePlatform = $1; + } my $redmineProject = $paths[5]; -my $redmineUrl = "http://$redminePlatform/projects/$redmineProject/repository/revisions/$rev"; +my $redmineUrl = "http://forge.$redminePlatform/projects/$redmineProject/repository/revisions…"; # Put together the body of the log message.

1 0

r53 - forge-tools/data/nuiton.org/maven
by tchemit＠users.forge.codelutin.com 02 Mar '14

02 Mar '14

Author: tchemit Date: 2014-03-02 14:37:30 +0100 (Sun, 02 Mar 2014) New Revision: 53 Url: http://codelutin.com/projects/adminsys/repository/revisions/53 Log: fix jredmine karma Modified: forge-tools/data/nuiton.org/maven/settings.xml Modified: forge-tools/data/nuiton.org/maven/settings.xml =================================================================== --- forge-tools/data/nuiton.org/maven/settings.xml 2014-03-01 18:22:28 UTC (rev 52) +++ forge-tools/data/nuiton.org/maven/settings.xml 2014-03-02 13:37:30 UTC (rev 53) @@ -68,8 +68,8 @@ <server> <id>jredmine-test</id> <username>ci</username> - <password>{ucUcHUDfX8sHezGY6HU4Ur6B012utPXrxv4DIrr1nJc=}</password> - <privateKey>{DmlfyrZP2XAHAkVCS+IBDH106kXTkMNlGnkzTVLNSQD43YAlMudCJ7TqCu7Iw33/vsS7kI2WdrlfHWJDv7NtnA==}</privateKey> + <password>{g4gwcaaplGUHDeWLqgvUBrAOn4iGsHe7j6NdMQDs6HI=}</password> + <privateKey>{k6vYnCPznIEHD6hhMF5ius8/d+RKuX/DpW2EGrewgMejnwrscJf2rYXBcJCvPax7izzq4pGF3N9fBBQjR7ySEA==}</privateKey> </server>

1 0

r52 - in forge-tools/sys: . chorem.org codelutin.com nuiton.org
by maven-release＠users.forge.codelutin.com 01 Mar '14

01 Mar '14

Author: maven-release Date: 2014-03-01 19:22:28 +0100 (Sat, 01 Mar 2014) New Revision: 52 Url: http://codelutin.com/projects/adminsys/repository/revisions/52 Log: add automatic tomcat download script Added: forge-tools/sys/check-get-tomcat.sh Modified: forge-tools/sys/chorem.org/tomcat-init.d forge-tools/sys/codelutin.com/tomcat-init.d forge-tools/sys/nuiton.org/tomcat-init.d Added: forge-tools/sys/check-get-tomcat.sh =================================================================== --- forge-tools/sys/check-get-tomcat.sh (rev 0) +++ forge-tools/sys/check-get-tomcat.sh 2014-03-01 18:22:28 UTC (rev 52) @@ -0,0 +1,88 @@ +#!/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 redemarrer les tomcat des forges +# - service tomcat-nuiton.org restart +# - service tomcat-chorem.org restart +# - service tomcat-codelutin.com restart +# + +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%%.*} + sed -i 's/<Connector /<Connector URIEncoding="UTF-8" /g' $UNPACK_DIR/conf/server.xml + 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 7 Property changes on: forge-tools/sys/check-get-tomcat.sh ___________________________________________________________________ Added: svn:executable + * Modified: forge-tools/sys/chorem.org/tomcat-init.d =================================================================== --- forge-tools/sys/chorem.org/tomcat-init.d 2014-02-28 16:59:28 UTC (rev 51) +++ forge-tools/sys/chorem.org/tomcat-init.d 2014-03-01 18:22:28 UTC (rev 52) @@ -27,7 +27,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin DESC="Tomcat servlet engine" DAEMON=/usr/bin/jsvc -CATALINA_HOME=/opt/apache-tomcat +CATALINA_HOME=/opt/apache-tomcat-7 DEFAULT=/etc/default/$NAME LOG=/var/log/$NAME.log CATALINA_BASE=/var/local/forge/exec/$NAME Modified: forge-tools/sys/codelutin.com/tomcat-init.d =================================================================== --- forge-tools/sys/codelutin.com/tomcat-init.d 2014-02-28 16:59:28 UTC (rev 51) +++ forge-tools/sys/codelutin.com/tomcat-init.d 2014-03-01 18:22:28 UTC (rev 52) @@ -27,7 +27,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin DESC="Tomcat servlet engine" DAEMON=/usr/bin/jsvc -CATALINA_HOME=/opt/apache-tomcat +CATALINA_HOME=/opt/apache-tomcat-7 DEFAULT=/etc/default/$NAME LOG=/var/log/$NAME.log CATALINA_BASE=/var/local/forge/exec/$NAME Modified: forge-tools/sys/nuiton.org/tomcat-init.d =================================================================== --- forge-tools/sys/nuiton.org/tomcat-init.d 2014-02-28 16:59:28 UTC (rev 51) +++ forge-tools/sys/nuiton.org/tomcat-init.d 2014-03-01 18:22:28 UTC (rev 52) @@ -27,7 +27,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin DESC="Tomcat servlet engine" DAEMON=/usr/bin/jsvc -CATALINA_HOME=/opt/apache-tomcat +CATALINA_HOME=/opt/apache-tomcat-7 DEFAULT=/etc/default/$NAME LOG=/var/log/$NAME.log CATALINA_BASE=/var/local/forge/exec/$NAME

1 0