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

r115 - in forge-tools/sys: chorem.org codelutin.com nuiton.org
by maven-release＠users.forge.codelutin.com Nov. 8, 2014

Nov. 8, 2014

Author: maven-release Date: 2014-11-08 10:04:18 +0000 (Sat, 08 Nov 2014) New Revision: 115 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/115 Log: add more memory for each jenkins instance 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-11-08 10:03:33 UTC (rev 114) +++ forge-tools/sys/chorem.org/tomcat-default 2014-11-08 10:04:18 UTC (rev 115) @@ -1,4 +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 JAVA_OPTS="-XX:MaxPermSize=256m -Xmx2048m -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-11-08 10:03:33 UTC (rev 114) +++ forge-tools/sys/codelutin.com/tomcat-default 2014-11-08 10:04:18 UTC (rev 115) @@ -1,4 +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 JAVA_OPTS="-XX:MaxPermSize=256m -Xmx2048m -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-11-08 10:03:33 UTC (rev 114) +++ forge-tools/sys/nuiton.org/tomcat-default 2014-11-08 10:04:18 UTC (rev 115) @@ -1,4 +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 JAVA_OPTS="-XX:MaxPermSize=256m -Xmx2048m -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

r114 - forge-tools/sys
by maven-release＠users.forge.codelutin.com Nov. 8, 2014

Nov. 8, 2014

Author: maven-release Date: 2014-11-08 10:03:33 +0000 (Sat, 08 Nov 2014) New Revision: 114 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/114 Log: log when jenkins is updated Modified: forge-tools/sys/upgrade-jenkins.sh Modified: forge-tools/sys/upgrade-jenkins.sh =================================================================== --- forge-tools/sys/upgrade-jenkins.sh 2014-10-16 09:41:10 UTC (rev 113) +++ forge-tools/sys/upgrade-jenkins.sh 2014-11-08 10:03:33 UTC (rev 114) @@ -13,7 +13,8 @@ update_tomcat() { TOMCAT_INSTANCE=tomcat-$1 - WAR=$2 + JENKINS_VERSION=$2 + WAR=$3 TOMCAT_WEBAPPS=/var/local/forge/exec/$TOMCAT_INSTANCE/webapps # stop tomcat @@ -27,6 +28,9 @@ # start tomcat service $TOMCAT_INSTANCE start + + # log to intervention files + echo "$(date) Update jenkins (version $2) for forge $1" >> /var/local/forge/sys/updates.log } if [ ! $# -eq 1 ]; then @@ -62,5 +66,5 @@ # For each tomcat, do update for i in nuiton.org chorem.org codelutin.com ; do - update_tomcat $i $WAR_PATH + update_tomcat $i $VERSION $WAR_PATH done

1 0

r113 - forge-tools/sys
by maven-release＠users.forge.codelutin.com Oct. 16, 2014

Oct. 16, 2014

Author: maven-release Date: 2014-10-16 11:41:10 +0200 (Thu, 16 Oct 2014) New Revision: 113 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/113 Log: fix get tomcat script Modified: forge-tools/sys/check-get-tomcat.sh Modified: forge-tools/sys/check-get-tomcat.sh =================================================================== --- forge-tools/sys/check-get-tomcat.sh 2014-10-09 16:05:30 UTC (rev 112) +++ forge-tools/sys/check-get-tomcat.sh 2014-10-16 09:41:10 UTC (rev 113) @@ -44,8 +44,11 @@ # @param $1 returned value # @param $2 tomcat version 6, 7 or 8 getLastRelease () { - local VERSION=$2 - local result=$(curl -s $MIRROR/tomcat-$VERSION/ |grep "href=.v" |sed -re 's/.*>v([0-9]+.[0-9]+.[0-9]+).*/\1/') + local VERSION="$2" + url=$MIRROR/tomcat-$VERSION/ + debug "URL to check: $url" + #local result=$(curl -s $url |grep "href=.v" |sed -re 's/.*>v([0-9]+.[0-9]+.[0-9]+).*/\1/') + local result=$(curl -s $url |grep "href=.v" |cut -d'v' -f2 | cut -d'/' -f1 | tail -n 1) debug "last version is $result" eval $1=\$result }

1 0

r112 - scripts/redmine-tools
by tchemit＠users.forge.codelutin.com Oct. 9, 2014

Oct. 9, 2014

Author: tchemit Date: 2014-10-09 18:05:30 +0200 (Thu, 09 Oct 2014) New Revision: 112 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/112 Log: add more alias for common resources + fix ruby test Modified: scripts/redmine-tools/create-project-site.sh scripts/redmine-tools/project-site.rb Modified: scripts/redmine-tools/create-project-site.sh =================================================================== --- scripts/redmine-tools/create-project-site.sh 2014-10-09 09:49:02 UTC (rev 111) +++ scripts/redmine-tools/create-project-site.sh 2014-10-09 16:05:30 UTC (rev 112) @@ -19,6 +19,8 @@ DocumentRoot /var/lib/doc/site/$FORGE/$PROJECT + Alias /v/common /var/lib/doc/maven-site/$FORGE/common + Alias /v/public /var/lib/doc/maven-site/$FORGE/public Alias /v /var/lib/doc/maven-site/$FORGE/$PROJECT ErrorLog /var/log/apache2/site-$PROJECT.$FORGE-error.log @@ -38,6 +40,9 @@ </IfModule> DocumentRoot /var/lib/doc/site/$FORGE/$PROJECT + + Alias /v/common /var/lib/doc/maven-site/$FORGE/common + Alias /v/public /var/lib/doc/maven-site/$FORGE/public Alias /v /var/lib/doc/maven-site/$FORGE/$PROJECT ErrorLog /var/log/apache2/site-$PROJECT.$FORGE-ssl-error.log Modified: scripts/redmine-tools/project-site.rb =================================================================== --- scripts/redmine-tools/project-site.rb 2014-10-09 09:49:02 UTC (rev 111) +++ scripts/redmine-tools/project-site.rb 2014-10-09 16:05:30 UTC (rev 112) @@ -171,6 +171,6 @@ end -if update_apache = 1 +if update_apache == 1 reload_apache() end

1 0

r111 - scripts/redmine-tools
by tchemit＠users.forge.codelutin.com Oct. 9, 2014

Oct. 9, 2014

Author: tchemit Date: 2014-10-09 11:49:02 +0200 (Thu, 09 Oct 2014) New Revision: 111 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/111 Log: refs #5074: Mise en place git (mise a jour des sites techniques) amelioration autres script du cron Added: scripts/redmine-tools/project-site.rb scripts/redmine-tools/project-technical-site.rb scripts/redmine-tools/update_technical_site.sh Modified: scripts/redmine-tools/create-project-site.sh scripts/redmine-tools/cron-redmine scripts/redmine-tools/project-scm.rb Modified: scripts/redmine-tools/create-project-site.sh =================================================================== --- scripts/redmine-tools/create-project-site.sh 2014-10-09 08:52:14 UTC (rev 110) +++ scripts/redmine-tools/create-project-site.sh 2014-10-09 09:49:02 UTC (rev 111) @@ -5,6 +5,7 @@ FORGE=$1 PROJECT=$2 +PROJECT_NAME=$3 #TODO Add dns entry @@ -49,3 +50,59 @@ mkdir /var/lib/doc/maven-site/$FORGE/$PROJECT 2> /dev/null a2ensite $APACHE_SITE_NAME > /dev/null + +INDEX_FILE=/var/lib/doc/site/$FORGE/$PROJECT/index.html + +if [ ! -f $INDEX_FILE ]; +then + echo "Create default index.html file at $INDEX_FILE" + +cat << EOF >> $INDEX_FILE +<html> +<head> +<title>$PROJECT_NAME</title> +</head> + +<body> +<h1>$PROJECT_NAME</h1> + +<p> +The main site of $PROJECT_NAME will be soon realized. +</p> + +<p> +Meanwhile, you can consult technical sites generated by Maven +for each release (see Releases section). +</p> + +<p>Enjoy! ($PROJECT_NAME Team)</p> + +<h2>Releases</h2> + +<table> +<thead> +<tr> +<th>version</th> +<th>date</th> +<th>site</th> +</tr> +</thead> +<tr> +<td>Latest</td> +<td></td> +<td><a href="http://$PROJECT.$FORGE/v/latest">site</a></td> +</tr> +<tr> +<td>Next</td> +<td></td> +<td><a href="http://$PROJECT.$FORGE/v/develop">site</a></td> +</tr> +<tr><td colspan="5"><hr/></td></tr> + +</table> + +</body> +</html> + +EOF +fi \ No newline at end of file Modified: scripts/redmine-tools/cron-redmine =================================================================== --- scripts/redmine-tools/cron-redmine 2014-10-09 08:52:14 UTC (rev 110) +++ scripts/redmine-tools/cron-redmine 2014-10-09 09:49:02 UTC (rev 111) @@ -67,3 +67,10 @@ ruby /opt/redmine-tools/project-site.rb -f nuiton.org -k $nuiton_key >> $nuiton_log #ruby /opt/redmine-tools/project-site.rb -f chorem.org -k $chorem_key >> $chorem_log #ruby /opt/redmine-tools/project-site.rb -f codelutin.com -k $codelutin_key >> codelutin_log + +# Update project technical site +# TODO Do it for chorem.org and codelutin.com sites + +ruby /opt/redmine-tools/project-technical-site.rb -f nuiton.org -k $nuiton_key >> $nuiton_log +#ruby /opt/redmine-tools/project-technical-site.rb -f chorem.org -k $chorem_key >> $chorem_log +#ruby /opt/redmine-tools/project-technical-site.rb -f codelutin.com -k $codelutin_key >> codelutin_log Modified: scripts/redmine-tools/project-scm.rb =================================================================== --- scripts/redmine-tools/project-scm.rb 2014-10-09 08:52:14 UTC (rev 110) +++ scripts/redmine-tools/project-scm.rb 2014-10-09 09:49:02 UTC (rev 111) @@ -36,7 +36,7 @@ # # You can find more information on the redmine's wiki : http://www.redmine.org/wiki/redmine/HowTos -print "run /opt/redmine-tools/project-site.rb #{ARGV}\n" +print "run /opt/redmine-tools/project-scm.rb #{ARGV}\n" #tchemit - fix verbose deprecated warning about iconv (since it used in cron, don't want to header about it) oldverb = $VERBOSE; $VERBOSE = nil Added: scripts/redmine-tools/project-site.rb =================================================================== --- scripts/redmine-tools/project-site.rb (rev 0) +++ scripts/redmine-tools/project-site.rb 2014-10-09 09:49:02 UTC (rev 111) @@ -0,0 +1,176 @@ +#!/usr/bin/env ruby + +# == changelog +# 20111029 chemit(a)codelutin.com +# - do not check list existance with his domain name but just his list name (all our lists for all our forge are on this very server) +# 20090827 poussin +# - add call to config_list after list creation to update some list configuration +# +# == Synopsis +# +# project-site: create site structure for all projects in a Redmine +# +# == Usage +# +# project-site [OPTIONS...] -r [HOST] +# +# Examples: +# project-site --forge=nuiton.org|chorem.org|codelutin.com +# +# == Arguments (mandatory) +# +# -f, --forge=HOST nuiton.org|chorem.org|codelutin.com +# -k, --key=KEY use KEY as the Redmine API key +# +# == Options +# +# -h, --help show help and exit +# -v, --verbose verbose +# -V, --version print version and exit +# -q, --quiet no log +# +# + +print "run /opt/redmine-tools/project-site.rb #{ARGV}\n" + +#tchemit - fix verbose deprecated warning about iconv (since it used in cron, don't want to header about it) +oldverb = $VERBOSE; $VERBOSE = nil +require 'iconv' +$VERBOSE = oldverb + +require 'getoptlong' +#require 'rdoc/usage' +require 'find' +require 'etc' + +Version = "1.0" + +opts = GetoptLong.new( + ['--forge', '-f', GetoptLong::REQUIRED_ARGUMENT], + ['--key', '-k', GetoptLong::REQUIRED_ARGUMENT], + ['--verbose', '-v', GetoptLong::NO_ARGUMENT], + ['--version', '-V', GetoptLong::NO_ARGUMENT], + ['--help' , '-h', GetoptLong::NO_ARGUMENT], + ['--quiet' , '-q', GetoptLong::NO_ARGUMENT] + ) + +$verbose = 0 +$quiet = false +$forge = '' + +def log(text, options={}) + level = options[:level] || 0 + puts text unless $quiet or level > $verbose + exit 1 if options[:exit] +end + +def system_or_raise(command) + raise "\"#{command}\" failed" unless system command +end + +begin + opts.each do |opt, arg| + case opt + when '--forge'; $forge = arg.dup + when '--key'; $api_key = arg.dup + when '--verbose'; $verbose += 1 + when '--version'; puts Version; exit + when '--help'; RDoc::usage + when '--quiet'; $quiet = true + end + end +rescue + exit 1 +end + +if ($forge.empty? or $api_key.empty?) + RDoc::usage +end + +begin + require 'active_resource' +rescue LoadError + log("This script requires activeresource.\nRun 'gem install activeresource' to install it.", :exit => true) +end + +class Project < ActiveResource::Base +#include Redmine::SafeAttributes +# acts_as_customizable +#class Project < ActiveRecord::Base + + self.headers["User-agent"] = "Redmine repository manager/#{Version}" +end + +log("querying Redmine for projects...", :level => 1); + +#$redmine_host.gsub!(/^/, "http://") unless $redmine_host.match("^https?://") +#$redmine_host.gsub!(/\/$/, '') + +Project.site = "http://forge.#{$forge}/sys"; + +begin + # Get all active projects that have the Repository module enabled + projects = Project.find(:all, :conditions => "status = 1 AND parent IS NOT NULL", :params => {:key => $api_key}) +rescue => e + log("Unable to connect to #{Project.site}: #{e}", :exit => true) +end + +if projects.nil? + log('no project found, perhaps you forgot to "Enable WS for repository management"', :exit => true) +end + +log("retrieved #{projects.size} projects", :level => 1) + +def apache_site_not_exists(forge, projectId) + cmd ="ls /etc/apache2/sites-available | grep -i \"site-#{projectId}.#{forge}\" > /dev/null" + system(cmd) && $? && $?.exitstatus == 0 ? false : true +end + +def apache_site_create(forge, projectId, projectName) + log("will create apache site-#{projectId}.#{forge}") + cmd = "/opt/redmine-tools/create-project-site.sh #{forge} #{projectId} #{projectName}" +# cmd = "/opt/redmine-tools/ #{forge} #{listname}" + + result = system(cmd) && $? && $?.exitstatus == 0 ? true : false + + if result + log("apache site #{projectId}@#{forge} created", :level => 1) + else + log("apache site failed #{projectId}@#{forge}", :level => 1) + end + result +end + +def reload_apache() + log("will reload apache") + system("service apache2 reload") +end + +update_apache = 0 + +projects.each do |project| + log("treating project #{project.name} #{project.attributes}", :level => 1) + + if project.identifier.empty? + log("\tno identifier for project #{project.name}") + next + elsif not project.identifier.match(/^[a-z0-9\-]+$/) + log("\tinvalid identifier for project #{project.name} : #{project.identifier}"); + next; + end + + projectId = "#{project.identifier}" + projectName = "#{project.name}" + + # check apache site existance + if apache_site_not_exists($forge, projectId) + apache_site_create($forge, projectId, projectName) + update_apache = 1 + end + + +end + +if update_apache = 1 + reload_apache() +end Property changes on: scripts/redmine-tools/project-site.rb ___________________________________________________________________ Added: svn:executable + * Added: scripts/redmine-tools/project-technical-site.rb =================================================================== --- scripts/redmine-tools/project-technical-site.rb (rev 0) +++ scripts/redmine-tools/project-technical-site.rb 2014-10-09 09:49:02 UTC (rev 111) @@ -0,0 +1,143 @@ +#!/usr/bin/env ruby + +# == changelog +# +# == Synopsis +# +# project-tecnical-site: update technical site (latest link + index.html page) for all projects in a Redmine +# +# == Usage +# +# project-technical-site [OPTIONS...] -r [HOST] +# +# Examples: +# project-technical-site --forge=nuiton.org|chorem.org|codelutin.com +# +# == Arguments (mandatory) +# +# -f, --forge=HOST nuiton.org|chorem.org|codelutin.com +# -k, --key=KEY use KEY as the Redmine API key +# +# == Options +# +# -h, --help show help and exit +# -v, --verbose verbose +# -V, --version print version and exit +# -q, --quiet no log +# +# + +print "run /opt/redmine-tools/project-technical-site.rb #{ARGV}\n" + +#tchemit - fix verbose deprecated warning about iconv (since it used in cron, don't want to header about it) +oldverb = $VERBOSE; $VERBOSE = nil +require 'iconv' +$VERBOSE = oldverb + +require 'getoptlong' +#require 'rdoc/usage' +require 'find' +require 'etc' + +Version = "1.0" + +opts = GetoptLong.new( + ['--forge', '-f', GetoptLong::REQUIRED_ARGUMENT], + ['--key', '-k', GetoptLong::REQUIRED_ARGUMENT], + ['--verbose', '-v', GetoptLong::NO_ARGUMENT], + ['--version', '-V', GetoptLong::NO_ARGUMENT], + ['--help' , '-h', GetoptLong::NO_ARGUMENT], + ['--quiet' , '-q', GetoptLong::NO_ARGUMENT] + ) + +$verbose = 0 +$quiet = false +$forge = '' + +def log(text, options={}) + level = options[:level] || 0 + puts text unless $quiet or level > $verbose + exit 1 if options[:exit] +end + +def system_or_raise(command) + raise "\"#{command}\" failed" unless system command +end + +begin + opts.each do |opt, arg| + case opt + when '--forge'; $forge = arg.dup + when '--key'; $api_key = arg.dup + when '--verbose'; $verbose += 1 + when '--version'; puts Version; exit + when '--help'; RDoc::usage + when '--quiet'; $quiet = true + end + end +rescue + exit 1 +end + +if ($forge.empty? or $api_key.empty?) + RDoc::usage +end + +begin + require 'active_resource' +rescue LoadError + log("This script requires activeresource.\nRun 'gem install activeresource' to install it.", :exit => true) +end + +class Project < ActiveResource::Base +#include Redmine::SafeAttributes +# acts_as_customizable +#class Project < ActiveRecord::Base + + self.headers["User-agent"] = "Redmine repository manager/#{Version}" +end + +log("querying Redmine for projects...", :level => 1); + +#$redmine_host.gsub!(/^/, "http://") unless $redmine_host.match("^https?://") +#$redmine_host.gsub!(/\/$/, '') + +Project.site = "http://forge.#{$forge}/sys"; + +begin + + # Get all active projects that have the Repository module enabled + projects = Project.find(:all, :conditions => "status = 1 AND parent IS NOT NULL", :params => {:key => $api_key}) +rescue => e + log("Unable to connect to #{Project.site}: #{e}", :exit => true) +end + +if projects.nil? + log('no project found, perhaps you forgot to "Enable WS for repository management"', :exit => true) +end + +log("retrieved #{projects.size} projects", :level => 1) + +def update_technical_site(forge, projectId) + + log("will update technical site of #{projectId}.#{forge}") + cmd = "/opt/redmine-tools/update_technical_site.sh #{forge} #{projectId}" + system(cmd) + +end + +projects.each do |project| + + log("treating project #{project.name}", :level => 1) + + if project.identifier.empty? + log("\tno identifier for project #{project.name}") + next + elsif not project.identifier.match(/^[a-z0-9\-]+$/) + log("\tinvalid identifier for project #{project.name} : #{project.identifier}"); + next; + end + + update_technical_site($forge, "#{project.identifier}") + +end \ No newline at end of file Property changes on: scripts/redmine-tools/project-technical-site.rb ___________________________________________________________________ Added: svn:executable + * Added: scripts/redmine-tools/update_technical_site.sh =================================================================== --- scripts/redmine-tools/update_technical_site.sh (rev 0) +++ scripts/redmine-tools/update_technical_site.sh 2014-10-09 09:49:02 UTC (rev 111) @@ -0,0 +1,87 @@ +#!/bin/bash + +# usage: update_technical_site.sh nuiton.org|chorem.org|codelutin.com +# +# Will regenerate the index.html if necessary with last version found on redmine +# Will link to latest if necessary with last version found on redmine +# +# History +# 2014-10-08 tchemit(a)codelutin.com : initial version +# +# + +FORGE=$1 +PROJECT=$2 + + +VERSIONS_FILE=/tmp/$FORGE-$PROJECT.versions + +curl http://forge.$FORGE/jredmine/get_project_closed_versions.json/$PROJECT -s > $VERSIONS_FILE + +LAST_VERSION_NAME=$(cat $VERSIONS_FILE |sed -e 's/[{}]/''/g' | awk -v RS=',"' -F: '/^name/ {print $2}'|cut -d\" -f 2| head -n 1) +LAST_VERSION_DATE=$(cat $VERSIONS_FILE |sed -e 's/[{}]/''/g' | awk -v RS=',"' -F: '/^effective/ {print $2}'|cut -d\" -f 2| head -n 1) + +if [ "" = "$LAST_VERSION_NAME" ]; +then + echo "Skip - No version found for $PROJECT.$FORGE" + exit 0 +fi + +echo "Last version: $LAST_VERSION_NAME - $LAST_VERSION_DATE" + +DOC_DIR=/var/lib/doc/maven-site/$FORGE/$PROJECT + +if [ ! -d $DOC_DIR/$LAST_VERSION_NAME ]; +then + echo "Skip - Last version technical site not found at $DOC_DIR/$LAST_VERSION_NAME" + exit 0 +fi + +unlink $DOC_DIR/latest 2> /dev/null + +(cd $DOC_DIR ; ln -s $LAST_VERSION_NAME latest) +chown www-data. $DOC_DIR/latest + +SITE_DIR=/var/lib/doc/site/$FORGE/$PROJECT + +INDEX_FILE=$SITE_DIR/index.html +INDEX_FILE2=/tmp/$FORGE-$PROJECT-index.html +rm -rf $INDEX_FILE2 + + +grep -e "UPDATE_START" $INDEX_FILE > /dev/null +if [ $? -eq 1 ]; +then + echo "Skip - $INDEX_FILE does not contains the UPDATE_START field, do nothing" + exit 0 +fi + +grep -e "_UPDATE_ $LAST_VERSION_NAME _" $INDEX_FILE > /dev/null + +if [ $? -eq 0 ]; +then + echo "$INDEX_FILE is up-to-date" +else + echo "update $INDEX_FILE" + cat $INDEX_FILE | while read line + do + echo "$line" >> $INDEX_FILE2 + echo $line | grep -e 'UPDATE_START' > /dev/null + if [ $? -eq 0 ] ; then + # Add new version + cat <<EOF >> $INDEX_FILE2 +  + <tr> + <td>$LAST_VERSION_NAME</td> + <td>$LAST_VERSION_DATE</td> + <td><a href="http://$PROJECT.$FORGE/v/$LAST_VERSION_NAME">site</a></td> + </tr> +EOF + fi + done + #cat $INDEX_FILE2 + cp -f $INDEX_FILE $INDEX_FILE"_backup" + mv -f $INDEX_FILE2 $INDEX_FILE + chown www-data. $INDEX_FILE +fi + Property changes on: scripts/redmine-tools/update_technical_site.sh ___________________________________________________________________ Added: svn:executable + *

1 0

r110 - scripts/redmine-tools
by tchemit＠users.forge.codelutin.com Oct. 9, 2014

Oct. 9, 2014

Author: tchemit Date: 2014-10-09 10:52:14 +0200 (Thu, 09 Oct 2014) New Revision: 110 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/110 Log: refs #4057: Ameliorer les sites des applications et librairies (pour nuiton le site apache est cree automatiquement) amelioration (ajout de commentaires et TODO) dans le cron redmine Added: scripts/redmine-tools/create-project-site.sh scripts/redmine-tools/project-scm.rb Removed: scripts/redmine-tools/project-site.rb Modified: scripts/redmine-tools/cron-redmine Added: scripts/redmine-tools/create-project-site.sh =================================================================== --- scripts/redmine-tools/create-project-site.sh (rev 0) +++ scripts/redmine-tools/create-project-site.sh 2014-10-09 08:52:14 UTC (rev 110) @@ -0,0 +1,51 @@ +#!/bin/sh + +# To create the apache site for a project and enable it +# And create necessary directories + +FORGE=$1 +PROJECT=$2 + +#TODO Add dns entry + +APACHE_SITE_NAME=site-$PROJECT.$FORGE + +a2dissite $APACHE_SITE_NAME > /dev/null + +cat << EOF >> /etc/apache2/sites-available/$APACHE_SITE_NAME +<VirtualHost *:80> + ServerName $PROJECT.$FORGE + + DocumentRoot /var/lib/doc/site/$FORGE/$PROJECT + + Alias /v /var/lib/doc/maven-site/$FORGE/$PROJECT + + ErrorLog /var/log/apache2/site-$PROJECT.$FORGE-error.log + LogLevel warn + CustomLog /var/log/apache2/site-$PROJECT.$FORGE-access.log combined +</VirtualHost> +<VirtualHost 94.23.103.141:443> + ServerName $PROJECT.$FORGE + + <IfModule mod_ssl.c> + SSLEngine on + SSLCertificateFile /etc/ssl/certs/wildcard.$FORGE.crt + SSLCertificateKeyFile /etc/ssl/private/wildcard.$FORGE.key + SSLCACertificateFile /etc/ssl/certs/GandiStandardSSLCA.pem + SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown + SSLVerifyClient None + </IfModule> + + DocumentRoot /var/lib/doc/site/$FORGE/$PROJECT + Alias /v /var/lib/doc/maven-site/$FORGE/$PROJECT + + ErrorLog /var/log/apache2/site-$PROJECT.$FORGE-ssl-error.log + LogLevel warn + CustomLog /var/log/apache2/site-$PROJECT.$FORGE-ssl-access.log combined +</VirtualHost> +EOF + +mkdir /var/lib/doc/site/$FORGE/$PROJECT 2> /dev/null +mkdir /var/lib/doc/maven-site/$FORGE/$PROJECT 2> /dev/null + +a2ensite $APACHE_SITE_NAME > /dev/null Property changes on: scripts/redmine-tools/create-project-site.sh ___________________________________________________________________ Added: svn:executable + * Modified: scripts/redmine-tools/cron-redmine =================================================================== --- scripts/redmine-tools/cron-redmine 2014-10-09 08:34:42 UTC (rev 109) +++ scripts/redmine-tools/cron-redmine 2014-10-09 08:52:14 UTC (rev 110) @@ -18,31 +18,52 @@ date >> $chorem_log date >> $codelutin_log +# Create nuiton.org mailing-lists + 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.nuiton.org --admin-email moderate+nuiton.org+build(a)codelutin.com --list-domain list.nuiton.org --list-suffix build --key $nuiton_key >> $nuiton_log +# Create chorem.org mailing-lists 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.chorem.org --admin-email moderate+chorem.org+build(a)codelutin.com --list-domain list.chorem.org --list-suffix build --key $chorem_key >> $chorem_log +# Create codelutin.com mailing-lists + 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/project-list.rb --redmine-host forge.codelutin.com --admin-email moderate+codelutin.com+build(a)codelutin.com --list-domain list.forge.codelutin.com --list-suffix build --key $codelutin_key >> $codelutin_log +# Create scm repositories +#TODO Deal with git + ruby /opt/redmine-nuiton.org/extra/svn/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-chorem.org/extra/svn/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-codelutin.com/extra/svn/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 +# Manage project scm +#TODO Rename the script, this is not clear at all -bash /opt/git-tools/mark_public_git_repositories.sh nuiton.org -bash /opt/git-tools/mark_public_git_repositories.sh chorem.org -bash /opt/git-tools/mark_public_git_repositories.sh codelutin.com +ruby /opt/redmine-tools/project-scm.rb -s /var/lib/doc/nuiton.org -r forge.nuiton.org --owner publish --key $nuiton_key >> $nuiton_log +ruby /opt/redmine-tools/project-scm.rb -s /var/lib/doc/chorem.org -r forge.chorem.org --owner publish --key $chorem_key >> $chorem_log +ruby /opt/redmine-tools/project-scm.rb -s /var/lib/doc/codelutin.com -r forge.codelutin.com --owner publish --key $codelutin_key >> $codelutin_log + +# Make git project visible in gitweb +#TODO Should use a ruby script to allow private git repositories + +bash /opt/git-tools/mark_public_git_repositories.sh nuiton.org >> $nuiton_log +bash /opt/git-tools/mark_public_git_repositories.sh chorem.org >> $chorem_log +bash /opt/git-tools/mark_public_git_repositories.sh codelutin.com >> $codelutin_log + +# Create project site configuration (apache) +# TODO Do it for chorem.org and codelutin.com sites + +ruby /opt/redmine-tools/project-site.rb -f nuiton.org -k $nuiton_key >> $nuiton_log +#ruby /opt/redmine-tools/project-site.rb -f chorem.org -k $chorem_key >> $chorem_log +#ruby /opt/redmine-tools/project-site.rb -f codelutin.com -k $codelutin_key >> codelutin_log Copied: scripts/redmine-tools/project-scm.rb (from rev 106, scripts/redmine-tools/project-site.rb) =================================================================== --- scripts/redmine-tools/project-scm.rb (rev 0) +++ scripts/redmine-tools/project-scm.rb 2014-10-09 08:52:14 UTC (rev 110) @@ -0,0 +1,210 @@ +#!/usr/bin/env ruby + +# == Synopsis +# +# project-site: manages your repositories with Redmine +# +# == Usage +# +# project-site [OPTIONS...] -s [DIR] -r [HOST] +# +# Examples: +# project-site --svn-dir=/var/svn --redmine-host=redmine.example.net --scm subversion +# project-site -s /var/git -r redmine.example.net -u http://svn.example.net --scm git +# +# == Arguments (mandatory) +# +# -s, --site-dir=DIR use DIR as base directory for svn repositories +# -r, --redmine-host=HOST assume Redmine is hosted on HOST. Examples: +# -r redmine.example.net +# -r http://redmine.example.net +# -r https://example.net/redmine +# -k, --key=KEY use KEY as the Redmine API key +# +# == Options +# +# -o, --owner=OWNER owner of the repository. using the rails login +# allow user to browse the repository within +# Redmine even for private project. If you want to share repositories +# through Redmine.pm, you need to use the apache owner. +# -h, --help show help and exit +# -v, --verbose verbose +# -V, --version print version and exit +# -q, --quiet no log +# +# == References +# +# You can find more information on the redmine's wiki : http://www.redmine.org/wiki/redmine/HowTos + +print "run /opt/redmine-tools/project-site.rb #{ARGV}\n" + +#tchemit - fix verbose deprecated warning about iconv (since it used in cron, don't want to header about it) +oldverb = $VERBOSE; $VERBOSE = nil +require 'iconv' +$VERBOSE = oldverb + +require 'getoptlong' +#require 'rdoc/usage' +require 'find' +require 'etc' + +Version = "1.0" + +opts = GetoptLong.new( + ['--site-dir', '-s', GetoptLong::REQUIRED_ARGUMENT], + ['--redmine-host', '-r', GetoptLong::REQUIRED_ARGUMENT], + ['--key', '-k', GetoptLong::REQUIRED_ARGUMENT], + ['--owner', '-o', GetoptLong::REQUIRED_ARGUMENT], + ['--verbose', '-v', GetoptLong::NO_ARGUMENT], + ['--version', '-V', GetoptLong::NO_ARGUMENT], + ['--help' , '-h', GetoptLong::NO_ARGUMENT], + ['--quiet' , '-q', GetoptLong::NO_ARGUMENT] + ) + +$verbose = 0 +$quiet = false +$redmine_host = '' +$repos_base = '' +$svn_owner = 'www-data' +$use_groupid = false +$command = 'mkdir -p' + +def log(text, options={}) + level = options[:level] || 0 + puts text unless $quiet or level > $verbose + exit 1 if options[:exit] +end + +def system_or_raise(command) + raise "\"#{command}\" failed" unless system command +end + +begin + opts.each do |opt, arg| + case opt + when '--site-dir'; $repos_base = arg.dup + when '--redmine-host'; $redmine_host = arg.dup + when '--key'; $api_key = arg.dup + when '--owner'; $svn_owner = arg.dup; $use_groupid = false; + when '--verbose'; $verbose += 1 + when '--version'; puts Version; exit + when '--help'; RDoc::usage + when '--quiet'; $quiet = true + end + end +rescue + exit 1 +end + +if ($redmine_host.empty? or $repos_base.empty?) + RDoc::usage +end + +unless File.directory?($repos_base) + log("directory '#{$repos_base}' doesn't exists", :exit => true) +end + +begin + require 'active_resource' +rescue LoadError + log("This script requires activeresource.\nRun 'gem install activeresource' to install it.", :exit => true) +end + +class Project < ActiveResource::Base + self.headers["User-agent"] = "Redmine repository manager/#{Version}" +end + +log("querying Redmine for projects...", :level => 1); + +$redmine_host.gsub!(/^/, "http://") unless $redmine_host.match("^https?://") +$redmine_host.gsub!(/\/$/, '') + +Project.site = "#{$redmine_host}/sys"; + +begin + # Get all active projects that have the Repository module enabled + projects = Project.find(:all, :params => {:key => $api_key}) +rescue => e + log("Unable to connect to #{Project.site}: #{e}", :exit => true) +end + +if projects.nil? + log('no project found, perhaps you forgot to "Enable WS for repository management"', :exit => true) +end + +log("retrieved #{projects.size} projects", :level => 1) + +def set_owner_and_rights(project, repos_path, &block) + if RUBY_PLATFORM =~ /mswin/ + yield if block_given? + else + uid, gid = Etc.getpwnam($svn_owner).uid, ($use_groupid ? Etc.getgrnam(project.identifier).gid : -1) + right = project.is_public ? 0775 : 0770 + yield if block_given? + Find.find(repos_path) do |f| + File.chmod right, f + File.chown uid, gid, f + end + end +end + +def other_read_right?(file) + (File.stat(file).mode & 0007).zero? ? false : true +end + +def owner_name(file) + RUBY_PLATFORM =~ /mswin/ ? + $svn_owner : + Etc.getpwuid( File.stat(file).uid ).name +end + +projects.each do |project| + log("treating project #{project.name}", :level => 1) + + if project.identifier.empty? + log("\tno identifier for project #{project.name}") + next + elsif not project.identifier.match(/^[a-z0-9\-]+$/) + log("\tinvalid identifier for project #{project.name} : #{project.identifier}"); + next; + end + + repos_path = File.join($repos_base, project.identifier).gsub(File::SEPARATOR, File::ALT_SEPARATOR || File::SEPARATOR) + + if File.directory?(repos_path) + + # we must verify that repository has the good owner and the good + # rights before leaving + other_read = other_read_right?(repos_path) + owner = owner_name(repos_path) + next if project.is_public == other_read and owner == $svn_owner + + begin + set_owner_and_rights(project, repos_path) + rescue Errno::EPERM => e + log("\tunable to change mode on #{repos_path} : #{e}\n") + next + end + + log("\tmode change on #{repos_path}"); + + else + # if repository is already declared in redmine, we don't create + # unless user use -f with project-site + + project.is_public ? File.umask(0002) : File.umask(0007) + + begin + set_owner_and_rights(project, repos_path) do + system_or_raise "#{$command} #{repos_path}" + end + rescue => e + log("\tunable to create #{repos_path} : #{e}\n") + next + end + + log("\tproject site #{repos_path} created"); + end + +end + Deleted: scripts/redmine-tools/project-site.rb =================================================================== --- scripts/redmine-tools/project-site.rb 2014-10-09 08:34:42 UTC (rev 109) +++ scripts/redmine-tools/project-site.rb 2014-10-09 08:52:14 UTC (rev 110) @@ -1,210 +0,0 @@ -#!/usr/bin/env ruby - -# == Synopsis -# -# project-site: manages your repositories with Redmine -# -# == Usage -# -# project-site [OPTIONS...] -s [DIR] -r [HOST] -# -# Examples: -# project-site --svn-dir=/var/svn --redmine-host=redmine.example.net --scm subversion -# project-site -s /var/git -r redmine.example.net -u http://svn.example.net --scm git -# -# == Arguments (mandatory) -# -# -s, --site-dir=DIR use DIR as base directory for svn repositories -# -r, --redmine-host=HOST assume Redmine is hosted on HOST. Examples: -# -r redmine.example.net -# -r http://redmine.example.net -# -r https://example.net/redmine -# -k, --key=KEY use KEY as the Redmine API key -# -# == Options -# -# -o, --owner=OWNER owner of the repository. using the rails login -# allow user to browse the repository within -# Redmine even for private project. If you want to share repositories -# through Redmine.pm, you need to use the apache owner. -# -h, --help show help and exit -# -v, --verbose verbose -# -V, --version print version and exit -# -q, --quiet no log -# -# == References -# -# You can find more information on the redmine's wiki : http://www.redmine.org/wiki/redmine/HowTos - -print "run /opt/redmine-tools/project-site.rb #{ARGV}\n" - -#tchemit - fix verbose deprecated warning about iconv (since it used in cron, don't want to header about it) -oldverb = $VERBOSE; $VERBOSE = nil -require 'iconv' -$VERBOSE = oldverb - -require 'getoptlong' -#require 'rdoc/usage' -require 'find' -require 'etc' - -Version = "1.0" - -opts = GetoptLong.new( - ['--site-dir', '-s', GetoptLong::REQUIRED_ARGUMENT], - ['--redmine-host', '-r', GetoptLong::REQUIRED_ARGUMENT], - ['--key', '-k', GetoptLong::REQUIRED_ARGUMENT], - ['--owner', '-o', GetoptLong::REQUIRED_ARGUMENT], - ['--verbose', '-v', GetoptLong::NO_ARGUMENT], - ['--version', '-V', GetoptLong::NO_ARGUMENT], - ['--help' , '-h', GetoptLong::NO_ARGUMENT], - ['--quiet' , '-q', GetoptLong::NO_ARGUMENT] - ) - -$verbose = 0 -$quiet = false -$redmine_host = '' -$repos_base = '' -$svn_owner = 'www-data' -$use_groupid = false -$command = 'mkdir -p' - -def log(text, options={}) - level = options[:level] || 0 - puts text unless $quiet or level > $verbose - exit 1 if options[:exit] -end - -def system_or_raise(command) - raise "\"#{command}\" failed" unless system command -end - -begin - opts.each do |opt, arg| - case opt - when '--site-dir'; $repos_base = arg.dup - when '--redmine-host'; $redmine_host = arg.dup - when '--key'; $api_key = arg.dup - when '--owner'; $svn_owner = arg.dup; $use_groupid = false; - when '--verbose'; $verbose += 1 - when '--version'; puts Version; exit - when '--help'; RDoc::usage - when '--quiet'; $quiet = true - end - end -rescue - exit 1 -end - -if ($redmine_host.empty? or $repos_base.empty?) - RDoc::usage -end - -unless File.directory?($repos_base) - log("directory '#{$repos_base}' doesn't exists", :exit => true) -end - -begin - require 'active_resource' -rescue LoadError - log("This script requires activeresource.\nRun 'gem install activeresource' to install it.", :exit => true) -end - -class Project < ActiveResource::Base - self.headers["User-agent"] = "Redmine repository manager/#{Version}" -end - -log("querying Redmine for projects...", :level => 1); - -$redmine_host.gsub!(/^/, "http://") unless $redmine_host.match("^https?://") -$redmine_host.gsub!(/\/$/, '') - -Project.site = "#{$redmine_host}/sys"; - -begin - # Get all active projects that have the Repository module enabled - projects = Project.find(:all, :params => {:key => $api_key}) -rescue => e - log("Unable to connect to #{Project.site}: #{e}", :exit => true) -end - -if projects.nil? - log('no project found, perhaps you forgot to "Enable WS for repository management"', :exit => true) -end - -log("retrieved #{projects.size} projects", :level => 1) - -def set_owner_and_rights(project, repos_path, &block) - if RUBY_PLATFORM =~ /mswin/ - yield if block_given? - else - uid, gid = Etc.getpwnam($svn_owner).uid, ($use_groupid ? Etc.getgrnam(project.identifier).gid : -1) - right = project.is_public ? 0775 : 0770 - yield if block_given? - Find.find(repos_path) do |f| - File.chmod right, f - File.chown uid, gid, f - end - end -end - -def other_read_right?(file) - (File.stat(file).mode & 0007).zero? ? false : true -end - -def owner_name(file) - RUBY_PLATFORM =~ /mswin/ ? - $svn_owner : - Etc.getpwuid( File.stat(file).uid ).name -end - -projects.each do |project| - log("treating project #{project.name}", :level => 1) - - if project.identifier.empty? - log("\tno identifier for project #{project.name}") - next - elsif not project.identifier.match(/^[a-z0-9\-]+$/) - log("\tinvalid identifier for project #{project.name} : #{project.identifier}"); - next; - end - - repos_path = File.join($repos_base, project.identifier).gsub(File::SEPARATOR, File::ALT_SEPARATOR || File::SEPARATOR) - - if File.directory?(repos_path) - - # we must verify that repository has the good owner and the good - # rights before leaving - other_read = other_read_right?(repos_path) - owner = owner_name(repos_path) - next if project.is_public == other_read and owner == $svn_owner - - begin - set_owner_and_rights(project, repos_path) - rescue Errno::EPERM => e - log("\tunable to change mode on #{repos_path} : #{e}\n") - next - end - - log("\tmode change on #{repos_path}"); - - else - # if repository is already declared in redmine, we don't create - # unless user use -f with project-site - - project.is_public ? File.umask(0002) : File.umask(0007) - - begin - set_owner_and_rights(project, repos_path) do - system_or_raise "#{$command} #{repos_path}" - end - rescue => e - log("\tunable to create #{repos_path} : #{e}\n") - next - end - - log("\tproject site #{repos_path} created"); - end - -end -

1 0

r109 - scripts/redmine-tools
by athimel＠users.forge.codelutin.com Oct. 9, 2014

Oct. 9, 2014

Author: athimel Date: 2014-10-09 10:34:42 +0200 (Thu, 09 Oct 2014) New Revision: 109 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/109 Log: refs #5074 Setup redmine-post-commit-git script for multiple repos project (using repoid) Added: scripts/redmine-tools/redmine-post-commit-git-with-repoid.sh Added: scripts/redmine-tools/redmine-post-commit-git-with-repoid.sh =================================================================== --- scripts/redmine-tools/redmine-post-commit-git-with-repoid.sh (rev 0) +++ scripts/redmine-tools/redmine-post-commit-git-with-repoid.sh 2014-10-09 08:34:42 UTC (rev 109) @@ -0,0 +1,14 @@ +#!/bin/sh +# +# Script lance a chaque push sur le serveur + +PROJECT_NAME="$1" +REPO_ID="$2" +DOMAIN="$3" +SCM_API_KEY="$4" + +# refresh redmine scm viewer +curl -s "http://forge.$DOMAIN/sys/fetch_changesets?key=$SCM_API_KEY&id=$PROJECT_NAME" &> /dev/null + +# send post-commit email +(cd /var/lib/git/git-$DOMAIN/$REPO_ID.git ; python /opt/git-tools/git-multimail-run.py) Property changes on: scripts/redmine-tools/redmine-post-commit-git-with-repoid.sh ___________________________________________________________________ Added: svn:executable + *

1 0

r108 - scripts/git-tools
by tchemit＠users.forge.codelutin.com Oct. 6, 2014

Oct. 6, 2014

Author: tchemit Date: 2014-10-06 18:16:49 +0200 (Mon, 06 Oct 2014) New Revision: 108 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/108 Log: refs #5074: Mise en place git (rendre invisible les projets prives) Added: scripts/git-tools/mark_public_git_repositories.sh Added: scripts/git-tools/mark_public_git_repositories.sh =================================================================== --- scripts/git-tools/mark_public_git_repositories.sh (rev 0) +++ scripts/git-tools/mark_public_git_repositories.sh 2014-10-06 16:16:49 UTC (rev 108) @@ -0,0 +1,19 @@ +#!/bin/bash + +FORGE=$1 + +PROJECT_ROOT=/var/lib/git/git-$FORGE + +PROJECT_FILE=$PROJECT_ROOT/.projects_list +rm -rf $PROJECT_FILE + +curl http://forge.$FORGE/projects.json -s -o -|sed -e 's/[{}]/''/g' | awk -v RS=',"' -F: '/^identifier/ {print $2}'|cut -d\" -f 2|while read p; do + + for d in $(ls $PROJECT_ROOT | grep $p | grep .git) ; do + + echo "$d" >> $PROJECT_FILE + + done + +done + Property changes on: scripts/git-tools/mark_public_git_repositories.sh ___________________________________________________________________ Added: svn:executable + *

1 0

r107 - scripts/redmine-tools
by tchemit＠users.forge.codelutin.com Oct. 6, 2014

Oct. 6, 2014

Author: tchemit Date: 2014-10-06 18:07:56 +0200 (Mon, 06 Oct 2014) New Revision: 107 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/107 Log: refs #5074: Mise en place git (rendre invisible les projets prives) Modified: scripts/redmine-tools/cron-redmine Modified: scripts/redmine-tools/cron-redmine =================================================================== --- scripts/redmine-tools/cron-redmine 2014-10-06 14:33:27 UTC (rev 106) +++ scripts/redmine-tools/cron-redmine 2014-10-06 16:07:56 UTC (rev 107) @@ -42,3 +42,7 @@ 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 + +bash /opt/git-tools/mark_public_git_repositories.sh nuiton.org +bash /opt/git-tools/mark_public_git_repositories.sh chorem.org +bash /opt/git-tools/mark_public_git_repositories.sh codelutin.com

1 0

r106 - scripts/redmine-tools
by tchemit＠users.forge.codelutin.com Oct. 6, 2014

Oct. 6, 2014

Author: tchemit Date: 2014-10-06 16:33:27 +0200 (Mon, 06 Oct 2014) New Revision: 106 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/106 Log: fixes #5926: Permettre d'avoir de multiples dpot git authentifi par Redmine Added: scripts/redmine-tools/Redmine.pm Modified: scripts/redmine-tools/update-tomcat.sh Added: scripts/redmine-tools/Redmine.pm =================================================================== --- scripts/redmine-tools/Redmine.pm (rev 0) +++ scripts/redmine-tools/Redmine.pm 2014-10-06 14:33:27 UTC (rev 106) @@ -0,0 +1,547 @@ +package Apache::Authn::Redmine; + +=head1 Apache::Authn::Redmine + +Redmine - a mod_perl module to authenticate webdav subversion users +against redmine database + +=head1 SYNOPSIS + +This module allow anonymous users to browse public project and +registred users to browse and commit their project. Authentication is +done against the redmine database or the LDAP configured in redmine. + +This method is far simpler than the one with pam_* and works with all +database without an hassle but you need to have apache/mod_perl on the +svn server. + +=head1 INSTALLATION + +For this to automagically work, you need to have a recent reposman.rb +(after r860) and if you already use reposman, read the last section to +migrate. + +Sorry ruby users but you need some perl modules, at least mod_perl2, +DBI and DBD::mysql (or the DBD driver for you database as it should +work on allmost all databases). + +On debian/ubuntu you must do : + + aptitude install libapache-dbi-perl libapache2-mod-perl2 libdbd-mysql-perl + +If your Redmine users use LDAP authentication, you will also need +Authen::Simple::LDAP (and IO::Socket::SSL if LDAPS is used): + + aptitude install libauthen-simple-ldap-perl libio-socket-ssl-perl + +=head1 CONFIGURATION + + ## This module has to be in your perl path + ## eg: /usr/lib/perl5/Apache/Authn/Redmine.pm + PerlLoadModule Apache::Authn::Redmine + <Location /svn> + DAV svn + SVNParentPath "/var/svn" + + AuthType Basic + AuthName redmine + Require valid-user + + PerlAccessHandler Apache::Authn::Redmine::access_handler + PerlAuthenHandler Apache::Authn::Redmine::authen_handler + + ## for mysql + RedmineDSN "DBI:mysql:database=databasename;host=my.db.server" + ## for postgres + # RedmineDSN "DBI:Pg:dbname=databasename;host=my.db.server" + + RedmineDbUser "redmine" + RedmineDbPass "password" + ## Optional where clause (fulltext search would be slow and + ## database dependant). + # RedmineDbWhereClause "and members.role_id IN (1,2)" + ## Optional credentials cache size + # RedmineCacheCredsMax 50 + </Location> + +To be able to browse repository inside redmine, you must add something +like that : + + <Location /svn-private> + DAV svn + SVNParentPath "/var/svn" + Order deny,allow + Deny from all + # only allow reading orders + <Limit GET PROPFIND OPTIONS REPORT> + Allow from redmine.server.ip + </Limit> + </Location> + +and you will have to use this reposman.rb command line to create repository : + + reposman.rb --redmine my.redmine.server --svn-dir /var/svn --owner www-data -u http://svn.server/svn-private/ + +=head1 REPOSITORIES NAMING + +A projet repository must be named with the projet identifier. In case +of multiple repositories for the same project, use the project identifier +and the repository identifier separated with a dot: + + /var/svn/foo + /var/svn/foo.otherrepo + +=head1 MIGRATION FROM OLDER RELEASES + +If you use an older reposman.rb (r860 or before), you need to change +rights on repositories to allow the apache user to read and write +S<them :> + + sudo chown -R www-data /var/svn/* + sudo chmod -R u+w /var/svn/* + +And you need to upgrade at least reposman.rb (after r860). + +=head1 GIT SMART HTTP SUPPORT + +Git's smart HTTP protocol (available since Git 1.7.0) will not work with the +above settings. Redmine.pm normally does access control depending on the HTTP +method used: read-only methods are OK for everyone in public projects and +members with read rights in private projects. The rest require membership with +commit rights in the project. + +However, this scheme doesn't work for Git's smart HTTP protocol, as it will use +POST even for a simple clone. Instead, read-only requests must be detected using +the full URL (including the query string): anything that doesn't belong to the +git-receive-pack service is read-only. + +To activate this mode of operation, add this line inside your <Location /git> +block: + + RedmineGitSmartHttp yes + +Here's a sample Apache configuration which integrates git-http-backend with +a MySQL database and this new option: + + SetEnv GIT_PROJECT_ROOT /var/www/git/ + SetEnv GIT_HTTP_EXPORT_ALL + ScriptAlias /git/ /usr/libexec/git-core/git-http-backend/ + <Location /git> + Order allow,deny + Allow from all + + AuthType Basic + AuthName Git + Require valid-user + + PerlAccessHandler Apache::Authn::Redmine::access_handler + PerlAuthenHandler Apache::Authn::Redmine::authen_handler + # for mysql + RedmineDSN "DBI:mysql:database=redmine;host=127.0.0.1" + RedmineDbUser "redmine" + RedmineDbPass "xxx" + RedmineGitSmartHttp yes + </Location> + +Make sure that all the names of the repositories under /var/www/git/ have a +matching identifier for some project: /var/www/git/myproject and +/var/www/git/myproject.git will work. You can put both bare and non-bare +repositories in /var/www/git, though bare repositories are strongly +recommended. You should create them with the rights of the user running Redmine, +like this: + + cd /var/www/git + sudo -u user-running-redmine mkdir myproject + cd myproject + sudo -u user-running-redmine git init --bare + +Once you have activated this option, you have three options when cloning a +repository: + +- Cloning using "http://user@host/git/repo(.git)" works, but will ask for the password + all the time. + +- Cloning with "http://user:pass@host/git/repo(.git)" does not have this problem, but + this could reveal accidentally your password to the console in some versions + of Git, and you would have to ensure that .git/config is not readable except + by the owner for each of your projects. + +- Use "http://host/git/repo(.git)", and store your credentials in the ~/.netrc + file. This is the recommended solution, as you only have one file to protect + and passwords will not be leaked accidentally to the console. + + IMPORTANT NOTE: It is *very important* that the file cannot be read by other + users, as it will contain your password in cleartext. To create the file, you + can use the following commands, replacing yourhost, youruser and yourpassword + with the right values: + + touch ~/.netrc + chmod 600 ~/.netrc + echo -e "machine yourhost\nlogin youruser\npassword yourpassword" > ~/.netrc + +=cut + +use strict; +use warnings FATAL => 'all', NONFATAL => 'redefine'; + +use DBI; +use Digest::SHA; +# optional module for LDAP authentication +my $CanUseLDAPAuth = eval("use Authen::Simple::LDAP; 1"); + +use Apache2::Module; +use Apache2::Access; +use Apache2::ServerRec qw(); +use Apache2::RequestRec qw(); +use Apache2::RequestUtil qw(); +use Apache2::Const qw(:common :override :cmd_how); +use APR::Pool (); +use APR::Table (); + +# use Apache2::Directive qw(); + +my @directives = ( + { + name => 'RedmineDSN', + req_override => OR_AUTHCFG, + args_how => TAKE1, + errmsg => 'Dsn in format used by Perl DBI. eg: "DBI:Pg:dbname=databasename;host=my.db.server"', + }, + { + name => 'RedmineDbUser', + req_override => OR_AUTHCFG, + args_how => TAKE1, + }, + { + name => 'RedmineDbPass', + req_override => OR_AUTHCFG, + args_how => TAKE1, + }, + { + name => 'RedmineDbWhereClause', + req_override => OR_AUTHCFG, + args_how => TAKE1, + }, + { + name => 'RedmineCacheCredsMax', + req_override => OR_AUTHCFG, + args_how => TAKE1, + errmsg => 'RedmineCacheCredsMax must be decimal number', + }, + { + name => 'RedmineGitSmartHttp', + req_override => OR_AUTHCFG, + args_how => TAKE1, + }, +); + +sub RedmineDSN { + my ($self, $parms, $arg) = @_; + $self->{RedmineDSN} = $arg; + my $query = "SELECT + users.hashed_password, users.salt, users.auth_source_id, roles.permissions, projects.status + FROM projects, users, roles + WHERE + users.login=? + AND projects.identifier=? + AND users.status=1 + AND ( + roles.id IN (SELECT member_roles.role_id FROM members, member_roles WHERE members.user_id = users.id AND members.project_id = projects.id AND members.id = member_roles.member_id) + OR + (roles.builtin=1 AND cast(projects.is_public as CHAR) IN ('t', '1')) + ) + AND roles.permissions IS NOT NULL"; + $self->{RedmineQuery} = trim($query); +} + +sub RedmineDbUser { set_val('RedmineDbUser', @_); } +sub RedmineDbPass { set_val('RedmineDbPass', @_); } +sub RedmineDbWhereClause { + my ($self, $parms, $arg) = @_; + $self->{RedmineQuery} = trim($self->{RedmineQuery}.($arg ? $arg : "")." "); +} + +sub RedmineCacheCredsMax { + my ($self, $parms, $arg) = @_; + if ($arg) { + $self->{RedmineCachePool} = APR::Pool->new; + $self->{RedmineCacheCreds} = APR::Table::make($self->{RedmineCachePool}, $arg); + $self->{RedmineCacheCredsCount} = 0; + $self->{RedmineCacheCredsMax} = $arg; + } +} + +sub RedmineGitSmartHttp { + my ($self, $parms, $arg) = @_; + $arg = lc $arg; + + if ($arg eq "yes" || $arg eq "true") { + $self->{RedmineGitSmartHttp} = 1; + } else { + $self->{RedmineGitSmartHttp} = 0; + } +} + +sub trim { + my $string = shift; + $string =~ s/\s{2,}/ /g; + return $string; +} + +sub set_val { + my ($key, $self, $parms, $arg) = @_; + $self->{$key} = $arg; +} + +Apache2::Module::add(__PACKAGE__, \@directives); + + +my %read_only_methods = map { $_ => 1 } qw/GET HEAD PROPFIND REPORT OPTIONS/; + +sub request_is_read_only { + my ($r) = @_; + my $cfg = Apache2::Module::get_config(__PACKAGE__, $r->server, $r->per_dir_config); + + # Do we use Git's smart HTTP protocol, or not? + if (defined $cfg->{RedmineGitSmartHttp} and $cfg->{RedmineGitSmartHttp}) { + my $uri = $r->unparsed_uri; + my $location = $r->location; + my $is_read_only = $uri !~ m{^$location/*[^/]+/+(info/refs\?service=)?git\-receive\-pack$}o; + return $is_read_only; + } else { + # Standard behaviour: check the HTTP method + my $method = $r->method; + return defined $read_only_methods{$method}; + } +} + +sub access_handler { + my $r = shift; + + unless ($r->some_auth_required) { + $r->log_reason("No authentication has been configured"); + return FORBIDDEN; + } + + return OK unless request_is_read_only($r); + + my $project_id = get_project_identifier($r); + + $r->set_handlers(PerlAuthenHandler => [\&OK]) + if is_public_project($project_id, $r) && anonymous_role_allows_browse_repository($r); + + return OK +} + +sub authen_handler { + my $r = shift; + + my ($res, $redmine_pass) = $r->get_basic_auth_pw(); + return $res unless $res == OK; + + if (is_member($r->user, $redmine_pass, $r)) { + return OK; + } else { + $r->note_auth_failure(); + return DECLINED; + } +} + +# check if authentication is forced +sub is_authentication_forced { + my $r = shift; + + my $dbh = connect_database($r); + my $sth = $dbh->prepare( + "SELECT value FROM settings where settings.name = 'login_required';" + ); + + $sth->execute(); + my $ret = 0; + if (my @row = $sth->fetchrow_array) { + if ($row[0] eq "1" || $row[0] eq "t") { + $ret = 1; + } + } + $sth->finish(); + undef $sth; + + $dbh->disconnect(); + undef $dbh; + + $ret; +} + +sub is_public_project { + my $project_id = shift; + my $r = shift; + + if (is_authentication_forced($r)) { + return 0; + } + + my $dbh = connect_database($r); + my $sth = $dbh->prepare( + "SELECT is_public FROM projects WHERE projects.identifier = ? AND projects.status <> 9;" + ); + + $sth->execute($project_id); + my $ret = 0; + if (my @row = $sth->fetchrow_array) { + if ($row[0] eq "1" || $row[0] eq "t") { + $ret = 1; + } + } + $sth->finish(); + undef $sth; + $dbh->disconnect(); + undef $dbh; + + $ret; +} + +sub anonymous_role_allows_browse_repository { + my $r = shift; + + my $dbh = connect_database($r); + my $sth = $dbh->prepare( + "SELECT permissions FROM roles WHERE builtin = 2;" + ); + + $sth->execute(); + my $ret = 0; + if (my @row = $sth->fetchrow_array) { + if ($row[0] =~ /:browse_repository/) { + $ret = 1; + } + } + $sth->finish(); + undef $sth; + $dbh->disconnect(); + undef $dbh; + + $ret; +} + +# perhaps we should use repository right (other read right) to check public access. +# it could be faster BUT it doesn't work for the moment. +# sub is_public_project_by_file { +# my $project_id = shift; +# my $r = shift; + +# my $tree = Apache2::Directive::conftree(); +# my $node = $tree->lookup('Location', $r->location); +# my $hash = $node->as_hash; + +# my $svnparentpath = $hash->{SVNParentPath}; +# my $repos_path = $svnparentpath . "/" . $project_id; +# return 1 if (stat($repos_path))[2] & 00007; +# } + +sub is_member { + my $redmine_user = shift; + my $redmine_pass = shift; + my $r = shift; + + my $dbh = connect_database($r); + my $project_id = get_project_identifier($r); + + my $pass_digest = Digest::SHA::sha1_hex($redmine_pass); + + my $access_mode = request_is_read_only($r) ? "R" : "W"; + + my $cfg = Apache2::Module::get_config(__PACKAGE__, $r->server, $r->per_dir_config); + my $usrprojpass; + if ($cfg->{RedmineCacheCredsMax}) { + $usrprojpass = $cfg->{RedmineCacheCreds}->get($redmine_user.":".$project_id.":".$access_mode); + return 1 if (defined $usrprojpass and ($usrprojpass eq $pass_digest)); + } + my $query = $cfg->{RedmineQuery}; + my $sth = $dbh->prepare($query); + $sth->execute($redmine_user, $project_id); + + my $ret; + while (my ($hashed_password, $salt, $auth_source_id, $permissions, $project_status) = $sth->fetchrow_array) { + if ($project_status eq "9" || ($project_status ne "1" && $access_mode eq "W")) { + last; + } + + unless ($auth_source_id) { + my $method = $r->method; + my $salted_password = Digest::SHA::sha1_hex($salt.$pass_digest); + if ($hashed_password eq $salted_password && (($access_mode eq "R" && $permissions =~ /:browse_repository/) || $permissions =~ /:commit_access/) ) { + $ret = 1; + last; + } + } elsif ($CanUseLDAPAuth) { + my $sthldap = $dbh->prepare( + "SELECT host,port,tls,account,account_password,base_dn,attr_login from auth_sources WHERE id = ?;" + ); + $sthldap->execute($auth_source_id); + while (my @rowldap = $sthldap->fetchrow_array) { + my $bind_as = $rowldap[3] ? $rowldap[3] : ""; + my $bind_pw = $rowldap[4] ? $rowldap[4] : ""; + if ($bind_as =~ m/\$login/) { + # replace $login with $redmine_user and use $redmine_pass + $bind_as =~ s/\$login/$redmine_user/g; + $bind_pw = $redmine_pass + } + my $ldap = Authen::Simple::LDAP->new( + host => ($rowldap[2] eq "1" || $rowldap[2] eq "t") ? "ldaps://$rowldap[0]:$rowldap[1]" : $rowldap[0], + port => $rowldap[1], + basedn => $rowldap[5], + binddn => $bind_as, + bindpw => $bind_pw, + filter => "(".$rowldap[6]."=%s)" + ); + my $method = $r->method; + $ret = 1 if ($ldap->authenticate($redmine_user, $redmine_pass) && (($access_mode eq "R" && $permissions =~ /:browse_repository/) || $permissions =~ /:commit_access/)); + + } + $sthldap->finish(); + undef $sthldap; + } + } + $sth->finish(); + undef $sth; + $dbh->disconnect(); + undef $dbh; + + if ($cfg->{RedmineCacheCredsMax} and $ret) { + if (defined $usrprojpass) { + $cfg->{RedmineCacheCreds}->set($redmine_user.":".$project_id.":".$access_mode, $pass_digest); + } else { + if ($cfg->{RedmineCacheCredsCount} < $cfg->{RedmineCacheCredsMax}) { + $cfg->{RedmineCacheCreds}->set($redmine_user.":".$project_id.":".$access_mode, $pass_digest); + $cfg->{RedmineCacheCredsCount}++; + } else { + $cfg->{RedmineCacheCreds}->clear(); + $cfg->{RedmineCacheCredsCount} = 0; + } + } + } + + $ret; +} + +sub get_project_identifier { + my $r = shift; + + my $cfg = Apache2::Module::get_config(__PACKAGE__, $r->server, $r->per_dir_config); + my $location = $r->location; + $location =~ s/\.git$// if (defined $cfg->{RedmineGitSmartHttp} and $cfg->{RedmineGitSmartHttp}); + +# my ($identifier) = $r->uri =~ m{$location/*([^/.]+)}; +# tchemit-2014-10-06 (ajout du _ pour pouvoir utiliser des depots multiples mapod_test par exemple) + my ($identifier) = $r->uri =~ m{$location/*([^/._]+)}; + $identifier; +} + +sub connect_database { + my $r = shift; + + my $cfg = Apache2::Module::get_config(__PACKAGE__, $r->server, $r->per_dir_config); + return DBI->connect($cfg->{RedmineDSN}, $cfg->{RedmineDbUser}, $cfg->{RedmineDbPass}); +} + +1; Modified: scripts/redmine-tools/update-tomcat.sh =================================================================== --- scripts/redmine-tools/update-tomcat.sh 2014-09-30 13:15:47 UTC (rev 105) +++ scripts/redmine-tools/update-tomcat.sh 2014-10-06 14:33:27 UTC (rev 106) @@ -16,7 +16,7 @@ DEBUG=false #MIRROR=http://mirrors.linsrv.net/apache/tomcat -MIRROR=http://www.carfab.com/apachesoftware/tomcat +MIRROR=http://wwwftp.ciril.fr/pub/apache/tomcat TARGET_DIR=/opt/repository LINK_DIR=/opt @@ -43,7 +43,10 @@ # @param $2 tomcat version 6, 7 or 8 getLastRelease () { local VERSION=$2 - local result=$(curl -s $MIRROR/tomcat-$VERSION/ |grep "href=.v" |sed -re 's/.*>v([0-9]+.[0-9]+.[0-9]+).*/\1/') + debug "incoming VERSION: $VERSION" + local grabUrl=$MIRROR/tomcat-$VERSION/ + debug "grabUrl: $grabUrl" + local result=$(curl -s $grabUrl |grep "href=.v" |sed -re 's/.*>v([0-9]+.[0-9]+.[0-9]+).*/\1/') debug "getLastRelease: $result" eval $1=\$result } @@ -74,6 +77,7 @@ #sed -i 's/<Connector /<Connector URIEncoding="UTF-8" /g' $UNPACK_DIR/conf/server.xml rm -f $LINK ln -s $UNPACK_DIR $LINK + cp /opt/deploy-tools/tomcat-users.xml $UNPACK_DIR/conf echo "new release installed in $LINK -> $UNPACK_DIR" } @@ -82,10 +86,13 @@ local CURRENT_RELEASE local LAST_RELEASE getCurrentRelease CURRENT_RELEASE $VERSION + debug "CURRENT_RELEASE: $CURRENT_RELEASE" getLastRelease LAST_RELEASE $VERSION + debug "LAST_RELEASE: $LAST_RELEASE" if [ "$CURRENT_RELEASE" != "$LAST_RELEASE" ]; then installRelease "$CURRENT_RELEASE" "$LAST_RELEASE" fi } +update 7 update 8 \ No newline at end of file

1 0