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

r62 - in forge-tools/sys: chorem.org codelutin.com nuiton.org
by maven-release＠users.forge.codelutin.com 17 Apr '14

17 Apr '14

Author: maven-release Date: 2014-04-17 08:23:10 +0200 (Thu, 17 Apr 2014) New Revision: 62 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/62 Log: use /opt/jdk7 as default jdk 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-04-17 06:19:49 UTC (rev 61) +++ forge-tools/sys/chorem.org/tomcat-default 2014-04-17 06:23:10 UTC (rev 62) @@ -1,4 +1,4 @@ -export JAVA_HOME=/opt/jdk +export JAVA_HOME=/opt/jdk7 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-04-17 06:19:49 UTC (rev 61) +++ forge-tools/sys/codelutin.com/tomcat-default 2014-04-17 06:23:10 UTC (rev 62) @@ -1,4 +1,4 @@ -export JAVA_HOME=/opt/jdk +export JAVA_HOME=/opt/jdk7 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-04-17 06:19:49 UTC (rev 61) +++ forge-tools/sys/nuiton.org/tomcat-default 2014-04-17 06:23:10 UTC (rev 62) @@ -1,4 +1,4 @@ -export JAVA_HOME=/opt/jdk +export JAVA_HOME=/opt/jdk7 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

r61 - in forge-tools/sys: chorem.org codelutin.com nuiton.org
by maven-release＠users.forge.codelutin.com 17 Apr '14

17 Apr '14

Author: maven-release Date: 2014-04-17 08:19:49 +0200 (Thu, 17 Apr 2014) New Revision: 61 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/61 Log: use /opt/jdk7 as default jdk 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 Modified: forge-tools/sys/chorem.org/tomcat-init.d =================================================================== --- forge-tools/sys/chorem.org/tomcat-init.d 2014-04-05 11:55:41 UTC (rev 60) +++ forge-tools/sys/chorem.org/tomcat-init.d 2014-04-17 06:19:49 UTC (rev 61) @@ -53,7 +53,7 @@ # 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 /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-cacao /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.5-ibm /usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-blackdown /usr/lib/j2se/1.4 /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.3-sun /usr/lib/j2sdk1.3-blackdown /usr/lib/jvm/java-gcj /usr/lib/kaffe" +JDK_DIRS="/opt/jdk7 /usr/lib/jvm/default-java /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-cacao /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.5-ibm /usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-blackdown /usr/lib/j2se/1.4 /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.3-sun /usr/lib/j2sdk1.3-blackdown /usr/lib/jvm/java-gcj /usr/lib/kaffe" # Look for the right JVM to use for jdir in $JDK_DIRS; do Modified: forge-tools/sys/codelutin.com/tomcat-init.d =================================================================== --- forge-tools/sys/codelutin.com/tomcat-init.d 2014-04-05 11:55:41 UTC (rev 60) +++ forge-tools/sys/codelutin.com/tomcat-init.d 2014-04-17 06:19:49 UTC (rev 61) @@ -53,7 +53,7 @@ # 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 /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-cacao /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.5-ibm /usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-blackdown /usr/lib/j2se/1.4 /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.3-sun /usr/lib/j2sdk1.3-blackdown /usr/lib/jvm/java-gcj /usr/lib/kaffe" +JDK_DIRS="/opt/jdk7 /usr/lib/jvm/default-java /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-cacao /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.5-ibm /usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-blackdown /usr/lib/j2se/1.4 /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.3-sun /usr/lib/j2sdk1.3-blackdown /usr/lib/jvm/java-gcj /usr/lib/kaffe" # Look for the right JVM to use for jdir in $JDK_DIRS; do Modified: forge-tools/sys/nuiton.org/tomcat-init.d =================================================================== --- forge-tools/sys/nuiton.org/tomcat-init.d 2014-04-05 11:55:41 UTC (rev 60) +++ forge-tools/sys/nuiton.org/tomcat-init.d 2014-04-17 06:19:49 UTC (rev 61) @@ -53,7 +53,7 @@ # 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 /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-cacao /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.5-ibm /usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-blackdown /usr/lib/j2se/1.4 /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.3-sun /usr/lib/j2sdk1.3-blackdown /usr/lib/jvm/java-gcj /usr/lib/kaffe" +JDK_DIRS="/opt/jdk7 /usr/lib/jvm/default-java /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-cacao /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.5-ibm /usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-blackdown /usr/lib/j2se/1.4 /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.3-sun /usr/lib/j2sdk1.3-blackdown /usr/lib/jvm/java-gcj /usr/lib/kaffe" # Look for the right JVM to use for jdir in $JDK_DIRS; do

1 0

r60 - scripts/redmine-tools
by tchemit＠users.forge.codelutin.com 05 Apr '14

05 Apr '14

Author: tchemit Date: 2014-04-05 13:55:41 +0200 (Sat, 05 Apr 2014) New Revision: 60 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/60 Log: add update-tomcat-7 script (copy also tomcat-users conf) Modified: scripts/redmine-tools/update-tomcat-7.sh Modified: scripts/redmine-tools/update-tomcat-7.sh =================================================================== --- scripts/redmine-tools/update-tomcat-7.sh 2014-04-05 11:51:28 UTC (rev 59) +++ scripts/redmine-tools/update-tomcat-7.sh 2014-04-05 11:55:41 UTC (rev 60) @@ -68,6 +68,7 @@ local UNPACK_DIR=$TARGET_DIR/$DIR local UNPACK_OLD_DIR=$TARGET_DIR/apache-tomcat-$OLD_RELEASE cp $UNPACK_OLD_DIR/webapps/*.war $UNPACK_DIR/webapps + cp $UNPACK_OLD_DIR/conf/tomcat-users.xml $UNPACK_DIR/conf local LINK=$LINK_DIR/${DIR%%.*} sed -i 's/<Connector /<Connector URIEncoding="UTF-8" /g' $UNPACK_DIR/conf/server.xml rm -f $LINK

1 0

r59 - scripts/redmine-tools
by tchemit＠users.forge.codelutin.com 05 Apr '14

05 Apr '14

Author: tchemit Date: 2014-04-05 13:51:28 +0200 (Sat, 05 Apr 2014) New Revision: 59 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/59 Log: add update-tomcat-7 script Added: scripts/redmine-tools/update-tomcat-7.sh Copied: scripts/redmine-tools/update-tomcat-7.sh (from rev 58, forge-tools/sys/check-get-tomcat.sh) =================================================================== --- scripts/redmine-tools/update-tomcat-7.sh (rev 0) +++ scripts/redmine-tools/update-tomcat-7.sh 2014-04-05 11:51:28 UTC (rev 59) @@ -0,0 +1,89 @@ +#!/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-7 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 "getLastRelease: $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 OLD_RELEASE=$1 + local RELEASE=$2 + 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 UNPACK_OLD_DIR=$TARGET_DIR/apache-tomcat-$OLD_RELEASE + cp $UNPACK_OLD_DIR/webapps/*.war $UNPACK_DIR/webapps + 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 $CURRENT_RELEASE $LAST_RELEASE + fi +} + +update 7

1 0