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

r20 - in forge-tools/sys: chorem.org codelutin.com nuiton.org
by tchemit＠users.forge.codelutin.com Feb. 6, 2014

Feb. 6, 2014

Author: tchemit Date: 2014-02-06 15:24:12 +0100 (Thu, 06 Feb 2014) New Revision: 20 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/20 Log: fix tomcat-default 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-06 14:05:51 UTC (rev 19) +++ forge-tools/sys/chorem.org/tomcat-default 2014-02-06 14:24:12 UTC (rev 20) @@ -1,4 +1,3 @@ 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 MAVEN_OPTS="${JAVA_OPTS} -XX:-UseGCOverheadLimit -Dmaven.repo.local=/var/local/forge/data/chorem.org/maven/repository" export JENKINS_HOME=/var/local/forge/data/chorem.org/jenkins Modified: forge-tools/sys/codelutin.com/tomcat-default =================================================================== --- forge-tools/sys/codelutin.com/tomcat-default 2014-02-06 14:05:51 UTC (rev 19) +++ forge-tools/sys/codelutin.com/tomcat-default 2014-02-06 14:24:12 UTC (rev 20) @@ -1,4 +1,3 @@ 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 MAVEN_OPTS="${JAVA_OPTS} -XX:-UseGCOverheadLimit -Dmaven.repo.local=/var/local/forge/data/forge.codelutin.com/maven/repository" -export JENKINS_HOME=/var/local/forge/data/forge.codelutin.com/jenkins +export JENKINS_HOME=/var/local/forge/data/codelutin.com/jenkins Modified: forge-tools/sys/nuiton.org/tomcat-default =================================================================== --- forge-tools/sys/nuiton.org/tomcat-default 2014-02-06 14:05:51 UTC (rev 19) +++ forge-tools/sys/nuiton.org/tomcat-default 2014-02-06 14:24:12 UTC (rev 20) @@ -1,4 +1,3 @@ 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 MAVEN_OPTS="${JAVA_OPTS} -XX:-UseGCOverheadLimit -Dmaven.repo.local=/var/local/forge/data/nuiton.org/maven/repository" export JENKINS_HOME=/var/local/forge/data/nuiton.org/jenkins

1 0

r19 - / forge-tools forge-tools/data forge-tools/data/chorem.org forge-tools/data/chorem.org/maven forge-tools/data/codelutin.com forge-tools/data/codelutin.com/maven forge-tools/data/nuiton.org forge-tools/data/nuiton.org/maven forge-tools/sys forge-tools/sys/chorem.org forge-tools/sys/codelutin.com forge-tools/sys/nuiton.org
by tchemit＠users.forge.codelutin.com Feb. 6, 2014

Feb. 6, 2014

Author: tchemit Date: 2014-02-06 15:05:51 +0100 (Thu, 06 Feb 2014) New Revision: 19 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/19 Log: import forge tools structure Added: forge-tools/ forge-tools/data/ forge-tools/data/chorem.org/ forge-tools/data/chorem.org/maven/ forge-tools/data/chorem.org/maven/settings-security.xml forge-tools/data/chorem.org/maven/settings.xml forge-tools/data/codelutin.com/ forge-tools/data/codelutin.com/maven/ forge-tools/data/codelutin.com/maven/settings-security.xml forge-tools/data/codelutin.com/maven/settings.xml forge-tools/data/nuiton.org/ forge-tools/data/nuiton.org/maven/ forge-tools/data/nuiton.org/maven/settings-security.xml forge-tools/data/nuiton.org/maven/settings.xml forge-tools/sys/ forge-tools/sys/chorem.org/ forge-tools/sys/chorem.org/apache.conf forge-tools/sys/chorem.org/sonar-init.d forge-tools/sys/chorem.org/tomcat-default forge-tools/sys/chorem.org/tomcat-init.d forge-tools/sys/codelutin.com/ forge-tools/sys/codelutin.com/apache.conf forge-tools/sys/codelutin.com/sonar-init.d forge-tools/sys/codelutin.com/tomcat-default forge-tools/sys/codelutin.com/tomcat-init.d forge-tools/sys/nuiton.org/ forge-tools/sys/nuiton.org/apache.conf forge-tools/sys/nuiton.org/sonar-init.d forge-tools/sys/nuiton.org/tomcat-default forge-tools/sys/nuiton.org/tomcat-init.d forge-tools/sys/upgrade-jenkins.sh Modified: / Property changes on: ___________________________________________________________________ Added: svn:ignore + exec Property changes on: forge-tools/data/chorem.org ___________________________________________________________________ Added: svn:ignore + jenkins Property changes on: forge-tools/data/chorem.org/maven ___________________________________________________________________ Added: svn:ignore + repository Added: forge-tools/data/chorem.org/maven/settings-security.xml =================================================================== --- forge-tools/data/chorem.org/maven/settings-security.xml (rev 0) +++ forge-tools/data/chorem.org/maven/settings-security.xml 2014-02-06 14:05:51 UTC (rev 19) @@ -0,0 +1,3 @@ +<settingsSecurity> + <master>{eYGwttw4n2YHtZcDXvkgvlxoSmDh0l9JZu+zpL1OmO8=}</master> +</settingsSecurity> Property changes on: forge-tools/data/chorem.org/maven/settings-security.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: forge-tools/data/chorem.org/maven/settings.xml =================================================================== --- forge-tools/data/chorem.org/maven/settings.xml (rev 0) +++ forge-tools/data/chorem.org/maven/settings.xml 2014-02-06 14:05:51 UTC (rev 19) @@ -0,0 +1,112 @@ +<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd"> + + <localRepository>/var/local/forge/data/chorem.org/maven/repository</localRepository> + + <servers> + +  + <server> + <id>chorem.org</id> + <username>publish</username> + <filePermissions>664</filePermissions> + <directoryPermissions>775</directoryPermissions> + </server> + +  + <server> + <id>redmine-chorem.org</id> + <username>hudson</username> + <privateKey>{ftblYzkG4kQHrdhbT3Bdy5HrQe3ePUj/csXRkkgycOIHiYrjqBPrO7DNQOTfrstCoWBKwkGNyl09ilfaR+LtrQ==}</privateKey> + </server> + +  + <server> + <id>nuiton-nexus-deploy</id> + <username>deployment</username> + <password>{HCsi62VkJnAHRjO/taCNMZqZIvYXZ2Nhsr5sWAms4WI=}</password> + </server> + +  + <server> + <id>gpg-signer</id> + <username>Code Lutin</username> + <password>{OFQLw44OIKQHWxxwk3eeSM9nGJtGQY07MDsV58NQwYI=}</password> + </server> + +  + <server> + <id>codelutin-keystore</id> +  + <privateKey>/var/local/forge/data/shared/maven/CodeLutinKeystore</privateKey> +  + <password>{74oWvBCUGzgHHetzHyLA8HboKLuB5DInnyjqyMKf2a8=}</password> +  + <username>{QYM/h2Q7EHMH9HRCSz5+ekNbIo9hIc0udg+/Ya9VXMM=}</username> +  + <passphrase>{ouE8XuXTVQgH8A2kkQaQ4E8I9sjZxxeKuPw79HmJDhQ=}</passphrase> + </server> + + </servers> + + <profiles> + + <profile> + + <id>repositories-profile</id> +  +  + <repositories> + <repository> + <id>snapshots</id> + <url>http://nexus.nuiton.org/nexus/content/repositories/snapshots</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + <repository> + <id>releasess</id> + <url>http://nexus.nuiton.org/nexus/content/repositories/central-releases</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + </repositories> + + <pluginRepositories> + <pluginRepository> + <id>snapshots</id> + <url>http://nexus.nuiton.org/nexus/content/repositories/snapshots</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> + <pluginRepository> + <id>releases</id> + <url>http://nexus.nuiton.org/nexus/content/repositories/central-releases</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </pluginRepository> + </pluginRepositories> + + </profile> + </profiles> + + <activeProfiles> + <activeProfile>repositories-profile</activeProfile> + </activeProfiles> +</settings> Property changes on: forge-tools/data/chorem.org/maven/settings.xml ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + text/xml Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Property changes on: forge-tools/data/codelutin.com ___________________________________________________________________ Added: svn:ignore + jenkins Property changes on: forge-tools/data/codelutin.com/maven ___________________________________________________________________ Added: svn:ignore + repository Added: forge-tools/data/codelutin.com/maven/settings-security.xml =================================================================== --- forge-tools/data/codelutin.com/maven/settings-security.xml (rev 0) +++ forge-tools/data/codelutin.com/maven/settings-security.xml 2014-02-06 14:05:51 UTC (rev 19) @@ -0,0 +1,3 @@ +<settingsSecurity> + <master>{eYGwttw4n2YHtZcDXvkgvlxoSmDh0l9JZu+zpL1OmO8=}</master> +</settingsSecurity> Property changes on: forge-tools/data/codelutin.com/maven/settings-security.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: forge-tools/data/codelutin.com/maven/settings.xml =================================================================== --- forge-tools/data/codelutin.com/maven/settings.xml (rev 0) +++ forge-tools/data/codelutin.com/maven/settings.xml 2014-02-06 14:05:51 UTC (rev 19) @@ -0,0 +1,141 @@ +<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd"> + + <localRepository>/var/local/forge/data/forge.codelutin.com/maven/repository</localRepository> + + <servers> + +  + <server> + <id>forge.codelutin.com</id> + <username>publish</username> + <filePermissions>664</filePermissions> + <directoryPermissions>775</directoryPermissions> + </server> + +  + <server> + <id>redmine-forge.codelutin.com</id> + <username>ci</username> + <privateKey>{dDRCGmV78GIHxK8hGRoswd+bgBpomlTrvmz7oHvrIeTWh5avk41HXGgT4aLmlnqfoSA3YWq6Gxl6tVb8P0Punw==}</privateKey> + </server> + +  + <server> + <id>nuiton-nexus-deploy</id> + <username>deployment</username> + <password>{HCsi62VkJnAHRjO/taCNMZqZIvYXZ2Nhsr5sWAms4WI=}</password> + </server> + +  + <server> + <id>gpg-signer</id> + <username>Code Lutin</username> + <password>{TjdXIeyhH18HSdE/dexiXGTaHRUjX8kPDtom5ZdAXcs=}</password> + </server> + +  + <server> + <id>codelutin-keystore</id> +  + <privateKey>/var/local/forge/data/shared/maven/CodeLutinKeystore</privateKey> +  + <password>{74oWvBCUGzgHHetzHyLA8HboKLuB5DInnyjqyMKf2a8=}</password> +  + <username>{QYM/h2Q7EHMH9HRCSz5+ekNbIo9hIc0udg+/Ya9VXMM=}</username> +  + <passphrase>{ouE8XuXTVQgH8A2kkQaQ4E8I9sjZxxeKuPw79HmJDhQ=}</passphrase> + </server> + +  + <server> + <id>lexman-nexus-repository</id> + <username>lexman</username> + <password>{GsAMPklZD90HyDG8qqNac+dyMZoFI8C0OJMBhoYOBso=}</password> + </server> + +  + <server> + <id>cerqual-nexus-repository</id> + <username>cerqual</username> + <password>{E4DByKD45E0Haam2hK0qDIkI4PHxPKdslZa9GsE4VVs=}</password> + </server> + +  + <server> + <id>agrosyst-nexus-group</id> + <username>agrosyst</username> + <password>{To0VGg4tkpEHasDXgAkulKxg7KkxLN47m8LposT8vrA=}</password> + </server> + +  + <server> + <id>glon-nexus-repository</id> + <username>glon</username> + <password>{JjGQT20gSrAHCFMam3lsgrspEQ8ucBJUT5orkwQnV6c=}</password> + </server> + + </servers> + + <profiles> + + <profile> + + <id>repositories-profile</id> +  +  + <repositories> + <repository> + <id>snapshots</id> + <url>http://nexus.nuiton.org/nexus/content/repositories/snapshots</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + <repository> + <id>releasess</id> + <url>http://nexus.nuiton.org/nexus/content/repositories/central-releases</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + </repositories> + + <pluginRepositories> + <pluginRepository> + <id>snapshots</id> + <url>http://nexus.nuiton.org/nexus/content/repositories/snapshots</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> + <pluginRepository> + <id>releases</id> + <url>http://nexus.nuiton.org/nexus/content/repositories/central-releases</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </pluginRepository> + </pluginRepositories> + + </profile> + </profiles> + + <activeProfiles> + <activeProfile>repositories-profile</activeProfile> + </activeProfiles> + +</settings> Property changes on: forge-tools/data/codelutin.com/maven/settings.xml ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + text/xml Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Property changes on: forge-tools/data/nuiton.org ___________________________________________________________________ Added: svn:ignore + jenkins Property changes on: forge-tools/data/nuiton.org/maven ___________________________________________________________________ Added: svn:ignore + repository Added: forge-tools/data/nuiton.org/maven/settings-security.xml =================================================================== --- forge-tools/data/nuiton.org/maven/settings-security.xml (rev 0) +++ forge-tools/data/nuiton.org/maven/settings-security.xml 2014-02-06 14:05:51 UTC (rev 19) @@ -0,0 +1,3 @@ +<settingsSecurity> + <master>{eYGwttw4n2YHtZcDXvkgvlxoSmDh0l9JZu+zpL1OmO8=}</master> +</settingsSecurity> Property changes on: forge-tools/data/nuiton.org/maven/settings-security.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: forge-tools/data/nuiton.org/maven/settings.xml =================================================================== --- forge-tools/data/nuiton.org/maven/settings.xml (rev 0) +++ forge-tools/data/nuiton.org/maven/settings.xml 2014-02-06 14:05:51 UTC (rev 19) @@ -0,0 +1,141 @@ +<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd"> + + <localRepository>/var/local/forge/data/nuiton.org/maven/repository</localRepository> + + <servers> + +  + <server> + <id>nuiton.org</id> + <username>publish</username> + <filePermissions>664</filePermissions> + <directoryPermissions>775</directoryPermissions> + </server> + +  + <server> + <id>redmine-nuiton.org</id> + <username>ci</username> + <privateKey>{G6bxUM3/IsAHsqZYRN4EK5nDWBndXLM/KtpTL9sOZPGBuhmv0b+8FnGmztKYzbOJuvMfmDEWShGvQkp6v0Njkw==}</privateKey> + </server> + +  + <server> + <id>nuiton-nexus-deploy</id> + <username>deployment</username> + <password>{HCsi62VkJnAHRjO/taCNMZqZIvYXZ2Nhsr5sWAms4WI=}</password> + </server> + +  + <server> + <id>gpg-signer</id> + <username>Code Lutin</username> + <password>{TjdXIeyhH18HSdE/dexiXGTaHRUjX8kPDtom5ZdAXcs=}</password> + </server> + +  + <server> + <id>codelutin-keystore</id> +  + <privateKey>/var/local/forge/data/shared/maven/CodeLutinKeystore</privateKey> +  + <password>{74oWvBCUGzgHHetzHyLA8HboKLuB5DInnyjqyMKf2a8=}</password> +  + <username>{QYM/h2Q7EHMH9HRCSz5+ekNbIo9hIc0udg+/Ya9VXMM=}</username> +  + <passphrase>{ouE8XuXTVQgH8A2kkQaQ4E8I9sjZxxeKuPw79HmJDhQ=}</passphrase> + </server> + +  +  + <server> + <id>jredmine-test</id> + <username>ci</username> + <password>{ucUcHUDfX8sHezGY6HU4Ur6B012utPXrxv4DIrr1nJc=}</password> + <privateKey>{DmlfyrZP2XAHAkVCS+IBDH106kXTkMNlGnkzTVLNSQD43YAlMudCJ7TqCu7Iw33/vsS7kI2WdrlfHWJDv7NtnA==}</privateKey> + </server> + +  +  + <server> + <id>jredmine-test-it</id> + <username>admin</username> + <password>{+7s1AxqN2WMHcJOGM2fwkxHBxO/4pwKboP94g6WiCVo=}</password> + <privateKey>TODO</privateKey> + </server> + + </servers> + + <profiles> + + <profile> + + <id>repositories-profile</id> +  +  + <repositories> + <repository> + <id>snapshots</id> + <url>http://nexus.nuiton.org/nexus/content/repositories/snapshots</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + <repository> + <id>releasess</id> + <url>http://nexus.nuiton.org/nexus/content/repositories/central-releases</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + </repositories> + + <pluginRepositories> + <pluginRepository> + <id>snapshots</id> + <url>http://nexus.nuiton.org/nexus/content/repositories/snapshots</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> + <pluginRepository> + <id>releases</id> + <url>http://nexus.nuiton.org/nexus/content/repositories/central-releases</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </pluginRepository> + </pluginRepositories> + + </profile> + + <profile> + <id>sonar</id> + <properties> + <sonar.jdbc.url>jdbc:postgresql://localhost/sonar-nuiton</sonar.jdbc.url> + <sonar.jdbc.username>dbuser</sonar.jdbc.username> + <sonar.jdbc.password>xxxxxx</sonar.jdbc.password> + <sonar.host.url>http://qa-ng.nuiton.org/sonar</sonar.host.url> + </properties> + </profile> + + </profiles> + + <activeProfiles> + <activeProfile>repositories-profile</activeProfile> + </activeProfiles> +</settings> Property changes on: forge-tools/data/nuiton.org/maven/settings.xml ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + text/xml Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: forge-tools/sys/chorem.org/apache.conf =================================================================== --- forge-tools/sys/chorem.org/apache.conf (rev 0) +++ forge-tools/sys/chorem.org/apache.conf 2014-02-06 14:05:51 UTC (rev 19) @@ -0,0 +1,139 @@ +<VirtualHost *:80> + ServerAdmin admin+ci(a)chorem.org + ServerName ci-ng.chorem.org + + ProxyRequests Off + + RewriteEngine On + RewriteLog "/var/log/apache2/ci-chorem.org-rewrite.log" + RewriteLogLevel 0 + + # on match tous les hosts qui passe et qui n'a pas de path dans + # l'url ex: http://a.b.c/ + RewriteCond %{HTTP_HOST} ^ci-ng\.chorem\.org$ + RewriteCond %{REQUEST_URI} ^/$ + # on ajoute le host dans l'url pour le rewrite + RewriteRule ^(.+) %{HTTP_HOST}$1 [C] + # on remet le nom de machine dans le path http://a.b.c/ -> http://a.b.c/a/ + RewriteRule ^(ci-ng)\.([^/]+)/$ http://$1.$2/jenkins/ [R,L] + + ProxyPass / ajp://localhost:18092/jenkins + ProxyPassReverse / ajp://localhost:18092/jenkins + + <Proxy *> + Order deny,allow + Allow from all + </Proxy> + + ErrorLog /var/log/apache2/ci-chorem.org-error.log + + # Possible values include: debug, info, notice, warn, error, crit, + # alert, emerg. + LogLevel warn + + CustomLog /var/log/apache2/ci-chorem.org-access.log combined + +</VirtualHost> +<VirtualHost *:80> + ServerAdmin admin+qa(a)chorem.org + ServerName qa-ng.chorem.org + + ProxyPreserveHost On + ProxyRequests Off + + ProxyPass / http://localhost:19092/ + ProxyPassReverse / http://qa-ng.chorem.org/ + + <Proxy *> + Order deny,allow + Allow from all + </Proxy> + + ErrorLog /var/log/apache2/qa-chorem.org-error.log + + # Possible values include: debug, info, notice, warn, error, crit, + # alert, emerg. + LogLevel warn + + CustomLog /var/log/apache2/qa-chorem.org-access.log combined + +</VirtualHost> +<VirtualHost *:443> + ServerAdmin admin+ci(a)chorem.org + ServerName ci-ng.chorem.org + + <IfModule mod_ssl.c> + SSLEngine on + SSLCertificateFile /etc/ssl/certs/wildcard.chorem.org.crt + SSLCertificateKeyFile /etc/ssl/private/wildcard.chorem.org.key + SSLCACertificateFile /etc/ssl/certs/GandiStandardSSLCA.pem + SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown + SSLVerifyClient None + </IfModule> + + ProxyRequests Off + + RewriteEngine On + RewriteLog "/var/log/apache2/forge-chorem.org-ssl-rewrite.log" + RewriteLogLevel 0 + + # on match tous les hosts qui passe et qui n'a pas de path dans + # l'url ex: http://a.b.c/ + RewriteCond %{HTTP_HOST} ^(ci-ng)\.chorem\.org$ + RewriteCond %{REQUEST_URI} ^/$ + # on ajoute le host dans l'url pour le rewrite + RewriteRule ^(.+) %{HTTP_HOST}$1 [C] + # on remet le nom de machine dans le path http://a.b.c/ -> http://a.b.c/a/ + RewriteRule ^(ci-ng)\.([^/]+)/$ https://$1.$2/jenkins/ [R,L] + + ProxyPass / ajp://localhost:18092/ + ProxyPassReverse / ajp://localhost:18092/ + + <Proxy *> + Order deny,allow + Allow from all + </Proxy> + + ErrorLog /var/log/apache2/ci-chorem.org-ssl-error.log + + # Possible values include: debug, info, notice, warn, error, crit, + # alert, emerg. + LogLevel warn + + CustomLog /var/log/apache2/ci-chorem.org-ssl-access.log combined + +</VirtualHost> +<VirtualHost *:443> + ServerAdmin admin+qa(a)chorem.org + ServerName qa-ng.chorem.org + + <IfModule mod_ssl.c> + SSLEngine on + SSLCertificateFile /etc/ssl/certs/wildcard.chorem.org.crt + SSLCertificateKeyFile /etc/ssl/private/wildcard.chorem.org.key + SSLCACertificateFile /etc/ssl/certs/GandiStandardSSLCA.pem + SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown + SSLVerifyClient None + </IfModule> + + ProxyPreserveHost On + ProxyRequests Off + + ProxyPass / http://localhost:19092/ + ProxyPassReverse / https://qa-ng.chorem.org/ + + <Proxy *> + Order deny,allow + Allow from all + </Proxy> + + ErrorLog /var/log/apache2/qa-chorem.org-ssl-error.log + + # Possible values include: debug, info, notice, warn, error, crit, + # alert, emerg. + LogLevel warn + + CustomLog /var/log/apache2/qa-chorem.org-ssl-access.log combined + +</VirtualHost> + Added: forge-tools/sys/chorem.org/sonar-init.d =================================================================== --- forge-tools/sys/chorem.org/sonar-init.d (rev 0) +++ forge-tools/sys/chorem.org/sonar-init.d 2014-02-06 14:05:51 UTC (rev 19) @@ -0,0 +1,18 @@ +#!/bin/sh +# +# rc file for SonarQube +# +# chkconfig: 345 96 10 +# description: SonarQube system (www.sonarsource.org) +# +### BEGIN INIT INFO +# Provides: sonar-chorem +# Required-Start: $network +# Required-Stop: $network +# Default-Start: 3 4 5 +# Default-Stop: 0 1 2 6 +# Short-Description: SonarQube system (www.sonarsource.org) +# Description: SonarQube system (www.sonarsource.org) +### END INIT INFO + +/var/local/forge/exec/sonar-chorem.org/bin/linux-x86-64/sonar.sh $* Property changes on: forge-tools/sys/chorem.org/sonar-init.d ___________________________________________________________________ Added: svn:executable + * Added: forge-tools/sys/chorem.org/tomcat-default =================================================================== --- forge-tools/sys/chorem.org/tomcat-default (rev 0) +++ forge-tools/sys/chorem.org/tomcat-default 2014-02-06 14:05:51 UTC (rev 19) @@ -0,0 +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 MAVEN_OPTS="${JAVA_OPTS} -XX:-UseGCOverheadLimit -Dmaven.repo.local=/var/local/forge/data/chorem.org/maven/repository" +export JENKINS_HOME=/var/local/forge/data/chorem.org/jenkins Added: forge-tools/sys/chorem.org/tomcat-init.d =================================================================== --- forge-tools/sys/chorem.org/tomcat-init.d (rev 0) +++ forge-tools/sys/chorem.org/tomcat-init.d 2014-02-06 14:05:51 UTC (rev 19) @@ -0,0 +1,223 @@ +#!/bin/sh +# +# /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 codelutin by Benjamin Poussin <poussin(a)codelutin.com>. +# Modified for codelutin by Tony CHEMIT <chemit(a)codelutin.com>. +# +### BEGIN INIT INFO +# Provides: tomcat-chorem.org +# 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 + +NAME=tomcat-chorem + +PATH=/bin:/usr/bin:/sbin:/usr/sbin +DESC="Tomcat servlet engine" +DAEMON=/usr/bin/jsvc +CATALINA_HOME=/opt/apache-tomcat +DEFAULT=/etc/default/$NAME +LOG=/var/log/$NAME.log +CATALINA_BASE=/var/local/forge/exec/$NAME + +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 +. /etc/default/rcS + +# The following variables can be overwritten in $DEFAULT + +# Run Tomcat 5 as this user ID +TOMCAT_USER=tomcat + +# 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" + +# 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_TMP="$jdir" + # checks for a real JDK like environment, needed to check if + # really the java-gcj-compat-dev package is installed + if [ -r "$jdir/bin/jdb" ]; then + JAVA_HOME="$JAVA_HOME_TMP" + fi + fi +done +export JAVA_HOME + +# Directory for per-instance configuration files and webapps +#CATALINA_BASE=$CATALINA_HOME + +# Use the Java security manager? (yes/no) +TOMCAT_SECURITY=no + +# Timeout in seconds for the shutdown of all webapps +TOMCAT_SHUTDOWN=30 + +# End of variables that can be overwritten in $DEFAULT + +# overwrite settings from default file +if [ -f "$DEFAULT" ]; then + . "$DEFAULT" +fi + +test -f $DAEMON || exit 0 + +[ -z "$TOMCAT_USER" ] && TOMCAT_USER=tomcat55 + +# Check if we use gij +gij=no +"$JAVA_HOME/bin/java" -version 2>&1 | grep -q "^gij (GNU libgcj)" && gij=yes + +# gij doesn't support a security manager yet (see bug #399595) +if [ "$gij" = "yes" ]; then + printf "The java-gcj-compat-dev environment currently doesn't\nsupport a security manager. See README.Debian." | logger -p daemon.warning -t $NAME +fi + +# 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 +# se the maximum heap size is set to 128M +if [ -z "$JAVA_OPTS" ]; then + JAVA_OPTS="-Djava.awt.headless=true -Xmx512M" +fi + +JAVA_OPTS="$JAVA_OPTS -Dcatalina.base=$CATALINA_BASE -Dcatalina.home=$CATALINA_HOME -Djava.io.tmpdir=$CATALINA_BASE/temp" + +# Set the JSP compiler if set in the tomcat5.5.default file +if [ -n "$JSP_COMPILER" ]; then + JAVA_OPTS="$JAVA_OPTS -Dbuild.compiler=$JSP_COMPILER" +fi + +if [ "$TOMCAT_SECURITY" = "yes" ]; then + JAVA_OPTS="$JAVA_OPTS -Djava.security.manager -Djava.security.policy=$CATALINA_BASE/conf/catalina.policy" +fi + +# juli LogManager disabled if running under gij (see bug #395167) +if [ "$gij" != "yes" ]; then + JAVA_OPTS="$JAVA_OPTS -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Djava.util.logging.config.file=$CATALINA_BASE/conf/logging.properties" +fi + +# Define other required variables +CATALINA_PID="/var/run/$NAME.pid" +BOOTSTRAP_CLASS=org.apache.catalina.startup.Bootstrap +JSVC_CLASSPATH="/usr/share/java/commons-daemon.jar:$CATALINA_HOME/bin/bootstrap.jar:$CATALINA_HOME/bin/tomcat-juli.jar" + +# 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 +export JSSE_HOME + +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 specified" + exit 1 + fi + + log_daemon_msg "Starting $DESC" "$NAME" + if start-stop-daemon --test --start --pidfile "$CATALINA_PID" \ + --user $TOMCAT_USER --startas "$JAVA_HOME/bin/java" \ + >/dev/null; then + + # Clean up and set permissions on required files + find "$CATALINA_BASE"/temp/ -mindepth 1 -exec rm -fr {} + + REQUIRED_FILES='"$CATALINA_BASE/conf" + "$CATALINA_BASE/logs" "$CATALINA_BASE/temp" + "$CATALINA_BASE/webapps" "$CATALINA_BASE/work"' + if [ -e "$CATALINA_BASE/conf/tomcat-users.xml" ]; then + REQUIRED_FILES=$REQUIRED_FILES' + "$CATALINA_BASE/conf/tomcat-users.xml"' + fi + eval chown --dereference "$TOMCAT_USER" $REQUIRED_FILES \ + || true + + cd "$CATALINA_BASE/temp" + + #$XSERVER + nice -n 19 $DAEMON -user "$TOMCAT_USER" -cp "$JSVC_CLASSPATH" \ + -outfile "$LOG" -errfile "$LOG" \ + -pidfile "$CATALINA_PID" $JAVA_OPTS "$BOOTSTRAP_CLASS" + else + log_progress_msg "(already running)" + fi + log_end_msg 0 + ;; + stop) + log_daemon_msg "Stopping $DESC" "$NAME" + if start-stop-daemon --test --start --pidfile "$CATALINA_PID" \ + --user "$TOMCAT_USER" --startas "$JAVA_HOME/bin/java" \ + >/dev/null; then + log_progress_msg "(not running)" + else + $DAEMON -cp "$JSVC_CLASSPATH" -pidfile "$CATALINA_PID" \ + -stop "$BOOTSTRAP_CLASS" + fi + log_end_msg 0 + ;; + status) + if start-stop-daemon --test --start --pidfile "$CATALINA_PID" \ + --user $TOMCAT_USER --startas "$JAVA_HOME/bin/java" \ + >/dev/null; then + + if [ -f "$CATALINA_PID" ]; then + log_success_msg "$DESC is not running, but pid file exists." + else + log_success_msg "$DESC is not running." + fi + else + log_success_msg "$DESC is running with pid `cat $CATALINA_PID`" + fi + ;; + restart|force-reload) + if start-stop-daemon --test --stop --pidfile "$CATALINA_PID" \ + --user $TOMCAT_USER --startas "$JAVA_HOME/bin/java" \ + >/dev/null; then + $0 stop + sleep 1 + fi + $0 start + ;; + try-restart) + if start-stop-daemon --test --start --pidfile "$CATALINA_PID" \ + --user $TOMCAT_USER --startas "$JAVA_HOME/bin/java" \ + >/dev/null; then + $0 start + fi + ;; + *) + log_success_msg "Usage: $0 {start|stop|restart|try-restart|force-reload|status}" + exit 1 + ;; +esac + +exit 0 Property changes on: forge-tools/sys/chorem.org/tomcat-init.d ___________________________________________________________________ Added: svn:executable + * Added: forge-tools/sys/codelutin.com/apache.conf =================================================================== --- forge-tools/sys/codelutin.com/apache.conf (rev 0) +++ forge-tools/sys/codelutin.com/apache.conf 2014-02-06 14:05:51 UTC (rev 19) @@ -0,0 +1,140 @@ +<VirtualHost *:80> + ServerAdmin admin+ci(a)codelutin.com + ServerName ci-ng.codelutin.com + + ProxyRequests Off + + RewriteEngine On + RewriteLog "/var/log/apache2/ci-codelutin.com-rewrite.log" + RewriteLogLevel 0 + + # on match tous les hosts qui passe et qui n'a pas de path dans + # l'url ex: http://a.b.c/ + RewriteCond %{HTTP_HOST} ^ci-ng\.codelutin\.com$ + RewriteCond %{REQUEST_URI} ^/$ + # on ajoute le host dans l'url pour le rewrite + RewriteRule ^(.+) %{HTTP_HOST}$1 [C] + # on remet le nom de machine dans le path http://a.b.c/ -> http://a.b.c/a/ + RewriteRule ^(ci-ng)\.([^/]+)/$ http://$1.$2/jenkins/ [R,L] + + ProxyPass / ajp://localhost:18093/ + ProxyPassReverse / ajp://localhost:18093/ + + <Proxy *> + Order deny,allow + Allow from all + </Proxy> + + ErrorLog /var/log/apache2/ci-codelutin.com-error.log + + # Possible values include: debug, info, notice, warn, error, crit, + # alert, emerg. + LogLevel warn + + CustomLog /var/log/apache2/ci-codelutin.com-access.log combined + +</VirtualHost> +<VirtualHost *:80> + ServerAdmin admin+qa(a)codelutin.com + ServerName qa-ng.codelutin.com + + ProxyRequests Off + ProxyPreserveHost On + + ProxyPass / http://localhost:19093/ + ProxyPassReverse / http://qa-ng.codelutin.com/ + + <Proxy *> + Order deny,allow + Allow from all + </Proxy> + + ErrorLog /var/log/apache2/qa-codelutin.com-error.log + + # Possible values include: debug, info, notice, warn, error, crit, + # alert, emerg. + LogLevel warn + + CustomLog /var/log/apache2/qa-codelutin.com-access.log combined +</VirtualHost> + +<VirtualHost *:443> + ServerAdmin admin+ci(a)codelutin.com + ServerName ci-ng.codelutin.com + + <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> + + ProxyRequests Off + + RewriteEngine On + RewriteLog "/var/log/apache2/ci-codelutin.com-ssl-rewrite.log" + RewriteLogLevel 0 + + # on match tous les hosts qui passe et qui n'a pas de path dans + # l'url ex: https://a.b.c/ + RewriteCond %{HTTP_HOST} ^(ci-ng)\.codelutin\.com$ + RewriteCond %{REQUEST_URI} ^/$ + # on ajoute le host dans l'url pour le rewrite + RewriteRule ^(.+) %{HTTP_HOST}$1 [C] + # on remet le nom de machine dans le path https://a.b.c/ -> http://a.b.c/a/ + RewriteRule ^(ci-ng)\.([^/]+)/$ https://$1.$2/jenkins/ [R,L] + + + ProxyPass / ajp://localhost:18093/ + ProxyPassReverse / ajp://localhost:18093/ + + <Proxy *> + Order deny,allow + Allow from all + </Proxy> + + ErrorLog /var/log/apache2/ci-codelutin.com-ssl-error.log + + # Possible values include: debug, info, notice, warn, error, crit, + # alert, emerg. + LogLevel warn + + CustomLog /var/log/apache2/ci-codelutin.com-ssl-access.log combined + +</VirtualHost> +<VirtualHost *:443> + ServerAdmin admin+qa(a)codelutin.com + ServerName qa-ng.codelutin.com + + <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> + + ProxyPreserveHost On + ProxyRequests Off + + ProxyPass / http://localhost:18093/ + ProxyPassReverse / https//qa-ng.codelutin.com/ + + <Proxy *> + Order deny,allow + Allow from all + </Proxy> + + ErrorLog /var/log/apache2/qa-codelutin.com-ssl-error.log + + # Possible values include: debug, info, notice, warn, error, crit, + # alert, emerg. + LogLevel warn + + CustomLog /var/log/apache2/qa-codelutin.com-ssl-access.log combined +</VirtualHost> + + Added: forge-tools/sys/codelutin.com/sonar-init.d =================================================================== --- forge-tools/sys/codelutin.com/sonar-init.d (rev 0) +++ forge-tools/sys/codelutin.com/sonar-init.d 2014-02-06 14:05:51 UTC (rev 19) @@ -0,0 +1,18 @@ +#!/bin/sh +# +# rc file for SonarQube +# +# chkconfig: 345 96 10 +# description: SonarQube system (www.sonarsource.org) +# +### BEGIN INIT INFO +# Provides: sonar-codelutin.com +# Required-Start: $network +# Required-Stop: $network +# Default-Start: 3 4 5 +# Default-Stop: 0 1 2 6 +# Short-Description: SonarQube system (www.sonarsource.org) +# Description: SonarQube system (www.sonarsource.org) +### END INIT INFO + +/var/local/forge/exec/sonar-codelutin.com/bin/linux-x86-64/sonar.sh $* Property changes on: forge-tools/sys/codelutin.com/sonar-init.d ___________________________________________________________________ Added: svn:executable + * Added: forge-tools/sys/codelutin.com/tomcat-default =================================================================== --- forge-tools/sys/codelutin.com/tomcat-default (rev 0) +++ forge-tools/sys/codelutin.com/tomcat-default 2014-02-06 14:05:51 UTC (rev 19) @@ -0,0 +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 MAVEN_OPTS="${JAVA_OPTS} -XX:-UseGCOverheadLimit -Dmaven.repo.local=/var/local/forge/data/forge.codelutin.com/maven/repository" +export JENKINS_HOME=/var/local/forge/data/forge.codelutin.com/jenkins Added: forge-tools/sys/codelutin.com/tomcat-init.d =================================================================== --- forge-tools/sys/codelutin.com/tomcat-init.d (rev 0) +++ forge-tools/sys/codelutin.com/tomcat-init.d 2014-02-06 14:05:51 UTC (rev 19) @@ -0,0 +1,223 @@ +#!/bin/sh +# +# /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 codelutin by Benjamin Poussin <poussin(a)codelutin.com>. +# Modified for codelutin by Tony CHEMIT <chemit(a)codelutin.com>. +# +### BEGIN INIT INFO +# Provides: tomcat-codelutin.com +# 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 + +NAME=tomcat-codelutin.com + +PATH=/bin:/usr/bin:/sbin:/usr/sbin +DESC="Tomcat servlet engine" +DAEMON=/usr/bin/jsvc +CATALINA_HOME=/opt/apache-tomcat +DEFAULT=/etc/default/$NAME +LOG=/var/log/$NAME.log +CATALINA_BASE=/var/local/forge/exec/$NAME + +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 +. /etc/default/rcS + +# The following variables can be overwritten in $DEFAULT + +# Run Tomcat 5 as this user ID +TOMCAT_USER=tomcat + +# 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" + +# 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_TMP="$jdir" + # checks for a real JDK like environment, needed to check if + # really the java-gcj-compat-dev package is installed + if [ -r "$jdir/bin/jdb" ]; then + JAVA_HOME="$JAVA_HOME_TMP" + fi + fi +done +export JAVA_HOME + +# Directory for per-instance configuration files and webapps +#CATALINA_BASE=$CATALINA_HOME + +# Use the Java security manager? (yes/no) +TOMCAT_SECURITY=no + +# Timeout in seconds for the shutdown of all webapps +TOMCAT_SHUTDOWN=30 + +# End of variables that can be overwritten in $DEFAULT + +# overwrite settings from default file +if [ -f "$DEFAULT" ]; then + . "$DEFAULT" +fi + +test -f $DAEMON || exit 0 + +[ -z "$TOMCAT_USER" ] && TOMCAT_USER=tomcat55 + +# Check if we use gij +gij=no +"$JAVA_HOME/bin/java" -version 2>&1 | grep -q "^gij (GNU libgcj)" && gij=yes + +# gij doesn't support a security manager yet (see bug #399595) +if [ "$gij" = "yes" ]; then + printf "The java-gcj-compat-dev environment currently doesn't\nsupport a security manager. See README.Debian." | logger -p daemon.warning -t $NAME +fi + +# 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 +# se the maximum heap size is set to 128M +if [ -z "$JAVA_OPTS" ]; then + JAVA_OPTS="-Djava.awt.headless=true -Xmx512M" +fi + +JAVA_OPTS="$JAVA_OPTS -Dcatalina.base=$CATALINA_BASE -Dcatalina.home=$CATALINA_HOME -Djava.io.tmpdir=$CATALINA_BASE/temp" + +# Set the JSP compiler if set in the tomcat5.5.default file +if [ -n "$JSP_COMPILER" ]; then + JAVA_OPTS="$JAVA_OPTS -Dbuild.compiler=$JSP_COMPILER" +fi + +if [ "$TOMCAT_SECURITY" = "yes" ]; then + JAVA_OPTS="$JAVA_OPTS -Djava.security.manager -Djava.security.policy=$CATALINA_BASE/conf/catalina.policy" +fi + +# juli LogManager disabled if running under gij (see bug #395167) +if [ "$gij" != "yes" ]; then + JAVA_OPTS="$JAVA_OPTS -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Djava.util.logging.config.file=$CATALINA_BASE/conf/logging.properties" +fi + +# Define other required variables +CATALINA_PID="/var/run/$NAME.pid" +BOOTSTRAP_CLASS=org.apache.catalina.startup.Bootstrap +JSVC_CLASSPATH="/usr/share/java/commons-daemon.jar:$CATALINA_HOME/bin/bootstrap.jar:$CATALINA_HOME/bin/tomcat-juli.jar" + +# 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 +export JSSE_HOME + +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 specified" + exit 1 + fi + + log_daemon_msg "Starting $DESC" "$NAME" + if start-stop-daemon --test --start --pidfile "$CATALINA_PID" \ + --user $TOMCAT_USER --startas "$JAVA_HOME/bin/java" \ + >/dev/null; then + + # Clean up and set permissions on required files + find "$CATALINA_BASE"/temp/ -mindepth 1 -exec rm -fr {} + + REQUIRED_FILES='"$CATALINA_BASE/conf" + "$CATALINA_BASE/logs" "$CATALINA_BASE/temp" + "$CATALINA_BASE/webapps" "$CATALINA_BASE/work"' + if [ -e "$CATALINA_BASE/conf/tomcat-users.xml" ]; then + REQUIRED_FILES=$REQUIRED_FILES' + "$CATALINA_BASE/conf/tomcat-users.xml"' + fi + eval chown --dereference "$TOMCAT_USER" $REQUIRED_FILES \ + || true + + cd "$CATALINA_BASE/temp" + + #$XSERVER + nice -n 19 $DAEMON -user "$TOMCAT_USER" -cp "$JSVC_CLASSPATH" \ + -outfile "$LOG" -errfile "$LOG" \ + -pidfile "$CATALINA_PID" $JAVA_OPTS "$BOOTSTRAP_CLASS" + else + log_progress_msg "(already running)" + fi + log_end_msg 0 + ;; + stop) + log_daemon_msg "Stopping $DESC" "$NAME" + if start-stop-daemon --test --start --pidfile "$CATALINA_PID" \ + --user "$TOMCAT_USER" --startas "$JAVA_HOME/bin/java" \ + >/dev/null; then + log_progress_msg "(not running)" + else + $DAEMON -cp "$JSVC_CLASSPATH" -pidfile "$CATALINA_PID" \ + -stop "$BOOTSTRAP_CLASS" + fi + log_end_msg 0 + ;; + status) + if start-stop-daemon --test --start --pidfile "$CATALINA_PID" \ + --user $TOMCAT_USER --startas "$JAVA_HOME/bin/java" \ + >/dev/null; then + + if [ -f "$CATALINA_PID" ]; then + log_success_msg "$DESC is not running, but pid file exists." + else + log_success_msg "$DESC is not running." + fi + else + log_success_msg "$DESC is running with pid `cat $CATALINA_PID`" + fi + ;; + restart|force-reload) + if start-stop-daemon --test --stop --pidfile "$CATALINA_PID" \ + --user $TOMCAT_USER --startas "$JAVA_HOME/bin/java" \ + >/dev/null; then + $0 stop + sleep 1 + fi + $0 start + ;; + try-restart) + if start-stop-daemon --test --start --pidfile "$CATALINA_PID" \ + --user $TOMCAT_USER --startas "$JAVA_HOME/bin/java" \ + >/dev/null; then + $0 start + fi + ;; + *) + log_success_msg "Usage: $0 {start|stop|restart|try-restart|force-reload|status}" + exit 1 + ;; +esac + +exit 0 Property changes on: forge-tools/sys/codelutin.com/tomcat-init.d ___________________________________________________________________ Added: svn:executable + * Added: forge-tools/sys/nuiton.org/apache.conf =================================================================== --- forge-tools/sys/nuiton.org/apache.conf (rev 0) +++ forge-tools/sys/nuiton.org/apache.conf 2014-02-06 14:05:51 UTC (rev 19) @@ -0,0 +1,138 @@ +<VirtualHost *:80> + ServerAdmin admin+ci(a)nuiton.org + ServerName ci-ng.nuiton.org + + ProxyRequests Off + + RewriteEngine On + RewriteLog "/var/log/apache2/forge-nuiton.org-rewrite.log" + RewriteLogLevel 0 + + # on match tous les hosts qui passe et qui n'a pas de path dans + # l'url ex: http://a.b.c/ + RewriteCond %{HTTP_HOST} ^(ci-ng)\.nuiton\.org$ + RewriteCond %{REQUEST_URI} ^/$ + # on ajoute le host dans l'url pour le rewrite + RewriteRule ^(.+) %{HTTP_HOST}$1 [C] + # on remet le nom de machine dans le path https://a.b.c/ -> http://a.b.c/a/ + RewriteRule ^(ci-ng)\.([^/]+)/$ http://$1.$2/jenkins/ [R,L] + + ProxyPass / ajp://localhost:18091/ + ProxyPassReverse / ajp://localhost:18091/ + + <Proxy *> + Order deny,allow + Allow from all + </Proxy> + + ErrorLog /var/log/apache2/ci-nuiton.org-error.log + + # Possible values include: debug, info, notice, warn, error, crit, + # alert, emerg. + LogLevel warn + + CustomLog /var/log/apache2/ci-nuiton.org-access.log combined +</VirtualHost> + +<VirtualHost *:80> + ServerAdmin admin+qa(a)nuiton.org + ServerName qa-ng.nuiton.org + + ProxyRequests Off + ProxyPreserveHost On + + ProxyPass / http://localhost:19091/ + ProxyPassReverse / http://qa-ng.nuiton.org/ + + <Proxy *> + Order deny,allow + Allow from all + </Proxy> + + ErrorLog /var/log/apache2/qa-nuiton.org-error.log + + # Possible values include: debug, info, notice, warn, error, crit, + # alert, emerg. + LogLevel warn + + CustomLog /var/log/apache2/qa-nuiton.org-access.log combined +</VirtualHost> + +<VirtualHost *:443> + ServerAdmin admin+ci(a)nuiton.org + ServerName ci-ng.nuiton.org + + <IfModule mod_ssl.c> + SSLEngine on + SSLCertificateFile /etc/ssl/certs/wildcard.nuiton.org.crt + SSLCertificateKeyFile /etc/ssl/private/wildcard.nuiton.org.key + SSLCACertificateFile /etc/ssl/certs/GandiStandardSSLCA.pem + SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown + SSLVerifyClient None + </IfModule> + + ProxyRequests Off + + RewriteEngine On + RewriteLog "/var/log/apache2/forge-nuiton.org-ssl-rewrite.log" + RewriteLogLevel 0 + + # on match tous les hosts qui passe et qui n'a pas de path dans + # l'url ex: http://a.b.c/ + RewriteCond %{HTTP_HOST} ^(ci-ng)\.nuiton\.org$ + RewriteCond %{REQUEST_URI} ^/$ + # on ajoute le host dans l'url pour le rewrite + RewriteRule ^(.+) %{HTTP_HOST}$1 [C] + # on remet le nom de machine dans le path https://a.b.c/ -> http://a.b.c/a/ + RewriteRule ^(ci-ng)\.([^/]+)/$ https://$1.$2/jenkins/ [R,L] + + ProxyPass / ajp://localhost:18091/ + ProxyPassReverse / ajp://localhost:18091/ + + <Proxy *> + Order deny,allow + Allow from all + </Proxy> + + ErrorLog /var/log/apache2/ci-nuiton.org-ssl-error.log + + # Possible values include: debug, info, notice, warn, error, crit, + # alert, emerg. + LogLevel warn + + CustomLog /var/log/apache2/ci-nuiton.org-ssl-access.log combined + +</VirtualHost> +<VirtualHost *:443> + ServerAdmin admin+qa(a)nuiton.org + ServerName qa-ng.nuiton.org + + <IfModule mod_ssl.c> + SSLEngine on + SSLCertificateFile /etc/ssl/certs/wildcard.nuiton.org.crt + SSLCertificateKeyFile /etc/ssl/private/wildcard.nuiton.org.key + SSLCACertificateFile /etc/ssl/certs/GandiStandardSSLCA.pem + SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown + SSLVerifyClient None + </IfModule> + + ProxyRequests Off + ProxyPreserveHost On + + ProxyPass / http://localhost:19091/ + ProxyPassReverse / https://qa-ng.nuiton.org/ + + <Proxy *> + Order deny,allow + Allow from all + </Proxy> + + ErrorLog /var/log/apache2/qa-nuiton.org-ssl-error.log + + # Possible values include: debug, info, notice, warn, error, crit, + # alert, emerg. + LogLevel warn + + CustomLog /var/log/apache2/qa-nuiton.org-ssl-access.log combined +</VirtualHost> + Added: forge-tools/sys/nuiton.org/sonar-init.d =================================================================== --- forge-tools/sys/nuiton.org/sonar-init.d (rev 0) +++ forge-tools/sys/nuiton.org/sonar-init.d 2014-02-06 14:05:51 UTC (rev 19) @@ -0,0 +1,18 @@ +#!/bin/sh +# +# rc file for SonarQube +# +# chkconfig: 345 96 10 +# description: SonarQube system (www.sonarsource.org) +# +### BEGIN INIT INFO +# Provides: sonar-nuiton.org +# Required-Start: $network +# Required-Stop: $network +# Default-Start: 3 4 5 +# Default-Stop: 0 1 2 6 +# Short-Description: SonarQube system (www.sonarsource.org) +# Description: SonarQube system (www.sonarsource.org) +### END INIT INFO + +/var/local/forge/exec/sonar-nuiton.org/bin/linux-x86-64/sonar.sh $* Property changes on: forge-tools/sys/nuiton.org/sonar-init.d ___________________________________________________________________ Added: svn:executable + * Added: forge-tools/sys/nuiton.org/tomcat-default =================================================================== --- forge-tools/sys/nuiton.org/tomcat-default (rev 0) +++ forge-tools/sys/nuiton.org/tomcat-default 2014-02-06 14:05:51 UTC (rev 19) @@ -0,0 +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 MAVEN_OPTS="${JAVA_OPTS} -XX:-UseGCOverheadLimit -Dmaven.repo.local=/var/local/forge/data/nuiton.org/maven/repository" +export JENKINS_HOME=/var/local/forge/data/nuiton.org/jenkins Added: forge-tools/sys/nuiton.org/tomcat-init.d =================================================================== --- forge-tools/sys/nuiton.org/tomcat-init.d (rev 0) +++ forge-tools/sys/nuiton.org/tomcat-init.d 2014-02-06 14:05:51 UTC (rev 19) @@ -0,0 +1,223 @@ +#!/bin/sh +# +# /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 codelutin by Benjamin Poussin <poussin(a)codelutin.com>. +# Modified for codelutin by Tony CHEMIT <chemit(a)codelutin.com>. +# +### BEGIN INIT INFO +# Provides: tomcat-nuiton.org +# 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 + +NAME=tomcat-nuiton + +PATH=/bin:/usr/bin:/sbin:/usr/sbin +DESC="Tomcat servlet engine" +DAEMON=/usr/bin/jsvc +CATALINA_HOME=/opt/apache-tomcat +DEFAULT=/etc/default/$NAME +LOG=/var/log/$NAME.log +CATALINA_BASE=/var/local/forge/exec/$NAME + +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 +. /etc/default/rcS + +# The following variables can be overwritten in $DEFAULT + +# Run Tomcat 5 as this user ID +TOMCAT_USER=tomcat + +# 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" + +# 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_TMP="$jdir" + # checks for a real JDK like environment, needed to check if + # really the java-gcj-compat-dev package is installed + if [ -r "$jdir/bin/jdb" ]; then + JAVA_HOME="$JAVA_HOME_TMP" + fi + fi +done +export JAVA_HOME + +# Directory for per-instance configuration files and webapps +#CATALINA_BASE=$CATALINA_HOME + +# Use the Java security manager? (yes/no) +TOMCAT_SECURITY=no + +# Timeout in seconds for the shutdown of all webapps +TOMCAT_SHUTDOWN=30 + +# End of variables that can be overwritten in $DEFAULT + +# overwrite settings from default file +if [ -f "$DEFAULT" ]; then + . "$DEFAULT" +fi + +test -f $DAEMON || exit 0 + +[ -z "$TOMCAT_USER" ] && TOMCAT_USER=tomcat55 + +# Check if we use gij +gij=no +"$JAVA_HOME/bin/java" -version 2>&1 | grep -q "^gij (GNU libgcj)" && gij=yes + +# gij doesn't support a security manager yet (see bug #399595) +if [ "$gij" = "yes" ]; then + printf "The java-gcj-compat-dev environment currently doesn't\nsupport a security manager. See README.Debian." | logger -p daemon.warning -t $NAME +fi + +# 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 +# se the maximum heap size is set to 128M +if [ -z "$JAVA_OPTS" ]; then + JAVA_OPTS="-Djava.awt.headless=true -Xmx512M" +fi + +JAVA_OPTS="$JAVA_OPTS -Dcatalina.base=$CATALINA_BASE -Dcatalina.home=$CATALINA_HOME -Djava.io.tmpdir=$CATALINA_BASE/temp" + +# Set the JSP compiler if set in the tomcat5.5.default file +if [ -n "$JSP_COMPILER" ]; then + JAVA_OPTS="$JAVA_OPTS -Dbuild.compiler=$JSP_COMPILER" +fi + +if [ "$TOMCAT_SECURITY" = "yes" ]; then + JAVA_OPTS="$JAVA_OPTS -Djava.security.manager -Djava.security.policy=$CATALINA_BASE/conf/catalina.policy" +fi + +# juli LogManager disabled if running under gij (see bug #395167) +if [ "$gij" != "yes" ]; then + JAVA_OPTS="$JAVA_OPTS -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Djava.util.logging.config.file=$CATALINA_BASE/conf/logging.properties" +fi + +# Define other required variables +CATALINA_PID="/var/run/$NAME.pid" +BOOTSTRAP_CLASS=org.apache.catalina.startup.Bootstrap +JSVC_CLASSPATH="/usr/share/java/commons-daemon.jar:$CATALINA_HOME/bin/bootstrap.jar:$CATALINA_HOME/bin/tomcat-juli.jar" + +# 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 +export JSSE_HOME + +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 specified" + exit 1 + fi + + log_daemon_msg "Starting $DESC" "$NAME" + if start-stop-daemon --test --start --pidfile "$CATALINA_PID" \ + --user $TOMCAT_USER --startas "$JAVA_HOME/bin/java" \ + >/dev/null; then + + # Clean up and set permissions on required files + find "$CATALINA_BASE"/temp/ -mindepth 1 -exec rm -fr {} + + REQUIRED_FILES='"$CATALINA_BASE/conf" + "$CATALINA_BASE/logs" "$CATALINA_BASE/temp" + "$CATALINA_BASE/webapps" "$CATALINA_BASE/work"' + if [ -e "$CATALINA_BASE/conf/tomcat-users.xml" ]; then + REQUIRED_FILES=$REQUIRED_FILES' + "$CATALINA_BASE/conf/tomcat-users.xml"' + fi + eval chown --dereference "$TOMCAT_USER" $REQUIRED_FILES \ + || true + + cd "$CATALINA_BASE/temp" + + #$XSERVER + nice -n 19 $DAEMON -user "$TOMCAT_USER" -cp "$JSVC_CLASSPATH" \ + -outfile "$LOG" -errfile "$LOG" \ + -pidfile "$CATALINA_PID" $JAVA_OPTS "$BOOTSTRAP_CLASS" + else + log_progress_msg "(already running)" + fi + log_end_msg 0 + ;; + stop) + log_daemon_msg "Stopping $DESC" "$NAME" + if start-stop-daemon --test --start --pidfile "$CATALINA_PID" \ + --user "$TOMCAT_USER" --startas "$JAVA_HOME/bin/java" \ + >/dev/null; then + log_progress_msg "(not running)" + else + $DAEMON -cp "$JSVC_CLASSPATH" -pidfile "$CATALINA_PID" \ + -stop "$BOOTSTRAP_CLASS" + fi + log_end_msg 0 + ;; + status) + if start-stop-daemon --test --start --pidfile "$CATALINA_PID" \ + --user $TOMCAT_USER --startas "$JAVA_HOME/bin/java" \ + >/dev/null; then + + if [ -f "$CATALINA_PID" ]; then + log_success_msg "$DESC is not running, but pid file exists." + else + log_success_msg "$DESC is not running." + fi + else + log_success_msg "$DESC is running with pid `cat $CATALINA_PID`" + fi + ;; + restart|force-reload) + if start-stop-daemon --test --stop --pidfile "$CATALINA_PID" \ + --user $TOMCAT_USER --startas "$JAVA_HOME/bin/java" \ + >/dev/null; then + $0 stop + sleep 1 + fi + $0 start + ;; + try-restart) + if start-stop-daemon --test --start --pidfile "$CATALINA_PID" \ + --user $TOMCAT_USER --startas "$JAVA_HOME/bin/java" \ + >/dev/null; then + $0 start + fi + ;; + *) + log_success_msg "Usage: $0 {start|stop|restart|try-restart|force-reload|status}" + exit 1 + ;; +esac + +exit 0 Property changes on: forge-tools/sys/nuiton.org/tomcat-init.d ___________________________________________________________________ Added: svn:executable + * Added: forge-tools/sys/upgrade-jenkins.sh =================================================================== --- forge-tools/sys/upgrade-jenkins.sh (rev 0) +++ forge-tools/sys/upgrade-jenkins.sh 2014-02-06 14:05:51 UTC (rev 19) @@ -0,0 +1,66 @@ +#! /bin/bash + +# +# Script pour mettre a jour jenkins +# +# Usage: ./upgrade-jenkins.sh version +# +# Changelog: +# 2012-07-16: chemit(a)codelutin.com (creation) +# 2014-01-25: chemit(a)codelutin.com (mise a jour de plusieurs instances) +# + +update_tomcat() { + + TOMCAT_INSTANCE=$1 + WAR=$2 + TOMCAT_WEBAPPS=/var/local/forge/exec/$TOMCAT_INSTANCE/webapps + + # stop tomcat + service $TOMCAT_INSTANCE stop + + # clean webapps + rm -rf $TOMCAT_WEBAPPS/jenkins + + # cp new jenkins war + cp $WAR_PATH $TOMCAT_WEBAPPS + + # start tomcat + service $TOMCAT_INSTANCE start +} + +if [ ! $# -eq 1 ]; then + echo "usage: $0 version" + exit 1 +fi + +# version to deploy +VERSION=$1 + +# wars repository +WAR_REPOSITORY=/var/local/forge/exec/repository + +# war path to deploy in tomcats +WAR_PATH=/var/local/forge/exec/jenkins.war + +# Get new war +(cd /tmp ; rm -rf jenkins.war ; wget http://updates.jenkins-ci.org/download/war/$VERSION/jenkins.war) + +if [ ! -f /tmp/jenkins.war ]; then + echo "Could not find /tmp/jenkins.war to deploy" + exit 1 +fi + +# Copy it path +mv -v /tmp/jenkins.war $WAR_REPOSITORY/jenkins-$VERSION.war + +# unlink previous war +unlink $WAR_PATH + +# Create new link +ln -s $WAR_REPOSITORY/jenkins-$VERSION.war $WAR_PATH + +# For each tomcat, do update +for i in "nuiton.org chorem.org codelutin.com" ; do + update_tomcat $i $WAR_PATH +done Property changes on: forge-tools/sys/upgrade-jenkins.sh ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native

1 0

r18 - scripts/maven-release
by bleny＠users.forge.codelutin.com Jan. 28, 2014

Jan. 28, 2014

Author: bleny Date: 2014-01-28 17:31:26 +0100 (Tue, 28 Jan 2014) New Revision: 18 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/18 Log: refs #4165 fix svn: Not enough arguments provided when revert everything in last step Modified: scripts/maven-release/deploy-to-demo-from-SVN.sh Modified: scripts/maven-release/deploy-to-demo-from-SVN.sh =================================================================== --- scripts/maven-release/deploy-to-demo-from-SVN.sh 2014-01-28 08:38:19 UTC (rev 17) +++ scripts/maven-release/deploy-to-demo-from-SVN.sh 2014-01-28 16:31:26 UTC (rev 18) @@ -226,7 +226,7 @@ echo -n "4/4 Revert local modifications and clean target..." cd svn -svn revert -R > /dev/null +svn revert -R . > /dev/null ${M2_HOME}/bin/mvn clean > /dev/null cd ..

1 0

r17 - scripts/redmine-tools
by tchemit＠users.forge.codelutin.com Jan. 28, 2014

Jan. 28, 2014

Author: tchemit Date: 2014-01-28 09:38:19 +0100 (Tue, 28 Jan 2014) New Revision: 17 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/17 Log: fix nightly-clean.sh (only scan directories) Modified: scripts/redmine-tools/nightly-clean.sh Modified: scripts/redmine-tools/nightly-clean.sh =================================================================== --- scripts/redmine-tools/nightly-clean.sh 2014-01-28 08:35:35 UTC (rev 16) +++ scripts/redmine-tools/nightly-clean.sh 2014-01-28 08:38:19 UTC (rev 17) @@ -20,14 +20,16 @@ logger -id -p cron.info [nightly-maven-clean] clean $forge/$p (cd $forgeBasedir/$p ; /opt/maven/bin/mvn clean >/dev/null) else - # try on a subdir - 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 + 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

1 0

r16 - scripts/maven-release
by tchemit＠users.forge.codelutin.com Jan. 28, 2014

Jan. 28, 2014

Author: tchemit Date: 2014-01-28 09:35:35 +0100 (Tue, 28 Jan 2014) New Revision: 16 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/16 Log: fix isis-fish-docs-site.sh script (do not use a hardcoded version of maven) Modified: scripts/maven-release/isis-fish-docs-site.sh Modified: scripts/maven-release/isis-fish-docs-site.sh =================================================================== --- scripts/maven-release/isis-fish-docs-site.sh 2014-01-22 16:22:20 UTC (rev 15) +++ scripts/maven-release/isis-fish-docs-site.sh 2014-01-28 08:35:35 UTC (rev 16) @@ -5,13 +5,10 @@ # si l'argument clean est passe, alors un clean est fait avant site # FIXME tchemit-2011-12-25 : pas une bonne idée de déployer quelquechose qui n'a pas été cleané avant ... -#export MVN=/opt/maven/bin/mvn -export MVN=/opt/repository/apache-maven-3.0.5/bin/mvn -export M2_HOME=/opt/repository/apache-maven-3.0.5 - ( date cd /home/maven-release/projets/forge.codelutin.com/isis-fish-docs/svn/ +svn revert -R . svn up -$MVN $1 site-deploy +/opt/maven/bin/mvn $1 site-deploy ) >> /var/log/isis-fish-docs.log

1 0

r15 - scripts/maven-release
by bleny＠users.forge.codelutin.com Jan. 22, 2014

Jan. 22, 2014

Author: bleny Date: 2014-01-22 17:22:20 +0100 (Wed, 22 Jan 2014) New Revision: 15 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/15 Log: fixes #4165 at the end of deploy-to-demo-from-SVN.sh, add mvn clean Modified: scripts/maven-release/deploy-to-demo-from-SVN.sh Modified: scripts/maven-release/deploy-to-demo-from-SVN.sh =================================================================== --- scripts/maven-release/deploy-to-demo-from-SVN.sh 2014-01-19 10:22:50 UTC (rev 14) +++ scripts/maven-release/deploy-to-demo-from-SVN.sh 2014-01-22 16:22:20 UTC (rev 15) @@ -223,8 +223,13 @@ fi # revert any change -echo -n "4/4 Revert local modifications..." -svn revert -R svn > /dev/null +echo -n "4/4 Revert local modifications and clean target..." + +cd svn +svn revert -R > /dev/null +${M2_HOME}/bin/mvn clean > /dev/null +cd .. + echo "OK" bye_bye 0

1 0

r14 - in scripts: . redmine-tools
by maven-release＠users.forge.codelutin.com Jan. 19, 2014

Jan. 19, 2014

Author: maven-release Date: 2014-01-19 11:22:50 +0100 (Sun, 19 Jan 2014) New Revision: 14 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/14 Log: refs #4152: Mettre les scripts sur le svn d'adminsys (redmine-tools) Added: scripts/redmine-tools/ scripts/redmine-tools/check-post-commit.sh scripts/redmine-tools/commit-email.pl scripts/redmine-tools/commit-email.pl_backup scripts/redmine-tools/display-projects.sh scripts/redmine-tools/isis-count-mail.sh scripts/redmine-tools/list-default-option.cfg scripts/redmine-tools/list-indexing.sh scripts/redmine-tools/list-indexing.sh.old scripts/redmine-tools/mailman-user2realm.py scripts/redmine-tools/nightly-clean.sh scripts/redmine-tools/nightly-site-deploy.sh scripts/redmine-tools/project-list.rb scripts/redmine-tools/project-site.rb scripts/redmine-tools/redmine-post-commit.sh scripts/redmine-tools/reposman-0.8.rb scripts/redmine-tools/reposman.rb scripts/redmine-tools/retrive-archive.sh scripts/redmine-tools/retrive-isis-archive.sh scripts/redmine-tools/sendemail-isis-migration-notification.sh scripts/redmine-tools/sendemail-migration-notification.sh scripts/redmine-tools/sign-repo.sh scripts/redmine-tools/swish.cgi Added: scripts/redmine-tools/check-post-commit.sh =================================================================== --- scripts/redmine-tools/check-post-commit.sh (rev 0) +++ scripts/redmine-tools/check-post-commit.sh 2014-01-19 10:22:50 UTC (rev 14) @@ -0,0 +1,60 @@ +#!/bin/sh + +# +# create hooks/post-commit to send mail on commits list +# on all commit action for specified project +# +# argument: +# $1 hostname: nuiton or chorem +# $2 projectname +# $3 if this arg exist (no specific value) then force file creation (overwrite) +# +# changelog +# 20120321 chemit(a)codelutin.com +# - use a unify script (bored to generated everywhere same script for maintin purpose...) +# 20120209 chemit(a)codelutin.com +# - touch project to nightly site - deploy +# 20110722 chemit(a)codelutin.com +# - verifiy that svnroot exists + use domainname instead of hostname +# 20090817 poussin +# - add documentation +# 20110315 poussin +# - change owner and execution flag after file creation +# + +# 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 + svnapikey="UDh19sTvBsU7HmzbxSlk" +fi + +projectname=$2 +force=$3 +svnroot="/var/lib/svn/svn-$domain/$projectname" +postcommitfile="/var/lib/svn/svn-$domain/$projectname/hooks/post-commit" + +if [ -n $(list_lists | grep -i '$projectname-commits') ]; then + echo "list exists for $projectname" + if [ -f "$svnroot" -a ! -f "$postcommitfile" -o -n "$force" ]; then + echo "create $postcommitfile" + cat << EOF > $postcommitfile +#!/bin/sh +/opt/redmine-tools/redmine-post-commit.sh \ +"\$1" "\$2" "$projectname" "$domain" "$svnapikey"\ + +EOF + + chown www-data.publish $postcommitfile + chmod +x $postcommitfile + fi +fi Property changes on: scripts/redmine-tools/check-post-commit.sh ___________________________________________________________________ Added: svn:executable + * Added: scripts/redmine-tools/commit-email.pl =================================================================== --- scripts/redmine-tools/commit-email.pl (rev 0) +++ scripts/redmine-tools/commit-email.pl 2014-01-19 10:22:50 UTC (rev 14) @@ -0,0 +1,611 @@ +#!/usr/bin/env perl + +# ==================================================================== +# commit-email.pl: send a commit email for commit REVISION in +# repository REPOS to some email addresses. +# +# For usage, see the usage subroutine or run the script with no +# command line arguments. +# +# $HeadURL: http://svn.collab.net/repos/svn/branches/1.1.x/tools/hook-scripts/commit-em… $ +# $LastChangedDate: 2004-06-14 16:29:22 -0400 (Mon, 14 Jun 2004) $ +# $LastChangedBy: breser $ +# $LastChangedRevision: 9986 $ +# +# ==================================================================== +# Copyright (c) 2000-2004 CollabNet. All rights reserved. +# +# This software is licensed as described in the file COPYING, which +# you should have received as part of this distribution. The terms +# are also available at http://subversion.tigris.org/license-1.html. +# If newer versions of this license are posted there, you may use a +# newer version instead, at your option. +# +# This software consists of voluntary contributions made by many +# individuals. For exact contribution history, see the revision +# history and logs, available at http://subversion.tigris.org/. +# ==================================================================== + +# Turn on warnings the best way depending on the Perl version. +BEGIN { + if ( $] >= 5.006_000) + { require warnings; import warnings; } + else + { $^W = 1; } +} + +use strict; +use Carp; +use Net::SMTP; + +###################################################################### +# Configuration section. + +# Sendmail path. +my $sendmail = "/usr/sbin/sendmail"; + +# Svnlook path. +my $svnlook = "/usr/bin/svnlook"; + +# By default, when a file is deleted from the repository, svnlook diff +# prints the entire contents of the file. If you want to save space +# in the log and email messages by not printing the file, then set +# $no_diff_deleted to 1. +my $no_diff_deleted = 0; + +# Since the path to svnlook depends upon the local installation +# preferences, check that the required programs exist to insure that +# the administrator has set up the script properly. +{ + my $ok = 1; + foreach my $program ($svnlook) + { + if (-e $program) + { + unless (-x $program) + { + warn "$0: required program `$program' is not executable, ", + "edit $0.\n"; + $ok = 0; + } + } + else + { + warn "$0: required program `$program' does not exist, edit $0.\n"; + $ok = 0; + } + } + exit 1 unless $ok; +} + + +###################################################################### +# Initial setup/command-line handling. + +# Each value in this array holds a hash reference which contains the +# associated email information for one project. Start with an +# implicit rule that matches all paths. +my @project_settings_list = (&new_project); + +# Process the command line arguments till there are none left. The +# first two arguments that are not used by a command line option are +# the repository path and the revision number. +my $repos; +my $rev; + +# Use the reference to the first project to populate. +my $current_project = $project_settings_list[0]; + +# This hash matches the command line option to the hash key in the +# project. If a key exists but has a false value (''), then the +# command line option is allowed but requires special handling. +my %opt_to_hash_key = ('--from' => 'from_address', + '-h' => 'hostname', + '-l' => 'log_file', + '-m' => '', + '-r' => 'reply_to', + '--smtp' => 'smtp_server', + '-s' => 'subject_prefix'); + +while (@ARGV) + { + my $arg = shift @ARGV; + if ($arg =~ /^-/) + { + my $hash_key = $opt_to_hash_key{$arg}; + unless (defined $hash_key) + { + die "$0: command line option `$arg' is not recognized.\n"; + } + + unless (@ARGV) + { + die "$0: command line option `$arg' is missing a value.\n"; + } + my $value = shift @ARGV; + + if ($hash_key) + { + $current_project->{$hash_key} = $value; + } + else + { + # Here handle -m. + unless ($arg eq '-m') + { + die "$0: internal error: should only handle -m here.\n"; + } + $current_project = &new_project; + $current_project->{match_regex} = $value; + push(@project_settings_list, $current_project); + } + } + elsif ($arg =~ /^-/) + { + die "$0: command line option `$arg' is not recognized.\n"; + } + else + { + if (! defined $repos) + { + $repos = $arg; + } + elsif (! defined $rev) + { + $rev = $arg; + } + else + { + push(@{$current_project->{email_addresses}}, $arg); + } + } + } + +# If the revision number is undefined, then there were not enough +# command line arguments. +&usage("$0: too few arguments.") unless defined $rev; + +# Check the validity of the command line arguments. Check that the +# revision is an integer greater than 0 and that the repository +# directory exists. +unless ($rev =~ /^\d+/ and $rev > 0) + { + &usage("$0: revision number `$rev' must be an integer > 0."); + } +unless (-e $repos) + { + &usage("$0: repos directory `$repos' does not exist."); + } +unless (-d _) + { + &usage("$0: repos directory `$repos' is not a directory."); + } + +# Check that all of the regular expressions can be compiled and +# compile them. +{ + my $ok = 1; + for (my $i=0; $i<@project_settings_list; ++$i) + { + my $match_regex = $project_settings_list[$i]->{match_regex}; + + # To help users that automatically write regular expressions + # that match the root directory using ^/, remove the / character + # because subversion paths, while they start at the root level, + # do not begin with a /. + $match_regex =~ s#^\^/#^#; + + my $match_re; + eval { $match_re = qr/$match_regex/ }; + if ($@) + { + warn "$0: -m regex #$i `$match_regex' does not compile:\n$@\n"; + $ok = 0; + next; + } + $project_settings_list[$i]->{match_re} = $match_re; + } + exit 1 unless $ok; +} + +###################################################################### +# Harvest data using svnlook. + +# Change into /tmp so that svnlook diff can create its .svnlook +# directory. +my $tmp_dir = '/tmp'; +chdir($tmp_dir) + or die "$0: cannot chdir `$tmp_dir': $!\n"; + +# Get the author, date, and log from svnlook. +my @svnlooklines = &read_from_process($svnlook, 'info', $repos, '-r', $rev); +my $author = shift @svnlooklines; +my $date = shift @svnlooklines; +shift @svnlooklines; +my @log = map { "$_\n" } @svnlooklines; + +# Figure out what directories have changed using svnlook. +my @dirschanged = &read_from_process($svnlook, 'dirs-changed', $repos, + '-r', $rev); + +# Lose the trailing slash in the directory names if one exists, except +# in the case of '/'. +my $rootchanged = 0; +for (my $i=0; $i<@dirschanged; ++$i) + { + if ($dirschanged[$i] eq '/') + { + $rootchanged = 1; + } + else + { + $dirschanged[$i] =~ s#^(.+)[/\\]$#$1#; + } + } + +# Figure out what files have changed using svnlook. +@svnlooklines = &read_from_process($svnlook, 'changed', $repos, '-r', $rev); + +# Parse the changed nodes. +my @adds; +my @dels; +my @mods; +foreach my $line (@svnlooklines) + { + my $path = ''; + my $code = ''; + + # Split the line up into the modification code and path, ignoring + # property modifications. + if ($line =~ /^(.). (.*)$/) + { + $code = $1; + $path = $2; + } + + if ($code eq 'A') + { + push(@adds, $path); + } + elsif ($code eq 'D') + { + push(@dels, $path); + } + else + { + push(@mods, $path); + } + } + +# Get the diff from svnlook. +my @no_diff_deleted = $no_diff_deleted ? ('--no-diff-deleted') : (); +my @difflines = &read_from_process($svnlook, 'diff', $repos, + '-r', $rev, @no_diff_deleted); + +###################################################################### +# Modified directory name collapsing. + +# Collapse the list of changed directories only if the root directory +# was not modified, because otherwise everything is under root and +# there's no point in collapsing the directories, and only if more +# than one directory was modified. +my $commondir = ''; +if (!$rootchanged and @dirschanged > 1) + { + my $firstline = shift @dirschanged; + my @commonpieces = split('/', $firstline); + foreach my $line (@dirschanged) + { + my @pieces = split('/', $line); + my $i = 0; + while ($i < @pieces and $i < @commonpieces) + { + if ($pieces[$i] ne $commonpieces[$i]) + { + splice(@commonpieces, $i, @commonpieces - $i); + last; + } + $i++; + } + } + unshift(@dirschanged, $firstline); + + if (@commonpieces) + { + $commondir = join('/', @commonpieces); + my @new_dirschanged; + foreach my $dir (@dirschanged) + { + if ($dir eq $commondir) + { + $dir = '.'; + } + else + { + $dir =~ s#^$commondir/##; + } + push(@new_dirschanged, $dir); + } + @dirschanged = @new_dirschanged; + } + } +my $dirlist = join(' ', @dirschanged); + +###################################################################### +# Assembly of log message. + +##TC-2010-04-29 Add url link to redmine svn revision +my @paths = split('/', $repos); + +my $redminePlatform = $paths[4]; + +if ($redminePlatform =~ /^svn-(.*)$/) +{ + $redminePlatform = $1; +} + +my $redmineProject = $paths[5]; + +my $redmineUrl = "http://$redminePlatform/projects/$redmineProject/repository/revisions/$rev"; + + +# Put together the body of the log message. +my @body; +push(@body, "Author: $author\n"); +push(@body, "Date: $date\n"); +push(@body, "New Revision: $rev\n"); +##TC-2010-04-29 Add url link to redmine svn revision +push(@body, "\n"); +push(@body, "Url: $redmineUrl\n"); +push(@body, "\n"); +push(@body, "Log:\n"); +push(@body, @log); +push(@body, "\n"); +if (@adds) + { + @adds = sort @adds; + push(@body, "Added:\n"); + push(@body, map { " $_\n" } @adds); + } +if (@dels) + { + @dels = sort @dels; + push(@body, "Removed:\n"); + push(@body, map { " $_\n" } @dels); + } +if (@mods) + { + @mods = sort @mods; + push(@body, "Modified:\n"); + push(@body, map { " $_\n" } @mods); + } +push(@body, "\n"); +push(@body, map { /[\r\n]+$/ ? $_ : "$_\n" } @difflines); + +# Go through each project and see if there are any matches for this +# project. If so, send the log out. +foreach my $project (@project_settings_list) + { + my $match_re = $project->{match_re}; + my $match = 0; + foreach my $path (@dirschanged, @adds, @dels, @mods) + { + if ($path =~ $match_re) + { + $match = 1; + last; + } + } + + next unless $match; + + my @email_addresses = @{$project->{email_addresses}}; + my $userlist = join(' ', @email_addresses); + my $to = join(', ', @email_addresses); + my $from_address = $project->{from_address}; + my $hostname = $project->{hostname}; + my $log_file = $project->{log_file}; + my $reply_to = $project->{reply_to}; + my $smtp_server = $project->{smtp_server}; + my $subject_prefix = $project->{subject_prefix}; + my $subject; + + if ($commondir ne '') + { + $subject = "r$rev - in $commondir: $dirlist"; + } + else + { + $subject = "r$rev - $dirlist"; + } + if ($subject_prefix =~ /\w/) + { + $subject = "$subject_prefix $subject"; + } + my $mail_from = $author; + + if ($from_address =~ /\w/) + { + $mail_from = $from_address; + } + elsif ($hostname =~ /\w/) + { + $mail_from = "$mail_from\@$hostname"; + } + + my @head; + push(@head, "To: $to\n"); + push(@head, "From: $mail_from\n"); + push(@head, "Subject: $subject\n"); + push(@head, "Reply-to: $reply_to\n") if $reply_to; + + ### Below, we set the content-type etc, but see these comments + ### from Greg Stein on why this is not a full solution. + # + # From: Greg Stein <gstein(a)lyra.org> + # Subject: Re: svn commit: rev 2599 - trunk/tools/cgi + # To: dev(a)subversion.tigris.org + # Date: Fri, 19 Jul 2002 23:42:32 -0700 + # + # Well... that isn't strictly true. The contents of the files + # might not be UTF-8, so the "diff" portion will be hosed. + # + # If you want a truly "proper" commit message, then you'd use + # multipart MIME messages, with each file going into its own part, + # and labeled with an appropriate MIME type and charset. Of + # course, we haven't defined a charset property yet, but no biggy. + # + # Going with multipart will surely throw out the notion of "cut + # out the patch from the email and apply." But then again: the + # commit emailer could see that all portions are in the same + # charset and skip the multipart thang. + # + # etc etc + # + # Basically: adding/tweaking the content-type is nice, but don't + # think that is the proper solution. + push(@head, "Content-Type: text/plain; charset=UTF-8\n"); + push(@head, "Content-Transfer-Encoding: 8bit\n"); + + push(@head, "\n"); + + my $smtp; + $smtp = Net::SMTP->new($project->{smtp_server}, Timeout => 10); + $smtp->mail($mail_from); + $smtp->to(@email_addresses); + $smtp->data(); + foreach (@head, @body) { + $smtp->datasend($_); + } + $smtp->dataend(); + $smtp->quit; + + # Dump the output to logfile (if its name is not empty). + if ($log_file =~ /\w/) + { + if (open(LOGFILE, ">> $log_file")) + { + print LOGFILE @head, @body; + close LOGFILE + or warn "$0: error in closing `$log_file' for appending: $!\n"; + } + else + { + warn "$0: cannot open `$log_file' for appending: $!\n"; + } + } + } + +exit 0; + +sub usage +{ + warn "@_\n" if @_; + die "usage: $0 REPOS REVNUM [[-m regex] [options] [email_addr ...]] ...\n", + "options are\n", + " --from email_address Email address for 'From:' (overrides -h)\n", + " -h hostname Hostname to append to author for 'From:'\n", + " -l logfile Append mail contents to this log file\n", + " -m regex Regular expression to match committed path\n", + " -r email_address Email address for 'Reply-To:'\n", + " -s subject_prefix Subject line prefix\n", + " -smtp hostname Smtp server\n", + "\n", + "This script supports a single repository with multiple projects,\n", + "where each project receives email only for commits that modify that\n", + "project. A project is identified by using the -m command line\n", + "with a regular expression argument. If a commit has a path that\n", + "matches the regular expression, then the entire commit matches.\n", + "Any of the following -h, -l, -r and -s command line options and\n", + "following email addresses are associated with this project. The\n", + "next -m resets the -h, -l, -r and -s command line options and the\n", + "list of email addresses.\n", + "\n", + "To support a single project conveniently, the script initializes\n", + "itself with an implicit -m . rule that matches any modifications\n", + "to the repository. Therefore, to use the script for a single\n", + "project repository, just use the other comand line options and\n", + "a list of email addresses on the command line. If you do not want\n", + "a project that matches the entire repository, then use a -m with a\n", + "regular expression before any other command line options or email\n", + "addresses.\n"; +} + +# Return a new hash data structure for a new empty project that +# matches any modifications to the repository. +sub new_project +{ + return {email_addresses => [], + from_address => '', + hostname => '', + log_file => '', + match_regex => '.', + reply_to => '', + smtp_server => 'localhost', + subject_prefix => ''}; +} + +# Start a child process safely without using /bin/sh. +sub safe_read_from_pipe +{ + unless (@_) + { + croak "$0: safe_read_from_pipe passed no arguments.\n"; + } + + my $pid = open(SAFE_READ, '-|'); + unless (defined $pid) + { + die "$0: cannot fork: $!\n"; + } + unless ($pid) + { + open(STDERR, ">&STDOUT") + or die "$0: cannot dup STDOUT: $!\n"; + exec(@_) + or die "$0: cannot exec `@_': $!\n"; + } + my @output; + while (<SAFE_READ>) + { + s/[\r\n]+$//; + push(@output, $_); + } + close(SAFE_READ); + my $result = $?; + my $exit = $result >> 8; + my $signal = $result & 127; + my $cd = $result & 128 ? "with core dump" : ""; + if ($signal or $cd) + { + warn "$0: pipe from `@_' failed $cd: exit=$exit signal=$signal\n"; + } + if (wantarray) + { + return ($result, @output); + } + else + { + return $result; + } +} + +# Use safe_read_from_pipe to start a child process safely and return +# the output if it succeeded or an error message followed by the output +# if it failed. +sub read_from_process +{ + unless (@_) + { + croak "$0: read_from_process passed no arguments.\n"; + } + my ($status, @output) = &safe_read_from_pipe(@_); + if ($status) + { + return ("$0: `@_' failed with this output:", @output); + } + else + { + return @output; + } +} Property changes on: scripts/redmine-tools/commit-email.pl ___________________________________________________________________ Added: svn:executable + * Added: scripts/redmine-tools/commit-email.pl_backup =================================================================== --- scripts/redmine-tools/commit-email.pl_backup (rev 0) +++ scripts/redmine-tools/commit-email.pl_backup 2014-01-19 10:22:50 UTC (rev 14) @@ -0,0 +1,592 @@ +#!/usr/bin/env perl + +# ==================================================================== +# commit-email.pl: send a commit email for commit REVISION in +# repository REPOS to some email addresses. +# +# For usage, see the usage subroutine or run the script with no +# command line arguments. +# +# $HeadURL: http://svn.collab.net/repos/svn/branches/1.1.x/tools/hook-scripts/commit-em… $ +# $LastChangedDate: 2004-06-14 16:29:22 -0400 (Mon, 14 Jun 2004) $ +# $LastChangedBy: breser $ +# $LastChangedRevision: 9986 $ +# +# ==================================================================== +# Copyright (c) 2000-2004 CollabNet. All rights reserved. +# +# This software is licensed as described in the file COPYING, which +# you should have received as part of this distribution. The terms +# are also available at http://subversion.tigris.org/license-1.html. +# If newer versions of this license are posted there, you may use a +# newer version instead, at your option. +# +# This software consists of voluntary contributions made by many +# individuals. For exact contribution history, see the revision +# history and logs, available at http://subversion.tigris.org/. +# ==================================================================== + +# Turn on warnings the best way depending on the Perl version. +BEGIN { + if ( $] >= 5.006_000) + { require warnings; import warnings; } + else + { $^W = 1; } +} + +use strict; +use Carp; +use Net::SMTP; + +###################################################################### +# Configuration section. + +# Sendmail path. +my $sendmail = "/usr/sbin/sendmail"; + +# Svnlook path. +my $svnlook = "/usr/bin/svnlook"; + +# By default, when a file is deleted from the repository, svnlook diff +# prints the entire contents of the file. If you want to save space +# in the log and email messages by not printing the file, then set +# $no_diff_deleted to 1. +my $no_diff_deleted = 0; + +# Since the path to svnlook depends upon the local installation +# preferences, check that the required programs exist to insure that +# the administrator has set up the script properly. +{ + my $ok = 1; + foreach my $program ($svnlook) + { + if (-e $program) + { + unless (-x $program) + { + warn "$0: required program `$program' is not executable, ", + "edit $0.\n"; + $ok = 0; + } + } + else + { + warn "$0: required program `$program' does not exist, edit $0.\n"; + $ok = 0; + } + } + exit 1 unless $ok; +} + + +###################################################################### +# Initial setup/command-line handling. + +# Each value in this array holds a hash reference which contains the +# associated email information for one project. Start with an +# implicit rule that matches all paths. +my @project_settings_list = (&new_project); + +# Process the command line arguments till there are none left. The +# first two arguments that are not used by a command line option are +# the repository path and the revision number. +my $repos; +my $rev; + +# Use the reference to the first project to populate. +my $current_project = $project_settings_list[0]; + +# This hash matches the command line option to the hash key in the +# project. If a key exists but has a false value (''), then the +# command line option is allowed but requires special handling. +my %opt_to_hash_key = ('--from' => 'from_address', + '-h' => 'hostname', + '-l' => 'log_file', + '-m' => '', + '-r' => 'reply_to', + '--smtp' => 'smtp_server', + '-s' => 'subject_prefix'); + +while (@ARGV) + { + my $arg = shift @ARGV; + if ($arg =~ /^-/) + { + my $hash_key = $opt_to_hash_key{$arg}; + unless (defined $hash_key) + { + die "$0: command line option `$arg' is not recognized.\n"; + } + + unless (@ARGV) + { + die "$0: command line option `$arg' is missing a value.\n"; + } + my $value = shift @ARGV; + + if ($hash_key) + { + $current_project->{$hash_key} = $value; + } + else + { + # Here handle -m. + unless ($arg eq '-m') + { + die "$0: internal error: should only handle -m here.\n"; + } + $current_project = &new_project; + $current_project->{match_regex} = $value; + push(@project_settings_list, $current_project); + } + } + elsif ($arg =~ /^-/) + { + die "$0: command line option `$arg' is not recognized.\n"; + } + else + { + if (! defined $repos) + { + $repos = $arg; + } + elsif (! defined $rev) + { + $rev = $arg; + } + else + { + push(@{$current_project->{email_addresses}}, $arg); + } + } + } + +# If the revision number is undefined, then there were not enough +# command line arguments. +&usage("$0: too few arguments.") unless defined $rev; + +# Check the validity of the command line arguments. Check that the +# revision is an integer greater than 0 and that the repository +# directory exists. +unless ($rev =~ /^\d+/ and $rev > 0) + { + &usage("$0: revision number `$rev' must be an integer > 0."); + } +unless (-e $repos) + { + &usage("$0: repos directory `$repos' does not exist."); + } +unless (-d _) + { + &usage("$0: repos directory `$repos' is not a directory."); + } + +# Check that all of the regular expressions can be compiled and +# compile them. +{ + my $ok = 1; + for (my $i=0; $i<@project_settings_list; ++$i) + { + my $match_regex = $project_settings_list[$i]->{match_regex}; + + # To help users that automatically write regular expressions + # that match the root directory using ^/, remove the / character + # because subversion paths, while they start at the root level, + # do not begin with a /. + $match_regex =~ s#^\^/#^#; + + my $match_re; + eval { $match_re = qr/$match_regex/ }; + if ($@) + { + warn "$0: -m regex #$i `$match_regex' does not compile:\n$@\n"; + $ok = 0; + next; + } + $project_settings_list[$i]->{match_re} = $match_re; + } + exit 1 unless $ok; +} + +###################################################################### +# Harvest data using svnlook. + +# Change into /tmp so that svnlook diff can create its .svnlook +# directory. +my $tmp_dir = '/tmp'; +chdir($tmp_dir) + or die "$0: cannot chdir `$tmp_dir': $!\n"; + +# Get the author, date, and log from svnlook. +my @svnlooklines = &read_from_process($svnlook, 'info', $repos, '-r', $rev); +my $author = shift @svnlooklines; +my $date = shift @svnlooklines; +shift @svnlooklines; +my @log = map { "$_\n" } @svnlooklines; + +# Figure out what directories have changed using svnlook. +my @dirschanged = &read_from_process($svnlook, 'dirs-changed', $repos, + '-r', $rev); + +# Lose the trailing slash in the directory names if one exists, except +# in the case of '/'. +my $rootchanged = 0; +for (my $i=0; $i<@dirschanged; ++$i) + { + if ($dirschanged[$i] eq '/') + { + $rootchanged = 1; + } + else + { + $dirschanged[$i] =~ s#^(.+)[/\\]$#$1#; + } + } + +# Figure out what files have changed using svnlook. +@svnlooklines = &read_from_process($svnlook, 'changed', $repos, '-r', $rev); + +# Parse the changed nodes. +my @adds; +my @dels; +my @mods; +foreach my $line (@svnlooklines) + { + my $path = ''; + my $code = ''; + + # Split the line up into the modification code and path, ignoring + # property modifications. + if ($line =~ /^(.). (.*)$/) + { + $code = $1; + $path = $2; + } + + if ($code eq 'A') + { + push(@adds, $path); + } + elsif ($code eq 'D') + { + push(@dels, $path); + } + else + { + push(@mods, $path); + } + } + +# Get the diff from svnlook. +my @no_diff_deleted = $no_diff_deleted ? ('--no-diff-deleted') : (); +my @difflines = &read_from_process($svnlook, 'diff', $repos, + '-r', $rev, @no_diff_deleted); + +###################################################################### +# Modified directory name collapsing. + +# Collapse the list of changed directories only if the root directory +# was not modified, because otherwise everything is under root and +# there's no point in collapsing the directories, and only if more +# than one directory was modified. +my $commondir = ''; +if (!$rootchanged and @dirschanged > 1) + { + my $firstline = shift @dirschanged; + my @commonpieces = split('/', $firstline); + foreach my $line (@dirschanged) + { + my @pieces = split('/', $line); + my $i = 0; + while ($i < @pieces and $i < @commonpieces) + { + if ($pieces[$i] ne $commonpieces[$i]) + { + splice(@commonpieces, $i, @commonpieces - $i); + last; + } + $i++; + } + } + unshift(@dirschanged, $firstline); + + if (@commonpieces) + { + $commondir = join('/', @commonpieces); + my @new_dirschanged; + foreach my $dir (@dirschanged) + { + if ($dir eq $commondir) + { + $dir = '.'; + } + else + { + $dir =~ s#^$commondir/##; + } + push(@new_dirschanged, $dir); + } + @dirschanged = @new_dirschanged; + } + } +my $dirlist = join(' ', @dirschanged); + +###################################################################### +# Assembly of log message. + +# Put together the body of the log message. +my @body; +push(@body, "Author: $author\n"); +push(@body, "Date: $date\n"); +push(@body, "New Revision: $rev\n"); +push(@body, "\n"); +if (@adds) + { + @adds = sort @adds; + push(@body, "Added:\n"); + push(@body, map { " $_\n" } @adds); + } +if (@dels) + { + @dels = sort @dels; + push(@body, "Removed:\n"); + push(@body, map { " $_\n" } @dels); + } +if (@mods) + { + @mods = sort @mods; + push(@body, "Modified:\n"); + push(@body, map { " $_\n" } @mods); + } +push(@body, "Log:\n"); +push(@body, @log); +push(@body, "\n"); +push(@body, map { /[\r\n]+$/ ? $_ : "$_\n" } @difflines); + +# Go through each project and see if there are any matches for this +# project. If so, send the log out. +foreach my $project (@project_settings_list) + { + my $match_re = $project->{match_re}; + my $match = 0; + foreach my $path (@dirschanged, @adds, @dels, @mods) + { + if ($path =~ $match_re) + { + $match = 1; + last; + } + } + + next unless $match; + + my @email_addresses = @{$project->{email_addresses}}; + my $userlist = join(' ', @email_addresses); + my $to = join(', ', @email_addresses); + my $from_address = $project->{from_address}; + my $hostname = $project->{hostname}; + my $log_file = $project->{log_file}; + my $reply_to = $project->{reply_to}; + my $smtp_server = $project->{smtp_server}; + my $subject_prefix = $project->{subject_prefix}; + my $subject; + + if ($commondir ne '') + { + $subject = "r$rev - in $commondir: $dirlist"; + } + else + { + $subject = "r$rev - $dirlist"; + } + if ($subject_prefix =~ /\w/) + { + $subject = "$subject_prefix $subject"; + } + my $mail_from = $author; + + if ($from_address =~ /\w/) + { + $mail_from = $from_address; + } + elsif ($hostname =~ /\w/) + { + $mail_from = "$mail_from\@$hostname"; + } + + my @head; + push(@head, "To: $to\n"); + push(@head, "From: $mail_from\n"); + push(@head, "Subject: $subject\n"); + push(@head, "Reply-to: $reply_to\n") if $reply_to; + + ### Below, we set the content-type etc, but see these comments + ### from Greg Stein on why this is not a full solution. + # + # From: Greg Stein <gstein(a)lyra.org> + # Subject: Re: svn commit: rev 2599 - trunk/tools/cgi + # To: dev(a)subversion.tigris.org + # Date: Fri, 19 Jul 2002 23:42:32 -0700 + # + # Well... that isn't strictly true. The contents of the files + # might not be UTF-8, so the "diff" portion will be hosed. + # + # If you want a truly "proper" commit message, then you'd use + # multipart MIME messages, with each file going into its own part, + # and labeled with an appropriate MIME type and charset. Of + # course, we haven't defined a charset property yet, but no biggy. + # + # Going with multipart will surely throw out the notion of "cut + # out the patch from the email and apply." But then again: the + # commit emailer could see that all portions are in the same + # charset and skip the multipart thang. + # + # etc etc + # + # Basically: adding/tweaking the content-type is nice, but don't + # think that is the proper solution. + push(@head, "Content-Type: text/plain; charset=UTF-8\n"); + push(@head, "Content-Transfer-Encoding: 8bit\n"); + + push(@head, "\n"); + + my $smtp; + $smtp = Net::SMTP->new($project->{smtp_server}, Timeout => 10); + $smtp->mail($mail_from); + $smtp->to(@email_addresses); + $smtp->data(); + foreach (@head, @body) { + $smtp->datasend($_); + } + $smtp->dataend(); + $smtp->quit; + + # Dump the output to logfile (if its name is not empty). + if ($log_file =~ /\w/) + { + if (open(LOGFILE, ">> $log_file")) + { + print LOGFILE @head, @body; + close LOGFILE + or warn "$0: error in closing `$log_file' for appending: $!\n"; + } + else + { + warn "$0: cannot open `$log_file' for appending: $!\n"; + } + } + } + +exit 0; + +sub usage +{ + warn "@_\n" if @_; + die "usage: $0 REPOS REVNUM [[-m regex] [options] [email_addr ...]] ...\n", + "options are\n", + " --from email_address Email address for 'From:' (overrides -h)\n", + " -h hostname Hostname to append to author for 'From:'\n", + " -l logfile Append mail contents to this log file\n", + " -m regex Regular expression to match committed path\n", + " -r email_address Email address for 'Reply-To:'\n", + " -s subject_prefix Subject line prefix\n", + " -smtp hostname Smtp server\n", + "\n", + "This script supports a single repository with multiple projects,\n", + "where each project receives email only for commits that modify that\n", + "project. A project is identified by using the -m command line\n", + "with a regular expression argument. If a commit has a path that\n", + "matches the regular expression, then the entire commit matches.\n", + "Any of the following -h, -l, -r and -s command line options and\n", + "following email addresses are associated with this project. The\n", + "next -m resets the -h, -l, -r and -s command line options and the\n", + "list of email addresses.\n", + "\n", + "To support a single project conveniently, the script initializes\n", + "itself with an implicit -m . rule that matches any modifications\n", + "to the repository. Therefore, to use the script for a single\n", + "project repository, just use the other comand line options and\n", + "a list of email addresses on the command line. If you do not want\n", + "a project that matches the entire repository, then use a -m with a\n", + "regular expression before any other command line options or email\n", + "addresses.\n"; +} + +# Return a new hash data structure for a new empty project that +# matches any modifications to the repository. +sub new_project +{ + return {email_addresses => [], + from_address => '', + hostname => '', + log_file => '', + match_regex => '.', + reply_to => '', + smtp_server => 'localhost', + subject_prefix => ''}; +} + +# Start a child process safely without using /bin/sh. +sub safe_read_from_pipe +{ + unless (@_) + { + croak "$0: safe_read_from_pipe passed no arguments.\n"; + } + + my $pid = open(SAFE_READ, '-|'); + unless (defined $pid) + { + die "$0: cannot fork: $!\n"; + } + unless ($pid) + { + open(STDERR, ">&STDOUT") + or die "$0: cannot dup STDOUT: $!\n"; + exec(@_) + or die "$0: cannot exec `@_': $!\n"; + } + my @output; + while (<SAFE_READ>) + { + s/[\r\n]+$//; + push(@output, $_); + } + close(SAFE_READ); + my $result = $?; + my $exit = $result >> 8; + my $signal = $result & 127; + my $cd = $result & 128 ? "with core dump" : ""; + if ($signal or $cd) + { + warn "$0: pipe from `@_' failed $cd: exit=$exit signal=$signal\n"; + } + if (wantarray) + { + return ($result, @output); + } + else + { + return $result; + } +} + +# Use safe_read_from_pipe to start a child process safely and return +# the output if it succeeded or an error message followed by the output +# if it failed. +sub read_from_process +{ + unless (@_) + { + croak "$0: read_from_process passed no arguments.\n"; + } + my ($status, @output) = &safe_read_from_pipe(@_); + if ($status) + { + return ("$0: `@_' failed with this output:", @output); + } + else + { + return @output; + } +} Property changes on: scripts/redmine-tools/commit-email.pl_backup ___________________________________________________________________ Added: svn:executable + * Added: scripts/redmine-tools/display-projects.sh =================================================================== --- scripts/redmine-tools/display-projects.sh (rev 0) +++ scripts/redmine-tools/display-projects.sh 2014-01-19 10:22:50 UTC (rev 14) @@ -0,0 +1,13 @@ +#!/bin/sh + +# chorem or nuiton +hostname=$1 +if [ -n "$(echo $hostname |grep nuiton)" ];then + hostname=nuiton.org +elif [ -n "$(echo $hostname |grep chorem)" ];then + hostname=chorem.org +else + hostname=forge.codelutin.com +fi + +( cd /var/lib/svn/svn-$hostname/ ; ls | cut -f2- -d'/' | grep -v "maven-eugene-plugin" | grep -v "maven-i18n-plugin" | grep -v "maven-process-plugin" | grep -v "nuiton-i18n-api" ) Property changes on: scripts/redmine-tools/display-projects.sh ___________________________________________________________________ Added: svn:executable + * Added: scripts/redmine-tools/isis-count-mail.sh =================================================================== --- scripts/redmine-tools/isis-count-mail.sh (rev 0) +++ scripts/redmine-tools/isis-count-mail.sh 2014-01-19 10:22:50 UTC (rev 14) @@ -0,0 +1,31 @@ +#!/bin/sh +# +# Permet de compter le nombre mail envoyer sur les listes isis +# le format de sortie est fait en syntaxe moinmoin +# + +lists="users devel bugreport commits data-commits" +lastYear=$(date +%Y) + +echo "== Statistiques des listes de diffusion ==" + +for l in $lists; do + echo "===== liste $l nombre de mail =====" + year=2002 + total=0 + while [ $year -lt $lastYear ]; do + year=$(($year+1)) + count=$(ls /var/lib/mailman/archives/private/isis-fish-$l/$year-*/[0-9]* 2> /dev/null |wc -l) + total=$(($total+$count)) + totalAn[$year]=$((${totalAn[$year]}+$count)) + echo " * $year: $count" + done + echo "Total pour la liste $l: $total" +done + +echo "===== total par annee =====" +year=2002 +while [ $year -lt $lastYear ]; do + year=$(($year+1)) + echo " * $year: ${totalAn[$year]}" +done Property changes on: scripts/redmine-tools/isis-count-mail.sh ___________________________________________________________________ Added: svn:executable + * Added: scripts/redmine-tools/list-default-option.cfg =================================================================== --- scripts/redmine-tools/list-default-option.cfg (rev 0) +++ scripts/redmine-tools/list-default-option.cfg 2014-01-19 10:22:50 UTC (rev 14) @@ -0,0 +1,65 @@ +# +# this config must be used with: +# config_list -i list-default-option.cfg <list_name> +# +# actually: +# 20111026 chemit(a)codelutin.com +# - add '^.*(a)users.forge.codelutin.com' and 'noreply(a)forge.codelutin.com' as permanent possible poster +# 20100106 chemit +# - add 'noreply(a)nuiton.org','noreply(a)chorem.org' as permanent possible poster +# 20090827 poussin +# - change max size to 0 +# - reply to list +# - add fr as possible language +# - show 100 subscriber by page +# - add '^.*(a)users.nuiton.org','^.*(a)users.chorem.org' as permanent possible poster +# - reject mail from no member email +# + +# Maximum length in kilobytes (KB) of a message body. Use 0 for no +# limit. +max_message_size = 0 + + +# Some mailing lists have restricted posting privileges, with a parallel +# list devoted to discussions. Examples are `patches' or `checkin' +# lists, where software changes are posted by a revision control system, +# but discussion about the changes occurs on a developers mailing list. +# To support these types of mailing lists, select Explicit address and +# set the Reply-To: address below to point to the parallel list. +# +# legal values are: +# 0 = "Poster" +# 1 = "This list" +# 2 = "Explicit address" +reply_goes_to_list = 1 + +# Maximum number of members to show on one page of the Membership List. +admin_member_chunksize = 100 + +# These are all the natural languages supported by this list. Note that +# the default language must be included. +available_languages = ['en', 'fr'] + +# Postings from any of these non-members will be automatically accepted +# with no further moderation applied. Add member addresses one per +# line; start the line with a ^ character to designate a regular +# 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'] + +# When a post from a non-member is received, the message's sender is +# matched against the list of explicitly <a +# href="?VARHELP=privacy/sender/accept_these_nonmembers" >accepted, +# held, <a href="?VARHELP=privacy/sender/reject_these_nonmembers" +# >rejected (bounced), and <a +# href="?VARHELP=privacy/sender/discard_these_nonmembers" >discarded +# addresses. If no match is found, then this action is taken. +# +# legal values are: +# 0 = "Accept" +# 1 = "Hold" +# 2 = "Reject" +# 3 = "Discard" +generic_nonmember_action = 2 Added: scripts/redmine-tools/list-indexing.sh =================================================================== --- scripts/redmine-tools/list-indexing.sh (rev 0) +++ scripts/redmine-tools/list-indexing.sh 2014-01-19 10:22:50 UTC (rev 14) @@ -0,0 +1,74 @@ +#!/bin/bash +# poussin 20121023 il faut utiliser bash et non pas sh car on utilise des choses specifiques (ex: ${f:0:1}) + +mkdir -p /etc/mailman/swish +mkdir -p /usr/lib/cgi-bin/swish + +for f in /var/lib/mailman/archives/private/*.mbox; do + +# recuperation du nom de la list +f=$(basename $f .mbox) + +# mailman met la 1er lettre en majuscule meme si elle ne l'est pas +upperf=$(echo "${f:0:1}" | tr a-z A-Z)${f:1} + +# definition de l'url d'acces aux archives +if [ -L /var/lib/mailman/archives/public/$f ]; then + WEB_PATH="/pipermail" +else + WEB_PATH="/cgi-bin/mailman/private" +fi + +# on a besoin du upperf car on utilise le nom de la liste dans le script +ln -sf /opt/redmine-tools/swish.cgi /usr/lib/cgi-bin/swish/$upperf.cgi + +cat << EOF > /etc/mailman/swish/$upperf.cgi.cfg +return { + title => 'Search $upperf mailing lists', + swish_binary => '/usr/bin/swish-e', + swish_index => '/var/lib/mailman/swish/$f.index', + +# I wanted to hide some fields I didn't use - compare it with the values in swish.cgi. +# Default values are commented out. + +# secondary_sort => [qw/swishlastmodified desc/], + secondary_sort => [qw/swishtitle/], +# sorts => [qw/swishrank swishlastmodified swishtitle swishdocpath/], + sorts => [qw/swishrank swishtitle swishdocsize/], +# metanames => [qw/ swishdefault swishtitle swishdocpath /], + metanames => [qw/ swishdefault swishtitle /], +# display_props => [qw/swishlastmodified swishdocsize swishdocpath/], + display_props => [qw/swishdocsize/], +} +EOF + +cat << EOF > /etc/mailman/swish/$f.cfg +# Index file +IndexFile /var/lib/mailman/swish/$f.index + +# Where are your Mailman archives? +IndexDir /var/lib/mailman/archives/private/$f + +# We want to index .html files only +IndexOnly .html + +# Don't index author.html, date.html etc. +FileRules filename is (author\.html|date\.html|index\.html|subject\.html|thread.\html) + +# Replace local path with the www path +ReplaceRules replace "/var/lib/mailman/archives/private/$f" "$WEB_PATH/$f/" + +# Store description in search results +IndexContents HTML .html + +StoreDescription HTML <pre> 200000 + +# Look at the title, too +MetaNames swishtitle + +FollowSymLinks yes +EOF + +swish-e -c /etc/mailman/swish/$f.cfg &> /dev/null + +done Property changes on: scripts/redmine-tools/list-indexing.sh ___________________________________________________________________ Added: svn:executable + * Added: scripts/redmine-tools/list-indexing.sh.old =================================================================== --- scripts/redmine-tools/list-indexing.sh.old (rev 0) +++ scripts/redmine-tools/list-indexing.sh.old 2014-01-19 10:22:50 UTC (rev 14) @@ -0,0 +1,62 @@ +#!/bin/sh + +mkdir -p /etc/mailman/swish +mkdir -p /usr/lib/cgi-bin/swish + +for f in /var/lib/mailman/archives/public/*; do + +f=${f#/var/lib/mailman/archives/public/} +f=$(echo "${f:0:1}" | tr a-z A-Z)${f:1} + +ln -sf /opt/redmine-tools/swish.cgi /usr/lib/cgi-bin/swish/$f.cgi + +cat << EOF > /etc/mailman/swish/$f.cgi.cfg +return { + title => 'Search $f mailing lists', + swish_binary => '/usr/bin/swish-e', + swish_index => '/var/lib/mailman/swish/$f.index', + +# I wanted to hide some fields I didn't use - compare it with the values in swish.cgi. +# Default values are commented out. + +# secondary_sort => [qw/swishlastmodified desc/], + secondary_sort => [qw/swishtitle/], +# sorts => [qw/swishrank swishlastmodified swishtitle swishdocpath/], + sorts => [qw/swishrank swishtitle swishdocsize/], +# metanames => [qw/ swishdefault swishtitle swishdocpath /], + metanames => [qw/ swishdefault swishtitle /], +# display_props => [qw/swishlastmodified swishdocsize swishdocpath/], + display_props => [qw/swishdocsize/], +} +EOF + +cat << EOF > /etc/mailman/swish/$f.cfg +# Index file +IndexFile /var/lib/mailman/swish/$f.index + +# Where are your Mailman archives? +IndexDir /var/lib/mailman/archives/public/$f + +# We want to index .html files only +IndexOnly .html + +# Don't index author.html, date.html etc. +FileRules filename is (author\.html|date\.html|index\.html|subject\.html|thread.\html) + +# Replace local path with the www path +ReplaceRules replace "/var/lib/mailman/archives/public/$f" "/pipermail/$f/" + +# Store description in search results +IndexContents HTML .html + +StoreDescription HTML <pre> 200000 + +# Look at the title, too +MetaNames swishtitle + +FollowSymLinks yes +EOF + +swish-e -c /etc/mailman/swish/$f.cfg &> /dev/null + +done Property changes on: scripts/redmine-tools/list-indexing.sh.old ___________________________________________________________________ Added: svn:executable + * Added: scripts/redmine-tools/mailman-user2realm.py =================================================================== --- scripts/redmine-tools/mailman-user2realm.py (rev 0) +++ scripts/redmine-tools/mailman-user2realm.py 2014-01-19 10:22:50 UTC (rev 14) @@ -0,0 +1,38 @@ +#!/usr/bin/python +''' +Export the username / password db from a given mailman list +into Apache's 'AuthFile' format +''' + +import pickle +import subprocess +import optparse + +parser = optparse.OptionParser(description='Create apache password file from mailing list members') +parser.add_option('-d', '--lists_directory', default='/var/lib/mailman/lists', help='path to dir containing all lists') +parser.add_option('-l', '--list_name', help='the list whose membership will be synced') +parser.add_option('-o', '--output', default='/etc/apache-passwd', help='path to export file, in Apache AuthUserFile format') +(args, others) = parser.parse_args() + +# path to target lists's config pickle +mm_target_config = args.lists_directory + "/" + args.list_name + "/config.pck" + +# open the target list's config pickle +f = open(mm_target_config,"r") + +# read the pickle into a dict +p = pickle.load(f) +f.close() + +# extract usernames / passwords from the dict +creds = p["passwords"] + +# on force la recreation du fichier sur le 1er +first=1 +# iterate all of the username / password pairs +for u,p in creds.iteritems(): + if first: + subprocess.Popen(["/usr/bin/htpasswd", "-b", "-c", args.output, u, p]) + first=0 + else: + subprocess.Popen(["/usr/bin/htpasswd", "-b", args.output, u, p]) Property changes on: scripts/redmine-tools/mailman-user2realm.py ___________________________________________________________________ Added: svn:executable + * Added: scripts/redmine-tools/nightly-clean.sh =================================================================== --- scripts/redmine-tools/nightly-clean.sh (rev 0) +++ scripts/redmine-tools/nightly-clean.sh 2014-01-19 10:22:50 UTC (rev 14) @@ -0,0 +1,33 @@ +#! /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 + # try on a subdir + 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 + done +done Property changes on: scripts/redmine-tools/nightly-clean.sh ___________________________________________________________________ Added: svn:executable + * Added: scripts/redmine-tools/nightly-site-deploy.sh =================================================================== --- scripts/redmine-tools/nightly-site-deploy.sh (rev 0) +++ scripts/redmine-tools/nightly-site-deploy.sh 2014-01-19 10:22:50 UTC (rev 14) @@ -0,0 +1,18 @@ +#! /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 Property changes on: scripts/redmine-tools/nightly-site-deploy.sh ___________________________________________________________________ Added: svn:executable + * Added: scripts/redmine-tools/project-list.rb =================================================================== --- scripts/redmine-tools/project-list.rb (rev 0) +++ scripts/redmine-tools/project-list.rb 2014-01-19 10:22:50 UTC (rev 14) @@ -0,0 +1,195 @@ +#!/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-list: manages your project list creation with Redmine +# +# == Usage +# +# project-list [OPTIONS...] -r [HOST] +# +# Examples: +# project-list --redmine-host=redmine.example.net -s commits -a admin(a)redmine.example.net -d list.redmine.example.net +# +# == Arguments (mandatory) +# +# -s, --list-suffix=suffix use to create list name with projet identifier +# -d, --list-domain=domain domain for list +# -a, --admin-email=email email of admin list +# -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 +# +# -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-list.rb #{ARGV}\n" + +require 'getoptlong' +require 'rdoc/usage' +require 'find' +require 'etc' + +Version = "1.0" + +opts = GetoptLong.new( + ['--list-suffix', '-s', GetoptLong::REQUIRED_ARGUMENT], + ['--admin-email', '-a', GetoptLong::REQUIRED_ARGUMENT], + ['--list-domain', '-d', GetoptLong::REQUIRED_ARGUMENT], + ['--redmine-host', '-r', 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 +$redmine_host = '' +$listsuffix = '' +$adminEmail = '' +$listDomain = '' + +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 '--list-suffix'; $listsuffix = arg.dup + when '--admin-email'; $adminEmail = arg.dup; + when '--list-domain'; $listDomain = arg.dup + when '--redmine-host'; $redmine_host = 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 ($redmine_host.empty? or $listsuffix.empty? or $adminEmail.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 = "#{$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 mkpasswd(len) + Array.new(len/2) { rand(256) }.pack('C*').unpack('H*').first +end + +def list_not_exists(listDomain, listname) + # used redirect to /dev/null, because -q grep option return 'close failed: [Errno 32] Broken pipe' +# cmd = "list_lists -V #{listDomain} | grep -i #{listname} &> /dev/null" + # tchemit 12011-10-29 On est sur le meme domaine pour toutes nos forges. + cmd = "list_lists | grep -i #{listname}" + system(cmd) && $? && $?.exitstatus == 0 ? false : true +end + +def list_create(listDomain, listname, adminMail, password) + log("will create list #{listDomain} - #{listname}") + cmd = "newlist -q --urlhost=#{listDomain} --emailhost=#{listDomain} #{listname} #{adminMail} #{password}" + cmdcfg = "config_list -i /opt/redmine-tools/list-default-option.cfg #{listname}" + cmdmail = "echo 'list : #{listname}@#{listDomain}\nadmin mail : #{adminMail}\npassword : #{password}\ninformation : http://#{listDomain}/cgi-bin/mailman/listinfo/#{listname}\nadministration : http://#{listDomain}/cgi-bin/mailman/admin/#{listname}' | mail -s 'New mailing list #{listname}@#{listDomain}' #{adminMail}" + + # create list + result = system(cmd) && $? && $?.exitstatus == 0 ? true : false + # update some config list value + system(cmdcfg) + if result + system(cmdmail) + log("list #{listname} created and admin email notified", :level => 1) + else + log("list creation failed #{listname}@#{listDomain}", :level => 1) + end + result +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 + + listname = "#{project.identifier}-#{$listsuffix}" + + # tchemit 2011-10-29 use custom-values skipListCreation +# project.custom_values.each do |custom_value| +# if !custom_value.value.empty? && custom_value.custom_field.name == "skipListsCreation" +# log("list #{listname} not require to be created", :level => 1) +# next; +# end +# end + + adminMail = $adminEmail.gsub(/@/, "+#{listname}@") + + # check list existance + if list_not_exists($listDomain, listname) + list_create($listDomain, listname, adminMail, mkpasswd(16)) + end + +end + Property changes on: scripts/redmine-tools/project-list.rb ___________________________________________________________________ Added: svn:executable + * Added: scripts/redmine-tools/project-site.rb =================================================================== --- scripts/redmine-tools/project-site.rb (rev 0) +++ scripts/redmine-tools/project-site.rb 2014-01-19 10:22:50 UTC (rev 14) @@ -0,0 +1,205 @@ +#!/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" + +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 + Property changes on: scripts/redmine-tools/project-site.rb ___________________________________________________________________ Added: svn:executable + * Added: scripts/redmine-tools/redmine-post-commit.sh =================================================================== --- scripts/redmine-tools/redmine-post-commit.sh (rev 0) +++ scripts/redmine-tools/redmine-post-commit.sh 2014-01-19 10:22:50 UTC (rev 14) @@ -0,0 +1,19 @@ +# +# Script lancé à chaque commit +# + +REPOS="$1" +REV="$2" +PROJECT_NAME="$3" +DOMAIN="$4" +SVN_API_KEY="$5" + +# send post-commit email +/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 & + +# touch project for nightly build +touch /var/cache/redmine/nightly-build/$DOMAIN/$PROJECT_NAME.site +touch /var/cache/redmine/nightly-build/$DOMAIN/$PROJECT_NAME.deploy-demo && chmod o+w /var/cache/redmine/nightly-build/$DOMAIN/$PROJECT_NAME.deploy-demo Property changes on: scripts/redmine-tools/redmine-post-commit.sh ___________________________________________________________________ Added: svn:executable + * Added: scripts/redmine-tools/reposman-0.8.rb =================================================================== --- scripts/redmine-tools/reposman-0.8.rb (rev 0) +++ scripts/redmine-tools/reposman-0.8.rb 2014-01-19 10:22:50 UTC (rev 14) @@ -0,0 +1,302 @@ +#!/usr/bin/env ruby + +# +# - 20090519 bpoussin: ajout d'une option pour pouvoir fixer le group en plus du owner +# +# == Synopsis +# +# reposman: manages your repositories with Redmine +# +# == Usage +# +# reposman [OPTIONS...] -s [DIR] -r [HOST] +# +# Examples: +# reposman --svn-dir=/var/svn --redmine-host=redmine.example.net --scm subversion +# reposman -s /var/git -r redmine.example.net -u http://svn.example.net --scm git +# +# == Arguments (mandatory) +# +# -s, --svn-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 +# +# == 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. +# -g, --group=GROUP group of the repository. +# --scm=SCM the kind of SCM repository you want to create (and register) in +# Redmine (default: Subversion). reposman is able to create Git +# and Subversion repositories. For all other kind (Bazaar, +# Darcs, Filesystem, Mercurial) you must specify a --command option +# -u, --url=URL the base url Redmine will use to access your +# repositories. This option is used to automatically +# register the repositories in Redmine. The project +# identifier will be appended to this url. Examples: +# -u https://example.net/svn +# -u file:///var/svn/ +# if this option isn't set, reposman won't register +# the repositories in Redmine +# -c, --command=COMMAND use this command instead of "svnadmin create" to +# create a repository. This option can be used to +# create repositories other than subversion and git kind. +# This command override the default creation for git and subversion. +# -f, --force force repository creation even if the project +# repository is already declared in Redmine +# -t, --test only show what should be done +# -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/reposman.rb #{ARGV}\n" + + +require 'getoptlong' +require 'rdoc/usage' +require 'soap/wsdlDriver' +require 'find' +require 'etc' + +Version = "1.1" +SUPPORTED_SCM = %w( Subversion Darcs Mercurial Bazaar Git Filesystem ) + +opts = GetoptLong.new( + ['--svn-dir', '-s', GetoptLong::REQUIRED_ARGUMENT], + ['--redmine-host', '-r', GetoptLong::REQUIRED_ARGUMENT], + ['--owner', '-o', GetoptLong::REQUIRED_ARGUMENT], + ['--group', '-g', GetoptLong::REQUIRED_ARGUMENT], + ['--url', '-u', GetoptLong::REQUIRED_ARGUMENT], + ['--command' , '-c', GetoptLong::REQUIRED_ARGUMENT], + ['--scm', GetoptLong::REQUIRED_ARGUMENT], + ['--test', '-t', GetoptLong::NO_ARGUMENT], + ['--force', '-f', GetoptLong::NO_ARGUMENT], + ['--verbose', '-v', GetoptLong::NO_ARGUMENT], + ['--version', '-V', GetoptLong::NO_ARGUMENT], + ['--help' , '-h', GetoptLong::NO_ARGUMENT], + ['--quiet' , '-q', GetoptLong::NO_ARGUMENT] + ) + +$verbose = 1 +$quiet = false +$redmine_host = '' +$repos_base = '' +$svn_owner = 'root' +$svn_group = 'root' +$use_groupid = true +$svn_url = false +$test = false +$force = false +$scm = 'Subversion' + +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 + +module SCM + + module Subversion + def self.create(path) + system_or_raise "svnadmin create #{path}" + end + end + + module Git + def self.create(path) + Dir.mkdir path + Dir.chdir(path) do + system_or_raise "git --bare init --shared" + system_or_raise "git update-server-info" + end + end + end + +end + +begin + opts.each do |opt, arg| + case opt + when '--svn-dir'; $repos_base = arg.dup + when '--redmine-host'; $redmine_host = arg.dup + when '--owner'; $svn_owner = arg.dup; $use_groupid = false; + when '--group'; $svn_group = arg.dup; $use_groupid = false; + when '--url'; $svn_url = arg.dup + when '--scm'; $scm = arg.dup.capitalize; log("Invalid SCM: #{$scm}", :exit => true) unless SUPPORTED_SCM.include?($scm) + when '--command'; $command = arg.dup + when '--verbose'; $verbose += 1 + when '--test'; $test = true + when '--force'; $force = true + when '--version'; puts Version; exit + when '--help'; RDoc::usage + when '--quiet'; $quiet = true + end + end +rescue + exit 1 +end + +if $test + log("running in test mode") +end + +# Make sure command is overridden if SCM vendor is not handled internally (for the moment Subversion and Git) +if $command.nil? + begin + scm_module = SCM.const_get($scm) + rescue + log("Please use --command option to specify how to create a #{$scm} repository.", :exit => true) + end +end + +$svn_url += "/" if $svn_url and not $svn_url.match(/\/$/) + +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 + +log("querying Redmine for projects...", :level => 1); + +$redmine_host.gsub!(/^/, "http://") unless $redmine_host.match("^https?://") +$redmine_host.gsub!(/\/$/, '') + +wsdl_url = "#{$redmine_host}/sys/service.wsdl"; + +begin + soap = SOAP::WSDLDriverFactory.new(wsdl_url).create_rpc_driver +rescue => e + log("Unable to connect to #{wsdl_url} : #{e}", :exit => true) +end + +projects = soap.ProjectsWithRepositoryEnabled + +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 : Etc.getgrnam($svn_group).gid) + 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 + + if $test + log("\tchange mode on #{repos_path}") + next + end + + 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 reposman + if $force == false and not project.repository.nil? + log("\trepository for project #{project.identifier} already exists in Redmine", :level => 1) + next + end + + project.is_public ? File.umask(0002) : File.umask(0007) + + if $test + log("\tcreate repository #{repos_path}") + log("\trepository #{repos_path} registered in Redmine with url #{$svn_url}#{project.identifier}") if $svn_url; + next + end + + begin + set_owner_and_rights(project, repos_path) do + if scm_module.nil? + system_or_raise "#{$command} #{repos_path}" + else + scm_module.create(repos_path) + end + end + rescue => e + log("\tunable to create #{repos_path} : #{e}\n") + next + end + + if $svn_url + ret = soap.RepositoryCreated project.identifier, $scm, "#{$svn_url}#{project.identifier}" + if ret > 0 + log("\trepository #{repos_path} registered in Redmine with url #{$svn_url}#{project.identifier}"); + else + log("\trepository #{repos_path} not registered in Redmine. Look in your log to find why."); + end + end + + log("\trepository #{repos_path} created"); + end + +end + +projects.each do |project| + log("add hook for post-commit on #{$redmine_host} #{project.identifier}", :level => 1) + system("/opt/redmine-tools/check-post-commit.sh #{$redmine_host} #{project.identifier}") +end Property changes on: scripts/redmine-tools/reposman-0.8.rb ___________________________________________________________________ Added: svn:executable + * Added: scripts/redmine-tools/reposman.rb =================================================================== --- scripts/redmine-tools/reposman.rb (rev 0) +++ scripts/redmine-tools/reposman.rb 2014-01-19 10:22:50 UTC (rev 14) @@ -0,0 +1,316 @@ +#!/usr/bin/env ruby + +# == Synopsis +# +# reposman: manages your repositories with Redmine +# +# == Usage +# +# reposman [OPTIONS...] -s [DIR] -r [HOST] +# +# Examples: +# reposman --svn-dir=/var/svn --redmine-host=redmine.example.net --scm subversion +# reposman -s /var/git -r redmine.example.net -u http://svn.example.net --scm git +# +# == Arguments (mandatory) +# +# -s, --svn-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. +# -g, --group=GROUP group of the repository. (default: root) +# --scm=SCM the kind of SCM repository you want to create (and +# register) in Redmine (default: Subversion). +# reposman is able to create Git and Subversion +# repositories. For all other kind, you must specify +# a --command option +# -u, --url=URL the base url Redmine will use to access your +# repositories. This option is used to automatically +# register the repositories in Redmine. The project +# identifier will be appended to this url. Examples: +# -u https://example.net/svn +# -u file:///var/svn/ +# if this option isn't set, reposman won't register +# the repositories in Redmine +# -c, --command=COMMAND use this command instead of "svnadmin create" to +# create a repository. This option can be used to +# create repositories other than subversion and git +# kind. +# This command override the default creation for git +# and subversion. +# -f, --force force repository creation even if the project +# repository is already declared in Redmine +# -t, --test only show what should be done +# -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 + + +require 'getoptlong' +require 'rdoc/usage' +require 'find' +require 'etc' + +Version = "1.3" +SUPPORTED_SCM = %w( Subversion Darcs Mercurial Bazaar Git Filesystem ) + +opts = GetoptLong.new( + ['--svn-dir', '-s', GetoptLong::REQUIRED_ARGUMENT], + ['--redmine-host', '-r', GetoptLong::REQUIRED_ARGUMENT], + ['--key', '-k', GetoptLong::REQUIRED_ARGUMENT], + ['--owner', '-o', GetoptLong::REQUIRED_ARGUMENT], + ['--group', '-g', GetoptLong::REQUIRED_ARGUMENT], + ['--url', '-u', GetoptLong::REQUIRED_ARGUMENT], + ['--command' , '-c', GetoptLong::REQUIRED_ARGUMENT], + ['--scm', GetoptLong::REQUIRED_ARGUMENT], + ['--test', '-t', GetoptLong::NO_ARGUMENT], + ['--force', '-f', GetoptLong::NO_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 = 'root' +$svn_group = 'root' +$use_groupid = true +$svn_url = false +$test = false +$force = false +$scm = 'Subversion' + +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 + +module SCM + + module Subversion + def self.create(path) + system_or_raise "svnadmin create #{path}" + end + end + + module Git + def self.create(path) + Dir.mkdir path + Dir.chdir(path) do + system_or_raise "git --bare init --shared" + system_or_raise "git update-server-info" + end + end + end + +end + +begin + opts.each do |opt, arg| + case opt + when '--svn-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 '--group'; $svn_group = arg.dup; $use_groupid = false; + when '--url'; $svn_url = arg.dup + when '--scm'; $scm = arg.dup.capitalize; log("Invalid SCM: #{$scm}", :exit => true) unless SUPPORTED_SCM.include?($scm) + when '--command'; $command = arg.dup + when '--verbose'; $verbose += 1 + when '--test'; $test = true + when '--force'; $force = true + when '--version'; puts Version; exit + when '--help'; RDoc::usage + when '--quiet'; $quiet = true + end + end +rescue + exit 1 +end + +if $test + log("running in test mode") +end + +# Make sure command is overridden if SCM vendor is not handled internally (for the moment Subversion and Git) +if $command.nil? + begin + scm_module = SCM.const_get($scm) + rescue + log("Please use --command option to specify how to create a #{$scm} repository.", :exit => true) + end +end + +$svn_url += "/" if $svn_url and not $svn_url.match(/\/$/) + +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 mswin? + yield if block_given? + else + uid, gid = Etc.getpwnam($svn_owner).uid, ($use_groupid ? Etc.getgrnam(project.identifier).gid : Etc.getgrnam($svn_group).gid) + 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) + mswin? ? + $svn_owner : + Etc.getpwuid( File.stat(file).uid ).name +end + +def mswin? + (RUBY_PLATFORM =~ /(:?mswin|mingw)/) || (RUBY_PLATFORM == 'java' && (ENV['OS'] || ENV['os']) =~ /windows/i) +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 + + if $test + log("\tchange mode on #{repos_path}") + next + end + + 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 reposman + if $force == false and project.respond_to?(:repository) + log("\trepository for project #{project.identifier} already exists in Redmine", :level => 1) + next + end + + project.is_public ? File.umask(0002) : File.umask(0007) + + if $test + log("\tcreate repository #{repos_path}") + log("\trepository #{repos_path} registered in Redmine with url #{$svn_url}#{project.identifier}") if $svn_url; + next + end + + begin + set_owner_and_rights(project, repos_path) do + if scm_module.nil? + system_or_raise "#{$command} #{repos_path}" + else + scm_module.create(repos_path) + end + end + rescue => e + log("\tunable to create #{repos_path} : #{e}\n") + next + end + + if $svn_url + begin + project.post(:repository, :vendor => $scm, :repository => {:url => "#{$svn_url}#{project.identifier}"}, :key => $api_key) + log("\trepository #{repos_path} registered in Redmine with url #{$svn_url}#{project.identifier}"); + rescue => e + log("\trepository #{repos_path} not registered in Redmine: #{e.message}"); + end + end + + log("\trepository #{repos_path} created"); + end + +end + +projects.each do |project| + log("add hook for post-commit on #{$redmine_host} #{project.identifier}", :level => 1) + system("/opt/redmine-tools/check-post-commit.sh #{$redmine_host} #{project.identifier}") +end Property changes on: scripts/redmine-tools/reposman.rb ___________________________________________________________________ Added: svn:executable + * Added: scripts/redmine-tools/retrive-archive.sh =================================================================== --- scripts/redmine-tools/retrive-archive.sh (rev 0) +++ scripts/redmine-tools/retrive-archive.sh 2014-01-19 10:22:50 UTC (rev 14) @@ -0,0 +1,64 @@ +#!/bin/sh + +lists=$(cat << EOF +lutinbuilder-commits:mavenpom-commits +lutinbuilder-devel:mavenpom-devel +lutinbuilder-user:mavenpom-users +lutinutil-commits,lutinutil-cvscommit:nuiton-utils-commits +lutinutil-devel:nuiton-utils-devel +lutinutil-user:nuiton-utils-users +topia-commits,topia-cvscommit:topia-commits +topia-devel:topia-devel +topia-user:topia-users +lutinprocessor-commits,lutinprocessor-cvscommit:processor-commits +lutinprocessor-devel:processor-devel +lutinprocessor-user:processor-users +lutinwidget-commits,lutinwidget-cvscommit:nuiton-widget-commits +lutinwidget-devel:nuiton-widget-devel +lutinwidget-user:nuiton-widget-users +buix-commits,buix-cvscommit:buix-commits +buix-devel:buix-devel +buix-user:buix-users +buix-commits,buix-cvscommit:jaxx-commits +buix-devel:jaxx-devel +buix-user:jaxx-users +buix-guix-devel:guix-devel +lutingenerator-commits,lutingenerator-cvscommit:eugene-commits +lutingenerator-devel:eugene-devel +lutingenerator-user:eugene-users +jrst-commits,jrst-cvscommit:jrst-commits +jrst-devel:jrst:devel +jrst-user:jrst-users +lutinmatrix-commits,lutinmatrix-cvscommit:nuiton-matrix-commits +lutinmatrix-devel:nuiton-matrix-devel +lutinmatrix-user:nuiton-matrix-users +lutinj2r-commits:nuiton-j2r-commits +lutinj2r-devel:nuiton-j2r-devel +lutinj2r-user:nuiton-j2r-users +lutinweb-commits:nuiton-rss-commits +lutinweb-devel:nuiton-rss-devel +lutinweb-user:nuiton-rss-users +EOF +) + +for l in $lists; do + oldlists=$(echo $l |cut -f1 -d: | tr ',' ' ') + newlist=$(echo $l |cut -f2 -d:) + + if [ -d "/var/lib/mailman/archives/private/$newlist.mbox" ]; then + echo "retrive $newlist" + cd "/var/lib/mailman/archives/private/$newlist.mbox" + wget "http://lutinbuilder.labs.libre-entreprise.org/archive-list/$newlist.mbox.gz" + gunzip "$newlist.mbox.gz" + # recreation des pages html des archives + /usr/lib/mailman/bin/arch -q "$newlist" + # recuperation des membres + wget "http://lutinbuilder.labs.libre-entreprise.org/archive-list/$newlist.member.…" + wget "http://lutinbuilder.labs.libre-entreprise.org/archive-list/$newlist.member.…" + add_members --admin-notify=n --welcome-msg=y --regular-members-file=$newlist.member.regular $newlist + add_members --admin-notify=n --welcome-msg=y --digest-members-file=$newlist.member.digest $newlist + rm -f $newlist.member.digest $newlist.member.regular + # changement du mot de passe des lists + /usr/lib/mailman/bin/change_pw --quiet --password=";;lutin.." --listname="$newlist" + fi +done Property changes on: scripts/redmine-tools/retrive-archive.sh ___________________________________________________________________ Added: svn:executable + * Added: scripts/redmine-tools/retrive-isis-archive.sh =================================================================== --- scripts/redmine-tools/retrive-isis-archive.sh (rev 0) +++ scripts/redmine-tools/retrive-isis-archive.sh 2014-01-19 10:22:50 UTC (rev 14) @@ -0,0 +1,32 @@ +#!/bin/sh + + +lists=$(cat << EOF +isis-fish-commits:isis-fish-commits +isis-fish-devel:isis-fish-devel +isis-fish-user:isis-fish-users +isis-fish-bugreport:isis-fish-bugreport +EOF +) + +for l in $lists; do + oldlists=$(echo $l |cut -f1 -d: | tr ',' ' ') + newlist=$(echo $l |cut -f2 -d:) + + if [ -d "/var/lib/mailman/archives/private/$newlist.mbox" ]; then + echo "retrive $newlist" + cd "/var/lib/mailman/archives/private/$newlist.mbox" + wget "http://lutinbuilder.labs.libre-entreprise.org/archive-list/$newlist.mbox.gz" + gunzip "$newlist.mbox.gz" + # recreation des pages html des archives + /usr/lib/mailman/bin/arch -q "$newlist" + # recuperation des membres + wget "http://lutinbuilder.labs.libre-entreprise.org/archive-list/$newlist.member.…" + wget "http://lutinbuilder.labs.libre-entreprise.org/archive-list/$newlist.member.…" + add_members --admin-notify=n --welcome-msg=y --regular-members-file=$newlist.member.regular $newlist + add_members --admin-notify=n --welcome-msg=y --digest-members-file=$newlist.member.digest $newlist + rm -f $newlist.member.digest $newlist.member.regular + # changement du mot de passe des lists + /usr/lib/mailman/bin/change_pw --quiet --password=";;lutin.." --listname="$newlist" + fi +done Property changes on: scripts/redmine-tools/retrive-isis-archive.sh ___________________________________________________________________ Added: svn:executable + * Added: scripts/redmine-tools/sendemail-isis-migration-notification.sh =================================================================== --- scripts/redmine-tools/sendemail-isis-migration-notification.sh (rev 0) +++ scripts/redmine-tools/sendemail-isis-migration-notification.sh 2014-01-19 10:22:50 UTC (rev 14) @@ -0,0 +1,61 @@ +#!/bin/sh + +lists=$(cat << EOF +isis-fish-data-commits:isis-fish-data-commits +isis-fish-commits:isis-fish-commits +isis-fish-devel:isis-fish-devel +isis-fish-user:isis-fish-users +isis-fish-bugreport:isis-fish-bugreport +EOF +) + +sendemail () { + dest=$1 + newlist=$2 + + echo "send to $dest" +( + cat << EOF +Bonjour à tous, + +ISIS-fish a son propre domain isis-fish.org. + +Les listes de diffusions ont été migrées et tous les utilisateurs ont +normalement du être réabonnés aux nouvelles listes. + +La nouvelle adresse de cette liste: $2 + +Nous sommes désolés des désagréments causés et vous remercions de votre +soutien. + +Cordialement, + +L'équipe de développement. + +---------------------------- + +Dear all, + +ISIS-fish has its own domain isis-fish.org. + +The mailing-lists have been migrated and everybody should have been +automatically subscribing the new lists. + +New mail address for this list: $2 + +We are sorry for the inconvenience, and thank you for your support. + +Best regards, + +The development team. +EOF +) | mail -a 'Content-Type: text/plain; charset="UTF-8"' -a 'Content-Transfer-Encoding: 8bit' -s 'Migration du projet / Project migration' $dest +} + +for l in $lists; do + echo $l + oldlists=$(echo $l |cut -f1 -d: | tr ',' ' ') + newlist=$(echo $l |cut -f2 -d:) + + sendemail $newlist(a)list.isis-fish.org $newlist(a)list.isis-fish.org +done Property changes on: scripts/redmine-tools/sendemail-isis-migration-notification.sh ___________________________________________________________________ Added: svn:executable + * Added: scripts/redmine-tools/sendemail-migration-notification.sh =================================================================== --- scripts/redmine-tools/sendemail-migration-notification.sh (rev 0) +++ scripts/redmine-tools/sendemail-migration-notification.sh 2014-01-19 10:22:50 UTC (rev 14) @@ -0,0 +1,109 @@ +#!/bin/sh + +lists=$(cat << EOF +lutinbuilder-commits:mavenpom-commits +lutinbuilder-devel:mavenpom-devel +lutinbuilder-user:mavenpom-users +lutinutil-commits,lutinutil-cvscommit:nuiton-utils-commits +lutinutil-devel:nuiton-utils-devel +lutinutil-user:nuiton-utils-users +topia-commits,topia-cvscommit:topia-commits +topia-devel:topia-devel +topia-user:topia-users +lutinprocessor-commits,lutinprocessor-cvscommits:processor-commits +lutinprocessor-devel:processor-devel +lutinprocessor-user:processor-users +lutinwidget-commits,lutinwidget-cvscommit:nuiton-widget-commits +lutinwidget-devel:nuiton-widget-devel +lutinwidget-user:nuiton-widget-users +buix-commits,buix-cvscommit:buix-commits +buix-devel:buix-devel +buix-user:buix-users +buix-commits,buix-cvscommit:jaxx-commits +buix-devel:jaxx-devel +buix-user:jaxx-users +buix-guix-devel:guix-devel +lutingenerator-commits,lutingenerator-cvscommits:eugene-commits +lutingenerator-devel:eugene-devel +lutingenerator-user:eugene-users +jrst-commits,jrst-cvscommit:jrst-commits +jrst-devel:jrst:devel +jrst-user:jrst-users +lutinmatrix-commits,lutinmatrix-cvscommit:nuiton-matrix-commits +lutinmatrix-devel:nuiton-matrix-devel +lutinmatrix-user:nuiton-matrix-users +lutinj2r-commits:nuiton-j2r-commits +lutinj2r-devel:nuiton-j2r-devel +lutinj2r-user:nuiton-j2r-users +lutinweb-commits:nuiton-rss-commits +lutinweb-devel:nuiton-rss-devel +lutinweb-user:nuiton-rss-users +EOF +) + +sendemail () { + dest=$1 + newlist=$2 + + echo "send to $dest" +( + cat << EOF +Bonjour à tous, + +Dans l'optique de dissocier au maximum les projets libres initiés par +la société Code Lutin de celle-ci et permettre une meilleur implication +de la communauté du libre dans ces derniers, nous vous annonçons que le +site de développement du projet n'est plus hébergé sur le labs +libre-entreprise mais sur la plateforme www.nuiton.org. La plupart de la +migration a été réalisée, nous vous invitons à utiliser d'ors et déjà la +plateforme http://www.nuiton.org (le projet sur le labs libre-entreprise n'est +plus accessible publiquement) + +Les listes de diffusions ont été migrées et tous les utilisateurs ont +normalement du être réabonnés aux nouvelles listes. + +La nouvelle adresse de cette liste: $2 + +Nous sommes désolés des désagréments causés et vous remercions de votre +soutien. + +Cordialement, + +L'équipe de développement. + +---------------------------- + +Dear all, + +In order to separate the libre projects that Code Lutin has initiated +and the company itself, and also to encourage the implication of the +libre community, we recently moved the project's development site from +the libre-entreprise labs to the www.nuiton.org platform. Most of the +migration is complete, we invite you to use, from now on, the platform +http://www.nuiton.org (the project on libre-entreprise labs is now longer +publicly available). + +The mailing-lists have been migrated and everybody should have been +automatically subscribing the new lists. + +New mail address for this list: $2 + +We are sorry for the inconvenience, and thank you for your support. + +Best regards, + +The development team. +EOF +) | mail -a 'Content-Type: text/plain; charset="UTF-8"' -a 'Content-Transfer-Encoding: 8bit' -s 'Migration du projet / Project migration' $dest +} + +for l in $lists; do + echo $l + oldlists=$(echo $l |cut -f1 -d: | tr ',' ' ') + newlist=$(echo $l |cut -f2 -d:) + + sendemail $newlist(a)list.nuiton.org $newlist(a)list.nuiton.org + for oldlist in $oldlists; do + sendemail $oldlist(a)lists.labs.libre-entreprise.org $newlist(a)list.nuiton.org + done +done Property changes on: scripts/redmine-tools/sendemail-migration-notification.sh ___________________________________________________________________ Added: svn:executable + * Added: scripts/redmine-tools/sign-repo.sh =================================================================== --- scripts/redmine-tools/sign-repo.sh (rev 0) +++ scripts/redmine-tools/sign-repo.sh 2014-01-19 10:22:50 UTC (rev 14) @@ -0,0 +1,155 @@ +#! /bin/sh + +# repo source +SOURCE=$1 +shift 1 + +# repo target +TARGET=$1 +shift 1 + +KEYNAME=$1 +shift 1 + +PASSWORD=$1 +shift 1 + +REMOTE_SERVER= + +META_DIRECTORY=$SOURCE/.nuiton + +URL=file:///$TARGET + +ASC_DIR=/tmp/asc + +nbSigns=0 + +signFiles() { + EXTENSION=$1 + shift 1 + + CLASSIFIER=$1 + shift 1 + + PACKAGING="" + if [ $# -ge 1 ]; then + PACKAGING="-Dpackaging=$1" + shift 1 + fi + + FILE="/tmp/sign-repo$EXTENSION.tmp" + +# (cd $SOURCE ; find -name "*$EXTENSION" | grep -e "org/nuiton" > $FILE) + (cd $SOURCE ; find -name "*$EXTENSION" > $FILE) + size=$(cat $FILE | wc -l) + if [ $size -eq 0 ];then + # pas de fichiers de ce type + return 0 + fi + + echo -n "Scan $size '$EXTENSION' files" + + i=0 + while read artifact + do + artifact="${artifact##./}" + if [ -e $SOURCE/$artifact.asc ]; then + continue; + fi + if [ -e $TARGET/$artifact.asc ]; then + continue; + fi + + # recuperation du pom + pom=$(basename $artifact $EXTENSION).pom + file=$(basename $artifact) + dir=$(dirname $artifact) + signFile $dir $file $pom "$CLASSIFIER" "$PACKAGING" "$i" + i=$(($i+1)) + done < $FILE + if [ $i -eq 0 ]; then + echo " - nothing to do." + else + echo "" + echo "$i file(s) signed." + fi + rm -f $FILE + + cleanRepository $TARGET $EXTENSION + cleanRepository $TARGET maven-metadata.xml +} + +signFile() { + dir=$1 + file=$2 + pom=$3 + classifier=$4 + packaging=$5 + number=$6 + sourceDir=$SOURCE/$dir + targetDir=$TARGET/$dir + echo "" + echo -n "($number) Sign $targetDir/$file" + LOG=/tmp/maven-log-$file + OPTIONS="-Dfile=$sourceDir/$file\ + -Durl=$URL\ + -DpomFile=$sourceDir/$pom\ + $packaging\ + -Dclassifier=$classifier\ + -Dgpg.keyname=\"$KEYNAME\"\ + -Dgpg.passphrase=\"$PASSWORD\"\ + -Dgpg.ascDirectory=$ASC_DIR\ + -DgeneratePom=false\ + -DrepositoryId=nuiton" + (mvn gpg:sign-and-deploy-file $OPTIONS -e > $LOG) + if [ $? -eq 1 ]; then + echo "FAILED for $targetDir/$file : " + cat $LOG + rm -f $LOG + exit 1 + fi + + nbSigns=$(($nbSigns+1)) + rm -f $LOG +} + +cleanRepository() { + dir=$1 + ext=$2 + (cd $dir; find -name "*$ext" -exec rm -rf {} \;) + (cd $dir; find -name "*$ext.md5" -exec rm -rf {} \;) + (cd $dir; find -name "*$ext.sha1" -exec rm -rf {} \;) +} + + +echo "-------------------------------------------------------------------------" +echo "Source repository : $SOURCE" +echo "Target repository : $TARGET" +echo "-------------------------------------------------------------------------" +rm -rf $ASC_DIR +#rm -rf $TARGET +mkdir -p $ASC_DIR +mkdir -p $TARGET + +signFiles -tests.jar tests jar +signFiles -test-sources.jar test-sources jar +signFiles -test-javadoc.jar test-javadoc jar +signFiles -sources.jar sources jar +signFiles -javadoc.jar javadoc jar +signFiles .war "" war +signFiles .ear "" ear +signFiles -full.zip full "zip" +signFiles -lib.zip lib "zip" +signFiles .jar "" jar +signFiles .pom "" pom + +echo "-------------------------------------------------------------------------" +if [ $nbSigns -eq 0 ]; then + echo "No file signed." +else + echo "$nbSigns file(s) signed." +fi +echo "-------------------------------------------------------------------------" + + + Property changes on: scripts/redmine-tools/sign-repo.sh ___________________________________________________________________ Added: svn:executable + * Added: scripts/redmine-tools/swish.cgi =================================================================== --- scripts/redmine-tools/swish.cgi (rev 0) +++ scripts/redmine-tools/swish.cgi 2014-01-19 10:22:50 UTC (rev 14) @@ -0,0 +1,3335 @@ +#!/usr/bin/perl -w +package SwishSearch; +use strict; + +# This is set to where Swish-e's "make install" installed the helper modules. +use lib ( '/usr/lib/swish-e/perl' ); + +use CGI; +my $q = new CGI; +my $listname; +local $_ = $q->url(-absolute=>1); +/([^\/\.]*)(?:\/|.cgi)?$/ && ($listname=$+); +$listname = ucfirst $listname; +my $DEFAULT_CONFIG_FILE = "/etc/mailman/swish/".$listname.".cgi.cfg"; + +#print STDERR "***** $DEFAULT_CONFIG_FILE: " . $listname . " fin"; + +################################################################################### +# +# If this text is displayed on your browser then your web server +# is not configured to run .cgi programs. Contact your web server administrator. +# +# To display documentation for this program type "perldoc swish.cgi" +# +# swish.cgi $Revision: 1.22 $ Copyright (C) 2001 Bill Moseley swishscript(a)hank.org +# Example CGI program for searching with SWISH-E +# +# This example program will only run under an OS that supports fork(). +# Under windows it uses a piped open which MAY NOT BE SECURE. +# +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version +# 2 of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# The above lines must remain at the top of this program +# +# $Id: swish.cgi.in,v 1.22 2006/10/05 13:34:46 karman Exp $ +# +#################################################################################### + +# This is written this way so the script can be used as a CGI script or a mod_perl +# module without any code changes. + +# use CGI (); # might not be needed if using Apache::Request + + +#================================================================================= +# CGI entry point +# +#================================================================================= + + +use vars '$speedy_config'; # Global for caching in persistent environment such as SpeedyCGI + +# Run the script -- entry point if running as a CGI script + + unless ( $ENV{MOD_PERL} ) { + if ( !$speedy_config ) { + $speedy_config = default_config(); + + # Merge with disk config file. + $speedy_config = merge_read_config( $speedy_config ); + } + + process_request( $speedy_config ); + } + + + + +#================================================================================== +# This sets the default configuration parameters +# +# Any configuration read from disk is merged with these settings. +# +# Only a few settings are actually required. Some reasonable defaults are used +# for most. If fact, you can probably create a complete config as: +# +# return = { +# swish_binary => '/usr/local/bin/swish-e', +# swish_index => '/usr/local/share/swish/index.swish-e', +# title_property => 'swishtitle', # Not required, but recommended +# }; +# +# But, that doesn't really show all the options. +# +# You can modify the options below, or you can use a config file. The config file +# is .swishcgi.conf by default (read from the current directory) that must return +# a hash reference. For example, to create a config file that changes the default +# title and index file name, plus uses Template::Toolkit to generate output +# create a config file as: +# +# # Example config file -- returns a hash reference +# return { +# title => 'Search Our Site', +# swish_index => 'index.web', +# +# template => { +# package => 'SWISH::TemplateToolkit', +# file => 'swish.tt', +# options => { +# INCLUDE_PATH => '/home/user/swish-e/example', +# }, +# }, +# }; +# +# +#----------------------------------------------------------------------------------- + +sub default_config { + + + + ##### Configuration Parameters ######### + + #---- This lists all the options, with many commented out --- + # By default, this config is used -- see the process_request() call below. + + # You should adjust for your site, and how your swish index was created. + + ##>> + ##>> Please don't post this entire section on the swish-e list if looking for help! + ##>> + ##>> Send a small example, without all the comments. + + #====================================================================== + # *** NOTES **** + # Items beginning with an "x" or "#" are commented out + # the "x" form simply renames (hides) that setting. It's used + # to make it easy to disable a mult-line configuation setting. + # + # If you do not understand a setting then best to leave the default. + # + # Please follow the documentation (perldoc swish.cgi) and set up + # a test using the defaults before making changes. It's much easier + # to modify a working example than to try to get a modified example to work... + # + # Again, this is a Perl hash structure. Commas are important. + #====================================================================== + + + return { + title => 'Search our site', # Title of your choice. Displays on the search page + swish_binary => '/usr/bin/swish-e', # Location of swish-e binary + + + # By default, this script tries to read a config file. You should probably + # comment this out if not used save a disk stat + config_file => $DEFAULT_CONFIG_FILE, # Default config file + + + # The location of your index file. Typically, this would not be in + # your web tree. + # If you have more than one index to search then specify an array + # reference. e.g. swish_index =>[ qw( index1 index2 index3 )], + + swish_index => 'index.swish-e', # Location of your index file + # See "select_indexes" below for how to + # select more than one index. + + page_size => 15, # Number of results per page - default 15 + + + + + # prepend this path to the filename (swishdocpath) returned by swish. This is used to + # make the href link back to the original document. Comment out to disable. + + #prepend_path => 'http://localhost/mydocs', + + + + # This is the property that is used for the href link back to the original + # document. It's "swishdocpath" by default + + #link_property => 'swishdocpath', + + + ## Display properties ## + + # Everything swish records about a file is called a "property". These + # next three settings tell the swish.cgi script which properties should be passed + # to the templating coded for output generation. + + + # First is the property name to use as the main link text to the indexed document. + # Typically, this will be 'swishtitle' if have indexed html documents, + # but you can specify any PropertyName defined in your document. + # By default, swish will display the pathname for documents that do not + # have a title. + # In other words, this is used for the text of the links of the search results. + # <a href="prepend_path/swishdocpath">title_property</a> + + title_property => 'swishtitle', + + + + # Swish has a configuration directive "StoreDescription" that will save part or + # all of a document's contents in the index file. This can then be displayed + # along with results. If you are indexing a lot of files this can use a lot of disk + # space, so test carefully before indexing your entire site. + # Building swish with zlib can greatly reduce the space used by StoreDescription. + # + # This settings tells this script to display this property as the description. + # Normally, this should be 'swishdescription', but you can specify another property name. + # There is no default. + + description_prop => 'swishdescription', + + + + # Property names listed here will be displayed in a table below each result + # You may wish to modify this list if you are using document properties (PropertyNames) + # in your swish-e index configuration + # There is no default. + + display_props => [qw/swishlastmodified swishdocsize swishdocpath/], + + + + + + # Results can be be sorted by any of the properties listed here + # They will be displayed in a drop-down list on the form. + # You may modify this list if you are using document properties of your own creation + # Swish uses the rank as the default sort + + sorts => [qw/swishrank swishlastmodified swishtitle swishdocpath/], + + + # Secondary_sort is used to sort within a sort + # You may enter a property name followed by a direction (asc|desc) + + secondary_sort => [qw/swishlastmodified desc/], + + + + + # You can limit by MetaNames here. Names listed here will be displayed in + # a line of radio buttons. + # The default is to not allow any metaname selection. + # To use this feature you must define MetaNames while indexing. + + # The special "swishdefault" says to search any text that was not indexed + # as a specific metaname (e.g. typically the body of a HTML document and its title). + + # To see how this might work, add to your *swish-e* config file: + # MetaNames swishtitle swishdocpath + # reindex and try: + + metanames => [qw/ swishdefault swishtitle swishdocpath /], + + # Add "all" to this list to test the meta_groups feature described below + + + + # Another example: if you indexed an email archive + # that defined the metanames subject name email (as in the swish-e discussion archive) + # you might use: + #metanames => [qw/body subject name email/], + + + # Searching multiple meta names: + + # You can also group metanames into "meta-metanames". + # Example: Say you defined metanames "author", "comment" and "keywords" + # You want to allow searching "author", "comment" and the document body ("swishdefault") + # But you would also like an "all" search that searches all metanames, including "keywords": + # + # metanames => [qw/swishdefault author comment all/], + # + # Now, the "all" metaname is not a real metaname. It must be expanded into its + # individual metanames using meta_groups: + # + # "meta_groups" maps a fake metaname to a list of real metanames + # + # meta_groups => { + # all => [qw/swishdefault author comment keywords / ], + # }, + # + # swish.cgi will then take a query like + # + # all=(query words) + # + # and create the query + # + # swishdefault=(query words) OR author=(query words) OR comment=(query words) OR keywords=(query words) + # + # This is not ideal, but should work for most cases + # (might fail under windows since the query is passed through the shell). + + # To enable this group add "all" to the list of metanames above + + meta_groups => { + all => [qw/swishdefault swishtitle swishdocpath/], + }, + + # Note that you can use other words than "all". The script just checks if a given metaname is + # listed in "meta_groups" and expands as needed. + + + # "name_labels" is used to map MetaNames and PropertyNames to user-friendly names + # on the CGI form. + + name_labels => { + swishdefault => 'Title & Body', + swishtitle => 'Title', + swishrank => 'Rank', + swishlastmodified => 'Last Modified Date', + swishdocpath => 'Document Path', + swishdocsize => 'Document Size', + all => 'All', # group of metanames + subject => 'Message Subject', # other examples + name => "Poster's Name", + email => "Poster's Email", + sent => 'Message Date', + }, + + + timeout => 10, # limit time used by swish when fetching results - DoS protection. + # does not work under Windows + + max_query_length => 100, # limit length of query string. Swish also has a limit (default is 40) + # You might want to set swish-e's limit higher, and use this to get a + # somewhat more friendly message. + + + + + + max_chars => 500, # Limits the size of the description_prop if it is not highlighted + + # This structure defines term highlighting, and what type of highlighting to use + # If you are using metanames in your searches and they map to properties that you + # will display, you may need to adjust the "meta_to_prop_map". + + highlight => { + + # Pick highlighting module -- you must make sure the module can be found + # The highlighting modules are in the example/modules directory by default + + # Ok speed, but doesn't handle phrases or stopwords + # Deals with stemming, and shows words in context + # Takes into consideration WordCharacters, IgnoreFirstChars and IgnoreLastChars. + #package => 'SWISH::DefaultHighlight', + + # Somewhat slow, but deals with phases, stopwords, and stemming. + # Takes into consideration WordCharacters, IgnoreFirstChars and IgnoreLastChars. + package => 'SWISH::PhraseHighlight', + + # Faster: phrases without regard to wordcharacter settings + # doesn't do context display, so must match in first X words, so may not even highlight + # doesn't handle stemming or stopwords. + #package => 'SWISH::SimpleHighlight', + + show_words => 10, # Number of "swish words" words to show around highlighted word + max_words => 100, # If no words are found to highlighted then show this many words + occurrences => 6, # Limit number of occurrences of highlighted words + #highlight_on => '<b>', # HTML highlighting codes + #highlight_off => '</b>', + highlight_on => '<font style="background:#FFFF99">', + highlight_off => '</font>', + + # This maps (real) search metatags to display properties. + # e.g. if searching in "swishdefault" then highlight in the + # swishtitle and swishdescription properties + # Do not include "fake" metanames defined with meta_groups, just + # list the real metanames used in your index, and the properties they + # relate to. + + meta_to_prop_map => { + swishdefault => [ qw/swishtitle swishdescription/ ], + swishtitle => [ qw/swishtitle/ ], + swishdocpath => [ qw/swishdocpath/ ], + }, + }, + + + + # If you specify more than one index file (as an array reference) you + # can set this allow selection of which indexes to search. + # The default is to search all indexes specified if this is not used. + # When used, the first index is the default index. + + # You need to specify your indexes as an array reference: + #swish_index => [ qw/ index.swish-e index.other index2.other index3.other index4.other / ], + + Xselect_indexes => { + # pick radio_group, popup_menu, or checkbox_group + method => 'checkbox_group', + #method => 'radio_group', + #method => 'popup_menu', + + columns => 3, + # labels must match up one-to-one with elements in "swish_index" + labels => [ 'Main Index', 'Other Index', qw/ two three four/ ], + description => 'Select Site: ', + + # Optional - Set the default index if none is selected + # This needs to be an index file name listed in swish_index + # above, not a label + + default_index => '', + }, + + + # Similar to select_indexes, this adds a metaname search + # based on a metaname. You can use any metaname, and this will + # add an "AND" search to limit results to a subset of your records. + # i.e. it adds something like 'site=(foo or bar or baz)' if foo, bar, and baz were selected. + + # This really just allows you to limit existing searches by a metaname, instead of + # selecting a metaname (with metanames option above). + + # Swish-e's ExtractPath would work well with this. For example, + # to allow limiting searches to specific sections of the apache docs use this + # in your swish-e config file: + # ExtractPath site regex !^/usr/local/apache/htdocs/manual/([^/]+)/.+$!$1! + # ExtractPathDefault site other + # which extracts the segment of the path after /manual/ and indexes that name + # under the metaname "site". Then searches can be limited to files with that + # path (e.g. query would be swishdefault=foo AND site=vhosts to limit searches + # to the virtual host section. + + + Xselect_by_meta => { + #method => 'radio_group', # pick: radio_group, popup_menu, or checkbox_group + method => 'checkbox_group', + #method => 'popup_menu', + columns => 3, + metaname => 'site', # Can't be a metaname used elsewhere! + values => [qw/misc mod vhosts other/], + labels => { + misc => 'General Apache docs', + mod => 'Apache Modules', + vhosts => 'Virtual hosts', + }, + description => 'Limit search to these areas: ', + }, + + + + # The 'template' setting defines what generates the output + # The default is "TemplateDefault" which is reasonably ugly, + # but does not require installation of a separate templating system. + + # Note that some of the above options may not be available + # for templating, as it's up to you to layout the form + # and swish-e results in your template. + + # TemplateDefault is the default + + xtemplate => { + package => 'SWISH::TemplateDefault', + }, + + xtemplate => { + package => 'SWISH::TemplateDumper', + }, + + xtemplate => { + package => 'SWISH::TemplateToolkit', + file => 'swish.tt', + options => { + INCLUDE_PATH => '/usr/share/swish-e', + #PRE_PROCESS => 'config', + }, + }, + + xtemplate => { + package => 'SWISH::TemplateHTMLTemplate', + options => { + filename => 'swish.tmpl', + path => '/usr/share/swish-e', + die_on_bad_params => 0, + loop_context_vars => 1, + cache => 1, + }, + }, + + + + # The "on_intranet" setting is just a flag that can be used to say you do + # not have an external internet connection. It's here because the default + # page generation includes links to images on swish-e.or and on www.w3.org. + # If this is set to one then those images will not be shown. + # (This only effects the default ouput module SWISH::TemplateDefault) + + on_intranet => 0, + + + + # Here you can hard-code debugging options. The will help you find + # where you made your mistake ;) + # Using all at once will generate a lot of messages to STDERR + # Please see the documentation before using these. + # Typically, you will set these from the command line instead of in the configuration. + + # debug_options => 'basic, command, headers, output, summary, dump', + + + + # This defines the package object for reading CGI parameters + # Defaults to CGI. Might be useful with mod_perl. + # request_package => 'CGI', + # request_package => 'Apache::Request', + + + # use_library => 1, # set true and will use the SWISH::API module + # will cache based on index files when running under mod_perl + + + # Minor adjustment to page display. The page navigation normally looks like: + # Page: 1 5 6 7 8 9 24 + # where the first page and last page are always displayed. These can be disabled by + # by setting to true values ( 1 ) + + no_first_page_navigation => 0, + no_last_page_navigation => 0, + num_pages_to_show => 12, # number of pages to offer + + + + + # Limit to date ranges + + + + # This adds in the date_range limiting options + # You will need the DateRanges.pm module from the author to use that feature + + # Noramlly, you will want to limit by the last modified date, so specify + # "swishlastmodified" as the property_name. If indexing a mail archive, and, for + # example, you store the date (a unix timestamp) as "date" then specify + # "date" as the property_name. + + date_ranges => { + property_name => 'swishlastmodified', # property name to limit by + + # what you specify here depends on the DateRanges.pm module. + time_periods => [ + 'All', + 'Today', + 'Yesterday', + #'Yesterday onward', + 'This Week', + 'Last Week', + 'Last 90 Days', + 'This Month', + 'Last Month', + #'Past', + #'Future', + #'Next 30 Days', + ], + + line_break => 0, + default => 'All', + date_range => 1, + }, + + + # This is suppose to reduce the load on systems if hit with a large number + # of requests. Although this will limit the number of swish-e processes run + # it will not limit the number of CGI requests. I feel like a better solution + # is to use mod_perl (with the SWISH::API module). + # I also think that running /bin/ps for every is not ideal. + + # This only works on unix-based systems when running the swish-e binary. + # It greps /swish-e/ from the output of ps and aborts if the count is < limit_procs + + # Set max number of swish-e binaries and ps command to run + limit_procs => 0, # max number of swish process to run (zero to not limit) + ps_prog => '/bin/ps -Unobody -ocommand', # command to list number of swish binaries + + }; + +} + +#^^^^^^^^^^^^^^^^^^^^^^^^^ end of user config ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +#======================================================================================== + + + +#================================================================================= +# mod_perl entry point +# +# As an example, you might use a PerlSetVar to point to paths to different +# config files, and then cache the different configurations by path. +# +#================================================================================= + +my %cached_configs; + +sub handler { + my $r = shift; + + if ( my $config_path = $r->dir_config( 'Swish_Conf_File' ) ) { + + # Already cached? + # Note that this is cached for the life of the server -- must restart if want to change config + + if ( $cached_configs{ $config_path } ) { + process_request( $cached_configs{ $config_path } ); + return Apache::Constants::OK(); + } + + + # Else, load config + my $config = default_config(); + $config->{config_file} = $config_path; + + # Merge with disk config file. + $cached_configs{ $config_path } = merge_read_config( $config ); + + process_request( $cached_configs{ $config_path } ); + return Apache::Constants::OK(); + } + + + # Otherwise, use hard-coded config + my $config = default_config(); + + # Merge with disk config file. + $config = merge_read_config( $config ); + + process_request( default_config() ); + + return Apache::Constants::OK(); + +} + + +#============================================================================ +# Read config settings from disk, and merge +# Note, all errors are ignored since by default this script looks for a +# config file. +# +#============================================================================ +sub merge_read_config { + my $config = shift; + + + set_default_debug_flags(); + + set_debug($config); # get from config or from %ENV + + + return $config unless $config->{config_file}; + + my $return = do $config->{config_file}; # load the config file + + unless ( ref $return eq 'HASH' ) { + + # First, let's check for file not found for the default config, which we can ignore + + my $error = $@ || $!; + + if ( $config->{config_file} eq $DEFAULT_CONFIG_FILE && !-e $config->{config_file} ) { + warn "Config file '$config->{config_file}': $!" if $config->{debug}; + return $config; + } + + die "Config file '$config->{config_file}': $error"; + } + + + + if ( $config->{debug} || $return->{debug} ) { + require Data::Dumper; + print STDERR "\n---------- Read config parameters from '$config->{config_file}' ------\n", + Data::Dumper::Dumper($return), + "-------------------------\n"; + } + + set_debug( $return ); + + + # Merge settings + return { %$config, %$return }; +} + +#-------------------------------------------------------------------------------------------------- +sub set_default_debug_flags { + # Debug flags defined + + $SwishSearch::DEBUG_BASIC = 1; # Show command used to run swish + $SwishSearch::DEBUG_COMMAND = 2; # Show command used to run swish + $SwishSearch::DEBUG_HEADERS = 4; # Swish output headers + $SwishSearch::DEBUG_OUTPUT = 8; # Swish output besides headers + $SwishSearch::DEBUG_SUMMARY = 16; # Summary of results parsed + $SwishSearch::DEBUG_RESULTS = 32; # Detail of results parsed + $SwishSearch::DEBUG_DUMP_DATA = 64; # dump data that is sent to templating modules +} + + + + +#--------------------------------------------------------------------------------------------------- +sub set_debug { + my $conf = shift; + + $conf->{debug} = 0; + + my $debug_string = $ENV{SWISH_DEBUG} ||$conf->{debug_options}; + return unless $debug_string; + + + my %debug = ( + basic => [$SwishSearch::DEBUG_BASIC, 'Basic debugging'], + command => [$SwishSearch::DEBUG_COMMAND, 'Show command used to run swish'], + headers => [$SwishSearch::DEBUG_HEADERS, 'Show headers returned from swish'], + output => [$SwishSearch::DEBUG_OUTPUT, 'Show output from swish'], + summary => [$SwishSearch::DEBUG_SUMMARY, 'Show summary of results'], + results => [$SwishSearch::DEBUG_RESULTS, 'Show detail of results'], + dump => [$SwishSearch::DEBUG_DUMP_DATA, 'Show all data available to templates'], + ); + + + $conf->{debug} = 1; + + my @debug_str; + + for ( split /\s*,\s*/, $debug_string ) { + if ( exists $debug{ lc $_ } ) { + push @debug_str, lc $_; + $conf->{debug} |= $debug{ lc $_ }->[0]; + next; + } + + print STDERR "Unknown debug option '$_'. Must be one of:\n", + join( "\n", map { sprintf(' %10s: %10s', $_, $debug{$_}->[1]) } sort { $debug{$a}->[0] <=> $debug{$b}->[0] }keys %debug), + "\n\n"; + exit; + } + + print STDERR "Debug level set to: $conf->{debug} [", join( ', ', @debug_str), "]\n"; +} + + +#============================================================================ +# +# This is the main controller (entry point), where a config hash is passed in. +# +# Loads the request module (e.g. CGI.pm), and the output module +# Also sets up debugging +# +#============================================================================ + +sub process_request { + my $conf = shift; # configuration parameters + + + + # Limit number of requests - questionable value + limit_swish( $conf->{limit_procs}, $conf->{ps_prog} ) + if !$conf->{use_library} + && $conf->{limit_procs} && $conf->{limit_procs} =~ /^\d+$/ + && $conf->{ps_prog}; + + + + # Set default property used or the href link to the document + $conf->{link_property} ||= 'swishdocpath'; + + # Use CGI.pm by default + my $request_package = $conf->{request_package} || 'CGI'; + + load_module( $request_package ); + my $request_object = $request_package->new; + + + # load the templating module + my $template = $conf->{template} || { package => 'SWISH::TemplateDefault' }; + load_module( $template->{package} ); + + + # Allow fixup within the config file + if ( $conf->{request_fixup} && ref $conf->{request_fixup} eq 'CODE' ) { + &{$conf->{request_fixup}}( $request_object, $conf ); + } + + + set_debug_input( $conf, $request_object ) + if $conf->{debug} && !$ENV{GATEWAY_INTERFACE}; + + + # Create search object and build a query based on CGI parameters + my $search = SwishQuery->new( + config => $conf, + request => $request_object, + ); + + + + + # run the query (run if there's a query) + $search->run_query; # currently, results is the just the $search object + + if ( $search->hits ) { + $search->set_navigation; # sets links + } + + + + show_debug_output( $conf, $search ) + if $conf->{debug}; + + + $template->{package}->show_template( $template, $search ); +} + + +# For limiting number of swish-e binaries + +sub limit_swish { + my ( $limit_procs, $ps_prog ) = @_; + + + my $num_procs = scalar grep { /swish-e/ } `$ps_prog`; + return if $num_procs <= $limit_procs; + + warn "swish.cgi - limited due to too many currently running swish-e binaries: $num_procs running is more than $limit_procs\n"; + + ## Abort + print <<EOF; +Status: 503 Too many requests + +<html> +<head><title>Too Many Requests</title></head> +<body> +Too Many Requests -- Try back later +</body> +</html> +EOF + + exit; +} + + + + +#============================================================================ +# +# Loads a perl module -- and shows a pretty web page to say the obvious +# +# +#============================================================================ +sub load_module { + my $package = shift; + $package =~ s[::][/]g; + eval { require "$package.pm" }; + if ( $@ ) { + print <<EOF; +Content-Type: text/html + +<html> +<head><title>Software Error</title></head> +<body><h2>Software Error</h2><p>Please check error log</p></body> +</html> +EOF + + die "$0 $@\n"; + } +} + + + +#================================================================== +# set debugging input +# +#================================================================== + +sub set_debug_input { + my ( $conf, $request_object ) = @_; + + print STDERR 'Enter a query [all]: '; + my $query = <STDIN>; + $query =~ tr/\r//d; + chomp $query; + unless ( $query ) { + print STDERR "Using 'not asdfghjklzxcv' to match all records\n"; + $query = 'not asdfghjklzxcv'; + } + + $request_object->param('query', $query ); + + print STDERR 'Enter max results to display [1]: '; + my $max = <STDIN>; + chomp $max; + $max = 1 unless $max && $max =~/^\d+$/; + + $conf->{page_size} = $max; +} + +#================================================================== +# show debugging output +# +#================================================================== +sub show_debug_output { + my ( $conf, $results ) = @_; + + require Data::Dumper; + + + if ( $results->hits ) { + print STDERR "swish.cgi: returned a page of $results->{navigation}{showing} results of $results->{navigation}{hits} total hits\n"; + } else { + print STDERR "swish.cgi: no results\n"; + } + + if ($conf->{debug} & $SwishSearch::DEBUG_HEADERS ) { + print STDERR "\n------------- Index Headers ------------\n"; + if ( $results->{_headers} ) { + print STDERR Data::Dumper::Dumper( $results->{_headers} ); + } else { + print STDERR "No headers\n"; + } + + print STDERR "--------------------------\n"; + } + + + + if ( $conf->{debug} & $SwishSearch::DEBUG_DUMP_DATA ) { + print STDERR "\n------------- Results structure passed to template ------------\n", + Data::Dumper::Dumper( $results ), + "--------------------------\n"; + + } elsif ( $conf->{debug} & $SwishSearch::DEBUG_SUMMARY ) { + print STDERR "\n------------- Results summary ------------\n"; + if ( $results->{hits} ) { + print STDERR "$_->{swishrank} $_->{swishdocpath}\n" for @{ $results->{_results}}; + + } else { + print STDERR "** NO RESULTS **\n"; + } + + } elsif ( $conf->{debug} & $SwishSearch::DEBUG_RESULTS ) { + print STDERR "\n------------- Results detail ------------\n"; + if ( $results->{hits} ) { + print STDERR Data::Dumper::Dumper( $results->{_results} ); + } else { + print STDERR "** NO RESULTS **\n"; + } + + print STDERR "--------------------------\n"; + } +} + + + + + + + +#================================================================================================== +package SwishQuery; +#================================================================================================== + +use Carp; +# Or use this instead -- PLEASE see perldoc CGI::Carp for details +# <opinion>CGI::Carp doesn't help that much</opinion> +#use CGI::Carp; # qw(fatalsToBrowser); + +use SWISH::ParseQuery; + + + + +#-------------------------------------------------------------------------------- +# new() doesn't do much, just create the object +#-------------------------------------------------------------------------------- +sub new { + my $class = shift; + my %options = @_; + + my $conf = $options{config}; + + croak "Failed to set the swish index files in config setting 'swish_index'" unless $conf->{swish_index}; + croak "Failed to specify 'swish_binary' in configuration" unless $conf->{swish_binary}; + + # initialize the request search hash + my $sh = { + prog => $conf->{swish_binary}, + config => $conf, + q => $options{request}, + hits => 0, + MOD_PERL => $ENV{MOD_PERL}, + }; + + my $self = bless $sh, $class; + + + # load highlight module, if requsted + + if ( my $highlight = $self->config('highlight') ) { + $highlight->{package} ||= 'SWISH::DefaultHighlight'; + SwishSearch::load_module( $highlight->{package} ); + } + + + # Fetch the swish-e query from the CGI parameters + $self->set_query; + + return $self; +} + + +sub hits { shift->{hits} } + +sub config { + my ($self, $setting, $value ) = @_; + + confess "Failed to pass 'config' a setting" unless $setting; + + my $cur = $self->{config}{$setting} if exists $self->{config}{$setting}; + + $self->{config}{$setting} = $value if $value; + + return $cur; +} + +# Returns false if all of @values are not valid options - for checking +# $config is what $self->config returns + +sub is_valid_config_option { + my ( $self, $config, $err_msg, @values ) = @_; + + unless ( $config ) { + $self->errstr( "No config option set: $err_msg" ); + return; + } + + # Allow multiple values. + my @options = ref $config eq 'ARRAY' ? @$config : ( $config ); + + my %lookup = map { $_ => 1 } @options; + + for ( @values ) { + unless ( exists $lookup{ $_ } ) { + $self->errstr( $err_msg ); + return; + } + } + + return 1; +} + + +sub header { + my $self = shift; + return unless ref $self->{_headers} eq 'HASH'; + + return $self->{_headers}{$_[0]} || ''; +} + + +# return a ref to an array +sub results { + my $self = shift; + return $self->{_results} || undef; +} + +sub navigation { + my $self = shift; + return unless ref $self->{navigation} eq 'HASH'; + + return exists $self->{navigation}{$_[0]} ? $self->{navigation}{$_[0]} : ''; +} + +sub CGI { $_[0]->{q} }; + + + + +sub swish_command { + + my ($self, $param_name, $value ) = @_; + + return $self->{swish_command} || {} unless $param_name; + return $self->{swish_command}{$param_name} || '' unless $value; + + $self->{swish_command}{$param_name} = $value; +} + +# For use when forking + +sub swish_command_array { + + my ($self ) = @_; + + my @params; + my $swish_command = $self->swish_command; + + for ( keys %$swish_command ) { + + my $value = $swish_command->{$_}; + + if ( /^-/ ) { + push @params, $_; + push @params, ref $value eq 'ARRAY' ? @$value : $value; + next; + } + + # special cases + if ( $_ eq 'limits' ) { + push @params, '-L', $value->{prop}, $value->{low}, $value->{high}; + next; + } + + die "Unknown swish_command '$_' = '$value'"; + } + + return @params; + +} + + + +sub errstr { + my ($self, $value ) = @_; + + + $self->{_errstr} = $value if $value; + + return $self->{_errstr} || ''; +} + + +#============================================================================== +# Set query from the CGI parameters +#------------------------------------------------------------------------------ + +sub set_query { + my $self = shift; + my $q = $self->{q}; + + # Sets the query string, and any -L limits. + return unless $self->build_query; + + # Set the starting position (which is offset by one) + + my $start = $q->param('start') || 0; + $start = 0 unless $start =~ /^\d+$/ && $start >= 0; + + $self->swish_command( '-b', $start+1 ); + + + + # Set the max hits + + my $page_size = $self->config('page_size') || 15; + $self->swish_command( '-m', $page_size ); + + + return unless $self->set_index_file; + + + # Set the sort option, if any + return unless $self->set_sort_order; + + + return 1; + +} + + + + + +#============================================ +# This returns "$self" just in case we want to seperate out into two objects later + + +sub run_query { + + my $self = shift; + + my $q = $self->{q}; + my $conf = $self->{config}; + + return $self unless $self->swish_command('-w'); + + my $time_out_str = 'Timed out'; + + + my $timeout = $self->config('timeout') || 0; + + eval { + local $SIG{ALRM} = sub { + kill 'KILL', $self->{pid} if $self->{pid}; + die $time_out_str . "\n"; + }; + + alarm $timeout if $timeout && $^O !~ /Win32/i; + $self->run_swish; + alarm 0 unless $^O =~ /Win32/i; + + # catch zombies + waitpid $self->{pid}, 0 if $self->{pid}; # for IPC::Open2 + }; + + if ( $@ ) { + warn "$0 aborted: $@"; # if $conf->{debug}; + + $self->errstr( + $@ =~ /$time_out_str/ + ? "Search timed out after $timeout seconds." + : "Service currently unavailable" + ); + return $self; + } +} + + +# Build href for repeated search via GET (forward, backward links) + +sub set_navigation { + my $self = shift; + my $q = $self->{q}; + + + # Single string + + # default fields + my @std_fields = qw/query metaname sort reverse/; + + # Extra fields could be added in the config file + if ( my $extra = $self->config('extra_fields') ) { + push @std_fields, @$extra; + } + + my @query_string = + map { "$_=" . $q->escape( $q->param($_) ) } + grep { $q->param($_) } @std_fields; + + + + # Perhaps arrays + + for my $p ( qw/si sbm/ ) { + my @settings = $q->param($p); + next unless @settings; + push @query_string, "$p=" . $q->escape( $_ ) for @settings; + } + + + + + if ( $self->config('date_ranges' ) ) { + my $dr = SWISH::DateRanges::GetDateRangeArgs( $q ); + push @query_string, $dr, if $dr; + } + + + $self->{query_href} = $q->script_name . '?' . join '&', @query_string; + $self->{my_url} = $q->script_name; + + + my $hits = $self->hits; + + my $start = $self->swish_command('-b') || 1; + $start--; + + $self->{navigation} = { + showing => $hits, + from => $start + 1, + to => $start + $hits, + hits => $self->header('number of hits') || 0, + run_time => $self->header('run time') || 'unknown', + search_time => $self->header('search time') || 'unknown', + }; + + + + $self->set_page ( $self->swish_command( '-m' ) ); + + return $self; + +} + + +#============================================================ +# Build a query string from swish +# Just builds the -w string +#------------------------------------------------------------ + +sub build_query { + my $self = shift; + + my $q = $self->{q}; + + + # set up the query string to pass to swish. + my $query = $q->param('query') || ''; + + for ( $query ) { # trim the query string + s/\s+$//; + s/^\s+//; + } + + $self->{query_simple} = $query; # without metaname + $q->param('query', $query ); # clean up the query, if needed. + + + # Read in the date limits, if any. This can create a new query, which is why it is here + return unless $self->get_date_limits( \$query ); + + + unless ( $query ) { + $self->errstr('Please enter a query string') if $q->param('submit'); + return; + } + + + if ( length( $query ) > $self->{config}{max_query_length} ) { + $self->errstr('Please enter a shorter query'); + return; + } + + + + # Adjust the query string for metaname search + # *Everything* is a metaname search + # Might also like to allow searching more than one metaname at the same time + + my $metaname = $q->param('metaname') || 'swishdefault'; + + return unless $self->is_valid_config_option( $self->config('metanames') || 'swishdefault', 'Bad MetaName provided', $metaname ); + + # save the metaname so we know what field to highlight + # Note that this might be a fake metaname + $self->{metaname} = $metaname; + + + # prepend metaname to query + + # expand query when using meta_groups + + my $meta_groups = $self->config('meta_groups'); + + if ( $meta_groups && $meta_groups->{$metaname} ) { + $query = join ' OR ', map { "$_=($query)" } @{$meta_groups->{$metaname}}; + + # This is used to create a fake entry in the parsed query so highlighting + # can find the query words + $self->{real_metaname} = $meta_groups->{$metaname}[0]; + } else { + $query = $metaname . "=($query)"; + } + + + + + ## Look for a "limit" metaname -- perhaps used with ExtractPath + # Here we don't worry about user supplied data + + my $limits = $self->config('select_by_meta'); + my @limits = $q->param('sbm'); # Select By Metaname + + + # Note that this could be messed up by ending the query in a NOT or OR + # Should look into doing: + # $query = "( $query ) AND " . $limits->{metaname} . '=(' . join( ' OR ', @limits ) . ')'; + + if ( @limits && ref $limits eq 'HASH' && $limits->{metaname} ) { + $query .= ' and ' . $limits->{metaname} . '=(' . join( ' or ', @limits ) . ')'; + } + + + $self->swish_command('-w', $query ); + + return 1; +} + +#======================================================================== +# Get the index files from the form, or from the config settings +# Uses index numbers to hide path names +#------------------------------------------------------------------------ + +sub set_index_file { + my $self = shift; + + my $q = $self->CGI; + + # Set the index file - first check for options + + my $si = $self->config('select_indexes'); + if ( $si && ref $self->config('swish_index') eq 'ARRAY' ) { + + my @choices = $q->param('si'); + + if ( !@choices ) { + + if ( $si->{default_index} ) { + $self->swish_command('-f', $si->{'default_index'}); + return 1; + + } else { + $self->errstr('Please select a source to search'); + return; + } + } + + my @indexes = @{$self->config('swish_index')}; + + + my @selected_indexes = grep {/^\d+$/ && $_ >= 0 && $_ < @indexes } @choices; + + if ( !@selected_indexes ) { + $self->errstr('Invalid source selected'); + return $self; + } + my %dups; + my @idx = grep { !$dups{$_}++ } map { ref($_) ? @$_ : $_ } @indexes[ @selected_indexes ]; + $self->swish_command( '-f', \@idx ); + + + } else { + $self->swish_command( '-f', $self->config('swish_index') ); + } + + return 1; +} + +#================================================================================ +# Parse out the date limits from the form or from GET request +# +#--------------------------------------------------------------------------------- + +sub get_date_limits { + + my ( $self, $query_ref ) = @_; # reference to query since may be modified + + my $conf = $self->{config}; + + # Are date ranges enabled? + return 1 unless $conf->{date_ranges}; + + + eval { require SWISH::DateRanges }; + if ( $@ ) { + print STDERR "\n------ Can't use DateRanges feature ------------\n", + "\nScript will run, but you can't use the date range feature\n", + $@, + "\n--------------\n" if $conf->{debug}; + + delete $conf->{date_ranges}; + return 1; + } + + my $q = $self->{q}; + + my %limits; + + unless ( SWISH::DateRanges::DateRangeParse( $q, \%limits ) ) { + $self->errstr( $limits{dr_error} || 'Bad date range selection' ); + return; + } + + # Store the values for later (for display on templates) + + $self->{DateRanges_time_low} = $limits{dr_time_low}; + $self->{DateRanges_time_high} = $limits{dr_time_high}; + + + # Allow searchs just be date if not "All dates" search + # $$$ should place some limits here, and provide a switch to disable + # as it can bring up a lot of results. + + $$query_ref ||= 'not skaiqwdsikdeekk' + if $limits{dr_time_high}; + + + # Now specify limits, if a range was specified + + my $limit_prop = $conf->{date_ranges}{property_name} || 'swishlastmodified'; + + + if ( $limits{dr_time_low} && $limits{dr_time_high} ) { + + my %limits = ( + prop => $limit_prop, + low => $limits{dr_time_low}, + high => $limits{dr_time_high}, + ); + + $self->swish_command( 'limits', \%limits ); + } + + return 1; +} + + + +#================================================================ +# Set the sort order +# Just builds the -s string +#---------------------------------------------------------------- + +sub set_sort_order { + my $self = shift; + + my $q = $self->{q}; + + my $sorts_array = $self->config('sorts'); + my $sortby = $q->param('sort') || ''; + + return 1 unless $sorts_array && $sortby; + return unless $self->is_valid_config_option( $sorts_array, 'Invalid Sort Option Selected', $sortby ); + + + my $conf = $self->{config}; + + + # Now set sort option - if a valid option submitted (or you could let swish-e return the error). + my $direction = $sortby eq 'swishrank' + ? $q->param('reverse') ? 'asc' : 'desc' + : $q->param('reverse') ? 'desc' : 'asc'; + + my @sort_params = ( $sortby, $direction ); + + if ( $conf->{secondary_sort} ) { + my @secondary = ref $conf->{secondary_sort} ? @{ $conf->{secondary_sort} } : $conf->{secondary_sort}; + + push @sort_params, @secondary + if $sortby ne $secondary[0]; + } + + + $self->swish_command( '-s', \@sort_params ); + + + return 1; +} + + + +#======================================================== +# Sets prev and next page links. +# Feel free to clean this code up! +# +# Pass: +# $results - reference to a hash (for access to the headers returned by swish) +# $q - CGI object +# +# Returns: +# Sets entries in the $results hash +# + +sub set_page { + + my ( $self, $Page_Size ) = @_; + + my $q = $self->{q}; + my $config = $self->{config}; + + my $navigation = $self->{navigation}; + + + my $start = $navigation->{from} - 1; # Current starting record index + + + # Set start number for "prev page" and the number of hits on the prev page + + my $prev = $start - $Page_Size; + $prev = 0 if $prev < 0; + + if ( $prev < $start ) { + $navigation->{prev} = $prev; + $navigation->{prev_count} = $start - $prev; + } + + + my $last = $navigation->{hits} - 1; + + + # Set start number for "next page" and number of hits on the next page + + my $next = $start + $Page_Size; + $next = $last if $next > $last; + my $cur_end = $start + $self->{hits} - 1; + if ( $next > $cur_end ) { + $navigation->{next} = $next; + $navigation->{next_count} = $next + $Page_Size > $last + ? $last - $next + 1 + : $Page_Size; + } + + + # Calculate pages ( is this -1 correct here? ) + # Build an array of a range of page numbers. + + my $total_pages = int (($navigation->{hits} -1) / $Page_Size); # total pages for all results. + + if ( $total_pages ) { + + my @pages = 0..$total_pages; + + my $show_pages = $config->{num_pages_to_show} || 12; + + # To make the number always work + $show_pages-- unless $config->{no_first_page_navigation}; + $show_pages-- unless $config->{no_last_page_navigation}; + + + # If too many pages then limit + + if ( @pages > $show_pages ) { + + my $start_page = int ( $start / $Page_Size - $show_pages/2) ; + $start_page = 0 if $start_page < 0; + + # if close to the end then move of center + $start_page = $total_pages - $show_pages + if $start_page + $show_pages - 1 > $total_pages; + + @pages = $start_page..$start_page + $show_pages - 1; + + + # Add first and last pages, unless config says otherwise + unshift @pages, 0 + unless $start_page == 0 || $config->{no_first_page_navigation}; + + push @pages, $total_pages + unless $start_page + $show_pages - 1 == $total_pages || $config->{no_last_page_navigation} + } + + + # Build "canned" pages HTML + + $navigation->{pages} = + join ' ', map { + my $page_start = $_ * $Page_Size; + my $page = $_ + 1; + $page_start == $start + ? $page + : qq[<a href="$self->{query_href}&start=$page_start">$page</a>]; + } @pages; + + + # Build just the raw data - an array of hashes + # for custom page display with templates + + $navigation->{page_array} = [ + map { + { + page_number => $_ + 1, # page number to display + page_start => $_ * $Page_Size, + cur_page => $_ * $Page_Size == $start, # flag + } + } @pages + ]; + + + } + +} + +#================================================== +# Format and return the date range options in HTML +# +#-------------------------------------------------- +sub get_date_ranges { + + my $self = shift; + + my $q = $self->{q}; + my $conf = $self->{config}; + + return '' unless $conf->{date_ranges}; + + # pass parametes, and a hash to store the returned values. + + my %fields; + + SWISH::DateRanges::DateRangeForm( $q, $conf->{date_ranges}, \%fields ); + + + # Set the layout: + + my $string = '<br>Limit to: ' + . ( $fields{buttons} ? "$fields{buttons}<br>" : '' ) + . ( $fields{date_range_button} || '' ) + . ( $fields{date_range_low} + ? " $fields{date_range_low} through $fields{date_range_high}" + : '' ); + + return $string; +} + + + +#============================================ +# Run swish-e and gathers headers and results +# Currently requires fork() to run. +# +# Pass: +# $sh - an array with search parameters +# +# Returns: +# a reference to a hash that contains the headers and results +# or possibly a scalar with an error message. +# + + +sub run_swish { + + + my $self = shift; + + my $results = $self->{results}; + my $conf = $self->{config}; + my $q = $self->{q}; + + + my @properties; + my %seen; + + # Gather up the properties we need in results + + for ( qw/ title_property description_prop display_props link_property/ ) { + push @properties, ref $conf->{$_} ? @{$conf->{$_}} : $conf->{$_} + if $conf->{$_} && !$seen{$_}++; + } + + # Add in the default props that should be seen. + for ( qw/swishrank/ ) { + push @properties, $_ unless $seen{$_}; + } + + + # add in the default prop - a number must be first (this might be a duplicate in -x, oh well) + unshift @properties, 'swishreccount'; + + + $self->swish_command( -x => join( '\t', map { "<$_>" } @properties ) . '\n' ); + $self->swish_command( -H => 9 ); + + + if ( $conf->{debug} & $SwishSearch::DEBUG_COMMAND ) { + require Data::Dumper; + print STDERR "---- Swish parameters ----\n"; + print STDERR Data::Dumper::Dumper($self->swish_command); + print STDERR "\n-----------------------------------------------\n"; + } + + + + + + + # Use the swish-e library? + + return $self->run_library( @properties ) + if $self->config('use_library'); + + + my $fh = $^O =~ /Win32/i + ? windows_fork( $conf, $self ) + : real_fork( $conf, $self ); + + + # read in from child + + my %stops_removed; + + my $unknown_output = ''; + + + while (<$fh>) { + + chomp; + + print STDERR "$_\n" if $conf->{debug} & $SwishSearch::DEBUG_OUTPUT; + + + tr/\r//d; + + # This will not work correctly with multiple indexes when different values are used. + if ( /^# ([^:]+):\s+(.+)$/ ) { + + my $h = lc $1; + my $value = $2; + $self->{_headers}{$h} = $value; + + push @{$self->{_headers}{'removed stopwords'}}, $value if $h eq 'removed stopword' && !$stops_removed{$value}++; + + next; + } + + + # return swish errors as a mesage to the script + $self->errstr($1), return if /^err:\s*(.+)/; + + # Or, if you want to log the errors and just say "Service Unavailable" use this: + #die "$1\n" if /^err:\s*(.+)/; + + + # Found a result + if ( /^\d/ ) { + + my %h; + @h{@properties} = split /\t/; + $self->add_result_to_list( \%h ); + next; + + } elsif ( /^\.$/ ) { + last; + + } else { + next if /^#/; + } + + $unknown_output .= "'$_'\n"; + + } + + die "Swish returned unknown output: $unknown_output\n" if $unknown_output; + + $self->{hits} = $self->{_results} ? @{$self->{_results}} : 0; + +} + +# Filters in place +sub html_escape { + $_[0] = '' unless defined $_[0]; + for ($_[0]) { + s/&/&/g; + s/</</g; + s/>/>/g; + s/"/"/g; + } +} + + +#============================================================================ +# Adds a result to the result list and highlight the search words + +# This is a common source of bugs! The problem is that highlighting is done in this code. +# This is good, especially for the description because it is trimmed down as processing each +# result. Otherwise, would use a lot of memory. It's bad because the highlighting is +# creating html which really should be done in the template output code. +# What that means is the properties that are "searched" are run through the highlighting +# code (and thus HTML escaped) but other properties are not. +# If highlighting (and trimming) is to be kept here then either we need to +# html escape all display properties, or flag which ones are escaped. +# Since we know the ultimate output is HTML, the current method will be to escape here. + + +sub add_result_to_list { + my ( $self, $props ) = @_; + + + # Push the result onto the list + + push @{$self->{_results}}, $props; + + + # We need to save the text of the link prop (almost always swishdocpath) + # because all properties are escaped. + + my $link_property = $self->config('link_property') || 'swishdocpath'; + my $link_href = ( $self->config('prepend_path') || '' ) + . $props->{$link_property}; + + # Replace spaces ***argh this is the wrong place to do this! *** + # This doesn't really work -- file names could still have chars that need to be escaped. + $link_href =~ s/\s/%20/g; + + + # Returns hash of the properties that were highlighted + my $highlighted = $self->highlight_props( $props ) || {}; + + my $trim_prop = $self->config('description_prop') || ''; + $props->{$trim_prop} ||= '' + if $trim_prop; + + # HTML escape all properties that were not highlighted + for my $prop (keys %$props) { + next if $highlighted->{$prop}; + + # not highlighted, so escape + html_escape( $props->{$prop} ); + + if ( $prop eq $trim_prop ) { + my $max = $self->config('max_chars') || 500; + + $props->{$trim_prop} = substr( $props->{$trim_prop}, 0, $max) . ' <b>...</b>' + if length $props->{$trim_prop} > $max; + } + } + + $props->{swishdocpath_href} = $link_href; # backwards compatible + $props->{link_property} = $link_href; # backwards compatible + + +} + + +#======================================================================================= + + +# This will call the highlighting module as needed. +# The highlighting module MUST html escape the property. +# returns a hash of properties highlighted + + +sub highlight_props { + my ( $self, $props ) = @_; + + # make sure we have the config we need. + my $highlight_settings = $self->config('highlight') || return; + my $meta_to_prop = $highlight_settings->{meta_to_prop_map} || return; + + + + # Initialize highlight module ( could probably do this once per instance ) + # pass in the config highlight settings, and the swish-e headers as a hash. + + $self->{_highlight_object} ||= $highlight_settings->{package}->new( $highlight_settings, $self->{_headers} ); + my $highlight_object = $self->{_highlight_object} || return; + + + + + # parse the query on first result + + my $parsed_words = $self->header( 'parsed words' ) || die "Failed to find 'Parsed Words' in swish headers"; + + $self->{parsed_query} ||= ( parse_query( $parsed_words ) || return ); + + + my %highlighted; # track which were highlighted to detect if need to trim the description + + + # this is probably backwards -- might be better to loop through the %$props + + while ( my( $meta, $phrases ) = each %{$self->{parsed_query}} ) { + next unless $meta_to_prop->{$meta}; # is it a prop defined to highlight? + + # loop through the properties for the metaname + + for ( @{ $meta_to_prop->{$meta} } ) { + if ( $props->{$_} ) { + $highlighted{$_}++ if $highlight_object->highlight( \$props->{$_}, $phrases, $_ ); + } + } + } + + return \%highlighted; +} + + + + + + +#================================================================== +# Run swish-e by using the SWISH::API module +# + +my %cached_handles; + +sub run_library { + my ( $self, @props ) = @_; + + SwishSearch::load_module( 'SWISH::API' ); + + my $indexes = $self->swish_command('-f'); + + + print STDERR "swish.cgi: running library thus no 'output' available -- try 'summary'\n" + if ($self->{config}{debug} || 0) & $SwishSearch::DEBUG_OUTPUT; + + eval { require Time::HiRes }; + my $start_time = [Time::HiRes::gettimeofday()] unless $@; + + + + unless ( $cached_handles{$indexes} ) { + + my $swish = SWISH::API->new( ref $indexes ? join(' ', @$indexes) : $indexes ); + if ( $swish->Error ) { + $self->errstr( join ': ', $swish->ErrorString, $swish->LastErrorMsg ); + delete $cached_handles{$indexes} if $swish->CriticalError; + return; + } + + # read headers (currently only reads one set) + my %headers; + my $index = ($swish->IndexNames)[0]; + + for ( $swish->HeaderNames ) { + my @value = $swish->HeaderValue( $index, $_ ); + my $x = @value; + next unless @value; + $headers{ lc($_) } = join ' ', @value; + } + + + $cached_handles{$indexes} = { + swish => $swish, + headers => \%headers, + }; + } + + my $swish = $cached_handles{$indexes}{swish}; + + my $headers = $cached_handles{$indexes}{headers}; + + $self->{_headers} = $headers; + + + my $search = $swish->New_Search_Object; # probably could cache this, too + + if ( my $limits = $self->swish_command( 'limits' ) ) { + $search->SetSearchLimit( @{$limits}{ qw/prop low high/ } ); + } + + if ( $swish->Error ) { + $self->errstr( join ': ', $swish->ErrorString, $swish->LastErrorMsg ); + delete $cached_handles{$indexes} if $swish->CriticalError; + return; + } + + + if ( my $sort = $self->swish_command('-s') ) { + $search->SetSort( ref $sort ? join( ' ', @$sort) : $sort ); + } + + my $search_time = [Time::HiRes::gettimeofday()] if $start_time; + + my $results = $search->Execute( $self->swish_command('-w') ); + + + $headers->{'search time'} = sprintf('%0.3f seconds', Time::HiRes::tv_interval( $search_time, [Time::HiRes::gettimeofday()] )) + if $start_time; + + + if ( $swish->Error ) { + $self->errstr( join ': ', $swish->ErrorString, $swish->LastErrorMsg ); + delete $cached_handles{$indexes} if $swish->CriticalError; + return; + } + + # Add in results-related headers + $headers->{'parsed words'} = join ' ', $results->ParsedWords( ($swish->IndexNames)[0] ); + + if ( ! $results->Hits ) { + $self->errstr('no results'); + return; + } + $headers->{'number of hits'} = $results->Hits; + + # Get stopwords removed from each index (really need to track headers per index to be correct) + + for my $index ( $swish->IndexNames ) { + my @stopwords = $results->RemovedStopwords( $index ); + + push @{$headers->{'removed stopwords'}}, @stopwords + if @stopwords; + } + + + + # Now fetch properties + + $results->SeekResult( $self->swish_command( '-b' ) - 1 ); + + my $page_size = $self->swish_command( '-m' ); + + if ( $swish->Error ) { + $self->errstr( join ': ', $swish->ErrorString, $swish->LastErrorMsg ); + delete $cached_handles{$indexes} if $swish->CriticalError; + return; + } + + my $hit_count; + + while ( my $result = $results->NextResult ) { + my %props; + + + for my $prop ( @props ) { + # Note, we use ResultPropertyStr instead since this is a general purpose + # script (it converts dates to a string, for example). + # $result->Property is a faster method and does not convert dates and numbers to strings. + #my $value = $result->Property( $prop ); + my $value = $result->ResultPropertyStr( $prop ); + next unless $value; # ?? + + $props{$prop} = $value; + } + + $hit_count++; + + $self->add_result_to_list( \%props ); + + last unless --$page_size; + } + + + $headers->{'run time'} = sprintf('%0.3f seconds', Time::HiRes::tv_interval( $start_time, [Time::HiRes::gettimeofday()] )) + if $start_time; + + + $self->{hits} = $hit_count; + + +} + + + +#================================================================== +# Run swish-e by forking +# + +use Symbol; + +sub real_fork { + my ( $conf, $self ) = @_; + + + # Run swish + my $fh = gensym; + my $pid = open( $fh, '-|' ); + + die "Failed to fork: $!\n" unless defined $pid; + + + if ( !$pid ) { # in child + unless ( exec $self->{prog}, $self->swish_command_array ) { + warn "Child process Failed to exec '$self->{prog}' Error: $!"; + print "Failed to exec Swish"; # send this message to parent. + exit; + } + } else { + $self->{pid} = $pid; + } + + return $fh; +} + + +#===================================================================================== +# Windows work around +# from perldoc perlfok -- na, that doesn't work. Try IPC::Open2 +# +sub windows_fork { + my ( $conf, $self ) = @_; + + + require IPC::Open2; + my ( $rdrfh, $wtrfh ); + + # Ok, I'll say it. Windows sucks. + my @command = map { s/"/\\"/g; qq["$_"] } $self->{prog}, $self->swish_command_array; + my $pid = IPC::Open2::open2($rdrfh, $wtrfh, @command ); + + + $self->{pid} = $pid; + + return $rdrfh; +} + + + +1; + + +__END__ + +=head1 NAME + +swish.cgi -- Example Perl script for searching with the SWISH-E search engine. + +=head1 DESCRIPTION + +C<swish.cgi> is a CGI script for searching with the SWISH-E search +engine version 2.1-dev and above. It returns results a page at a +time, with matching words from the source document highlighted, +showing a few words of content on either side of the highlighted word. + +The script is highly configurable. Features include searching +multiple (or selectable) indexes, limiting searches to a subset of documents, +sorting by a number of different properties, and limiting results to +a date range. + +On unix type systems the swish.cgi script is installed in the directory +$prefix/lib/swish-e, which is typically /usr/local/lib/swish-e. This +can be overridden by the configure options --prefix or --libexecdir. + +The standard configuration (i.e. not using a config file) should work +with most swish index files. Customization of the parameters will be +needed if you are indexing special meta data and want to search and/or +display the meta data. The configuration can be modified by editing +this script directly, or by using a configuration file (.swishcgi.conf +by default). The script's configuration file is described below. + +You are strongly encouraged to get the default configuration working +before making changes. Most problems using this script are the result +of configuration modifications. + +The script is modular in design. Both the highlighting code and +output generation is handled by modules, which are included in the +F<example/modules> distribution directory and installed in the +$libexecdir/perl directory. +This allows for easy customization of +the output without changing the main CGI script. + +Included with the Swish-e distribution is a module to generate standard HTML +output. There's also modules and template examples to use with the popular +Perl templating systems HTML::Template and Template-Toolkit. This is very +useful if your site already uses one of these templating systems The +HTML::Template and Template-Toolkit packages are not distributed with +Swish-e. They are available from the CPAN (http://search.cpan.org) + +This scipt can also run basically unmodified as a mod_perl handler, +providing much better performance than running as a CGI script. Usage +under mod_perl is described below. + +Please read the rest of the documentation. There's a C<DEBUGGING> +section, and a C<FAQ> section. + +This script should work on Windows, but security may be an issue. + +=head1 REQUIREMENTS + +A reasonably current version of Perl. 5.00503 +or above is recommended (anything older will not be supported). + +The Date::Calc module is required to use the date range feature of the script. +The Date::Calc module is also available from CPAN. + + +=head1 INSTALLATION + +Here's an example installation session under Linux. It should be +similar for other operating systems. + +For the sake of simplicity in this installation example all files are +placed in web server space, including files such as swish-e index and +configuration files that would normally not be made available via the +web server. Access to these files should be limited once the script +is running. Either move the files to other locations (and adjust the +script's configuration) or use features of the web server to limit +access (such as with F<.htaccess>). + +Please get a simple installation working before modifying the +configuration file. Most problems reported for using this script have +been due to improper configuration. + +The script's default settings are setup for initial testing. By default the settings expect +to find most files and the swish-e binary in the same directory as the script. + +For I<security> reasons, once you have tested the script you will want to change settings to +limit access to some of these files by the web server (either by moving them out of web +space, or using access control such as F<.htaccess>). An example of using F<.htaccess> on +Apache is given below. + +It's expected that swish-e has already been unpacked and the swish-e binary has be compiled +from source and "make install" has been run. If swish-e was installed from a vendor package +(such as from a RPM or Debian package) see that pakage's documentation for where files are +installed. + +Example Installation: + +=over 4 + +=item 1 Symlink or copy the swish.cgi. + +Symlink (or copy if your platform or webserver does not allow symlinks) +the swish.cgi script from the installation directory to a local directory. +Typically, this would be the cgi-bin directory or a location where CGI script +are located. In this example a new directory is created and the script is +symlinked. + + ~$ mkdir swishdir + ~$ cd swishdir + ~/swishdir$ ln -s /usr/local/lib/swish-e/swish.cgi + +The installation directory is set at configure time with the --prefix or +--libexecdir options, but by default is in /usr/local/lib/swish-e. + +=item 2 Create an index + +Use an editor and create a simple configuration file for indexing your +files. In this example the Apache documentation is indexed. Last we +run a simple query to test that the index works correctly. + + ~/swishdir$ cat swish.conf + IndexDir /usr/local/apache/htdocs + IndexOnly .html .htm + DefaultContents HTML* + StoreDescription HTML* <body> 200000 + MetaNames swishdocpath swishtitle + ReplaceRules remove /usr/local/apache/ + +If you do not have the Apache docs installed then pick another directory to index +such as /usr/share/doc. + +Create the index. + + ~/swishdir$ swish-e -c swish.conf + Indexing Data Source: "File-System" + Indexing "/usr/local/apache/htdocs" + Removing very common words... + no words removed. + Writing main index... + Sorting words ... + Sorting 7005 words alphabetically + Writing header ... + Writing index entries ... + Writing word text: Complete + Writing word hash: Complete + Writing word data: Complete + 7005 unique words indexed. + 5 properties sorted. + 124 files indexed. 1485844 total bytes. 171704 total words. + Elapsed time: 00:00:02 CPU time: 00:00:02 + Indexing done! + +Now, verify that the index can be searched: + + ~/swishdir$ swish-e -w install -m 1 + # SWISH format: 2.1-dev-25 + # Search words: install + # Number of hits: 14 + # Search time: 0.001 seconds + # Run time: 0.040 seconds + 1000 htdocs/manual/dso.html "Apache 1.3 Dynamic Shared Object (DSO) support" 17341 + . + +Let's see what files we have in our directory now: + + ~/swishdir$ ls -1 + index.swish-e + index.swish-e.prop + swish.cgi + swish.conf + +=item 3 Test the CGI script + +This is a simple step, but often overlooked. You should test from the command line instead of jumping +ahead and testing with the web server. See the C<DEBUGGING> section below for more information. + + ~/swishdir$ ./swish.cgi | head + Content-Type: text/html; charset=ISO-8859-1 + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> + <html> + <head> + <title> + Search our site + </title> + </head> + <body> + +The above shows that the script can be run directly, and generates a correct HTTP header and HTML. + +If you run the above and see something like this: + + ~/swishdir >./swish.cgi + bash: ./swish.cgi: No such file or directory + +then you probably need to edit the script to point to the correct location of your perl program. +Here's one way to find out where perl is located (again, on unix): + + ~/swishdir$ which perl + /usr/local/bin/perl + + ~/swishdir$ /usr/local/bin/perl -v + This is perl, v5.6.0 built for i586-linux + ... + +Good! We are using a reasonably current version of perl. + +Now that we know perl is at F</usr/local/bin/perl> we can adjust the "shebang" line +in the perl script (e.g. the first line of the script): + + ~/swishdir$ pico swish.cgi + (edit the #! line) + ~/swishdir$ head -1 swish.cgi + #!/usr/local/bin/perl -w + +=item 4 Test with the web server + +How you do this is completely dependent on your web server, and you may need to talk to your web +server admin to get this working. Often files with the .cgi extension are automatically set up to +run as CGI scripts, but not always. In other words, this step is really up to you to figure out! + +This example shows creating a I<symlink> from the web server space to the directory used above. +This will only work if the web server is configured to follow symbolic links (the default for Apache). + +This operation requires root access: + + ~/swishdir$ su -c "ln -s $HOME/swishdir /usr/local/apache/htdocs/swishdir" + Password: ********* + +If your account is on an ISP and your web directory is F<~/public_html> the you might just move the entire +directory: + + mv ~/swishdir ~/public_html + +Now, let's make a real HTTP request: + + ~/swishdir$ GET http://localhost/swishdir/swish.cgi | head -3 + #!/usr/local/bin/perl -w + package SwishSearch; + use strict; + +Oh, darn. It looks like Apache is not running the script and instead returning it as a +static page. Apache needs to be told that swish.cgi is a CGI script. + +F<.htaccess> comes to the rescue: + + ~/swishdir$ cat .htaccess + + # Deny everything by default + Deny From All + + # But allow just CGI script + <files swish.cgi> + Options ExecCGI + Allow From All + SetHandler cgi-script + </files> + +That "Deny From All" prevents access to all files (such as config and index files), and only access is allowed to the +F<swish.cgi> script. + +Let's try the request one more time: + + ~/swishdir >GET http://localhost/swishdir/swish.cgi | head + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> + <html> + <head> + <title> + Search our site + </title> + </head> + <body> + <h2> + <a href="http://swish-e.org"> + +That looks better! Now use your web browser to test. + +Now, you may note that the links are not valid on the search results page. The swish config file +contained the line: + + ReplaceRules remove /usr/local/apache/ + +To make those links works (and assuming your web server will follow symbolic links): + + ~/swishtest$ ln -s /usr/local/apache/htdocs + + +BTW - "GET" used above is a program included with Perl's LWP library. If you do no have this you might +try something like: + + wget -O - http://localhost/swishdir/swish.cgi | head + +and if nothing else, you can always telnet to the web server and make a basic request. + + ~/swishtest$ telnet localhost 80 + Trying 127.0.0.1... + Connected to localhost. + Escape character is '^]'. + GET /swishtest/swish.cgi http/1.0 + + HTTP/1.1 200 OK + Date: Wed, 13 Feb 2002 20:14:31 GMT + Server: Apache/1.3.20 (Unix) mod_perl/1.25_01 + Connection: close + Content-Type: text/html; charset=ISO-8859-1 + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> + <html> + <head> + <title> + Search our site + </title> + </head> + <body> + +This may seem like a lot of work compared to using a browser, but browsers +are a poor tool for basic CGI debugging. + + +=back + +If you have problems check the C<DEBUGGING> section below. + +=head1 CONFIGURATION + +If you want to change the location of the swish-e binary or the index +file, use multiple indexes, add additional metanames and properties, +change the default highlighting behavior, etc., you will need to +adjust the script's configuration settings. + +Again, please get a test setup working with the default parameters before +making changes to any configuration settings. Better to debug one +thing at a time... + +In general, you will need to adjust the script's settings to match the +index file you are searching. For example, if you are indexing a +hypermail list archive you may want to make the script use +metanames/properties of Subject, Author, and, Email address. Or you +may wish to provide a way to limit searches to subsets of documents +(e.g. parts of your directory tree). + +To make things somewhat "simple", the configuration parameters are +included near the top of the swish.cgi program. That is the only +place that the individual parameters are defined and explained, so you +will need to open up the swish.cgi script in an editor to view the +options. Further questions about individual settings should be +referred to the swish-e discussion list. + +The parameters are all part of a perl C<hash> structure, and the +comments at the top of the program should get you going. The perl +hash structure may seem a bit confusing, but it makes it easy to +create nested and complex parameters. Syntax is important, so +cut-n-paste should be your best defense if you are not a perl +programmer. + +By the way, Perl has a number of quote operators. For example, to +quote a string you might write: + + title => 'Search My Site', + +Some options take more than one parameter, where each parameter must +be quoted. For example: + + metanames => [ 'swishdefault', 'swishtitle', 'swishdocpath' ], + +which assigns an array ( [...] ) of three strings to the "metanames" +variable. Lists of quoted strings are so common in perl that there's +a special operator called "qw" (quote word) to save typing all those quotes: + + metanames => [ qw/ swishdefault swishtitle swishdocpath / ], + +or to use the parenthesis as the quote character (you can pick any): + + metanames => [ qw( swishdefault swishtitle swishdocpath ) ], + + +There are two options for changing the configuration settings from +their default values: One way is to edit the script directly, or the +other was is to use a separate configuration file. In either case, +the configuration settings are a basic perl hash reference. + +Using a configuration file is described below, but contains the same hash structure. + +There are many configuration settings, and some of them are commented out either by using +a "#" symbol, or by simply renaming the configuration directive (e.g. by adding an "x" to the parameter +name). + +A very basic configuration setup might look like: + + return { + title => 'Search the Swish-e list', # Title of your choice. + swish_binary => 'swish-e', # Location of swish-e binary + swish_index => 'index.swish-e', # Location of your index file + }; + +Or if searching more than one index: + + return { + title => 'Search the Swish-e list', + swish_binary => 'swish-e', + swish_index => ['index.swish-e', 'index2'], + }; + +Both of these examples return a reference to a perl hash ( C<return +{...}> ). In the second example, the multiple index files are set as +an array reference. + +Note that in the example above the swish-e binary file is relative to +the current directory. If running under mod_perl you will need to use +absolute paths. + +The script can also use the SWISH::API perl module (included with the +swish-e distribution in the F<perl> directory) to access the swish-e +index. The C<use_library> option is used to enable the use of the +SWISH::API module: + + return { + title => 'Search the Swish-e list', + swish_index => ['index.swish-e', 'index2'], + use_library => 1, # enable use of the SWISH::API module + }; + +The module must be available via the @INC array, like all Perl modules. + +Using the SWISH::API module avoids the need to fork and execute a +the swish-e program. Under mod_perl you will may see a significant +performance improvement when using the SWISH::API module. Under +normal CGI usage you will probably not see any speed improvements. + + +B<Using A Configuration File> + +As mentioned above, configuration settings can be either set in the +F<swish.cgi> script, or set in a separate configuration file. +Settings in a configuration file will override the settings in the +script. + +By default, the F<swish.cgi> script will attempt to read settings from the file F<.swishcgi.conf>. +For example, you might only wish to change the title used +in the script. Simply create a file called F<.swishcgi.conf> in the same directory as the CGI script: + + > cat .swishcgi.conf + # Example swish.cgi configuration script. + return { + title => 'Search Our Mailing List Archive', + }; + +The settings you use will depend on the index you create with swish: + + return { + title => 'Search the Apache documentation', + swish_binary => 'swish-e', + swish_index => 'index.swish-e', + metanames => [qw/swishdefault swishdocpath swishtitle/], + display_props => [qw/swishtitle swishlastmodified swishdocsize swishdocpath/], + title_property => 'swishdocpath', + prepend_path => 'http://myhost/apachedocs', + + name_labels => { + swishdefault => 'Search All', + swishtitle => 'Title', + swishrank => 'Rank', + swishlastmodified => 'Last Modified Date', + swishdocpath => 'Document Path', + swishdocsize => 'Document Size', + }, + + }; + +The above configuration defines metanames to use on the form. +Searches can be limited to these metanames. + +"display_props" tells the script to display the property "swishlastmodified" (the last modified +date of the file), the document size, and path with the search results. + +The parameter "name_labels" is a hash (reference) +that is used to give friendly names to the metanames. + +Here's another example. Say you want to search either (or both) the Apache 1.3 documentation and the +Apache 2.0 documentation indexed seperately. + + return { + title => 'Search the Apache Documentation', + date_ranges => 0, + swish_index => [ qw/ index.apache index.apache2 / ], + select_indexes => { + method => 'checkbox_group', + labels => [ '1.3.23 docs', '2.0 docs' ], # Must match up one-to-one to swish_index + description => 'Select: ', + }, + + }; + +Now you can select either or both sets of documentation while searching. + +All the possible settings are included in the default configuration located near the top of the F<swish.cgi> +script. Open the F<swish.cgi> script with an editor to look at the various settings. Contact the Swish-e Discussion list +for help in configuring the script. + + +=head1 DEBUGGING + +Most problems with using this script have been a result of improper configuration. Please +get the script working with default settings before adjusting the configuration settings. + +The key to debugging CGI scripts is to run them from the command line, not with a browser. + +First, make sure the program compiles correctly: + + $ perl -c swish.cgi + swish.cgi syntax OK + +Next, simply try running the program: + + $ ./swish.cgi | head + Content-Type: text/html; charset=ISO-8859-1 + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> + <html> + <head> + <title> + Search our site + </title> + </head> + <body> + +Under Windows you will need to run the script as: + + C:\wwwroot\swishtest> perl swish.cgi + + +Now, you know that the program compiles and will run from the command line. +Next, try accessing the script from a web browser. + +If you see the contents of the CGI script instead of its output then +your web server is not configured to run the script. With Apache look +at settings like ScriptAlias, SetHandler, and Options. + +If an error is reported (such as Internal Server Error or Forbidden) +you need to locate your web server's error_log file and carefully read +what the problem is. Contact your web administrator for help locating +the web server's error log. + +If you don't have access to the web server's error_log file, you can +modify the script to report errors to the browser screen. Open the +script and search for "CGI::Carp". (Author's suggestion is to debug +from the command line -- adding the browser and web server into the +equation only complicates debugging.) + +The script does offer some basic debugging options that allow +debugging from the command line. The debugging options are enabled by +setting an environment variable "SWISH_DEBUG". How that is set +depends on your operating system and the shell you are using. These +examples are using the "bash" shell syntax. + +Note: You can also use the "debug_options" configuration setting, but +the recommended method is to set the environment variable. + +You can list the available debugging options like this: + + $ SWISH_DEBUG=help ./swish.cgi >outfile + Unknown debug option 'help'. Must be one of: + basic: Basic debugging + command: Show command used to run swish + headers: Show headers returned from swish + output: Show output from swish + summary: Show summary of results + dump: Show all data available to templates + +Debugging options may be combined: + + $ SWISH_DEBUG=command,headers,summary ./swish.cgi >outfile + +You will be asked for an input query and the max number of results to return. You can use the defaults +in most cases. It's a good idea to redirect output to a file. Any error messages are sent to stderr, so +those will still be displayed (unless you redirect stderr, too). + +Here are some examples: + + ~/swishtest$ SWISH_DEBUG=basic ./swish.cgi >outfile + Debug level set to: 1 + Enter a query [all]: + Using 'not asdfghjklzxcv' to match all records + Enter max results to display [1]: + + ------ Can't use DateRanges feature ------------ + + Script will run, but you can't use the date range feature + Can't locate Date/Calc.pm in @INC (@INC contains: modules /usr/local/lib/perl5/5.6.0/i586-linux /usr/local/lib/perl5/5.6.0 /usr/local/lib/perl5/site_perl/5.6.0/i586-linux /usr/local/lib/perl5/site_perl/5.6.0 /usr/local/lib/perl5/site_perl/5.005/i586-linux /usr/local/lib/perl5/site_perl/5.005 /usr/local/lib/perl5/site_perl .) at modules/DateRanges.pm line 107, <STDIN> line 2. + BEGIN failed--compilation aborted at modules/DateRanges.pm line 107, <STDIN> line 2. + Compilation failed in require at ./swish.cgi line 971, <STDIN> line 2. + + -------------- + Can't exec "./swish-e": No such file or directory at ./swish.cgi line 1245, <STDIN> line 2. + Child process Failed to exec './swish-e' Error: No such file or directory at ./swish.cgi line 1246, <STDIN> line 2. + Failed to find any results + +The above indicates two problems. First problem is that the Date::Calc module is not installed. +The Date::Calc module is needed to use the date limiting feature of the script. + +The second problem is a bit more serious. It's saying that the script can't find the +swish-e binary file. In this example it's specified as being in the current directory. +Either correct the path to the swish-e binary, or make a local copy or symlink to the +swish-e binary. + + ~/swishtest$ cat .swishcgi.conf + return { + title => 'Search the Apache Documentation', + swish_binary => '/usr/local/bin/swish-e', + date_ranges => 0, + }; + +Now, let's try again: + + ~/swishtest$ SWISH_DEBUG=basic ./swish.cgi >outfile + Debug level set to: 1 + + ---------- Read config parameters from '.swishcgi.conf' ------ + $VAR1 = { + 'date_ranges' => 0, + 'title' => 'Search the Apache Documentation' + }; + ------------------------- + Enter a query [all]: + Using 'not asdfghjklzxcv' to match all records + Enter max results to display [1]: + Found 1 results + + Can't locate SWISH::TemplateDefault.pm in @INC (@INC contains: modules /usr/local/lib/perl5/5.6.0/i586-linux /usr/local/lib/perl5/5.6.0 /usr/local/lib/perl5/site_perl/5.6.0/i586-linux /usr/local/lib/perl5/site_perl/5.6.0 /usr/local/lib/perl5/site_perl/5.005/i586-linux /usr/local/lib/perl5/site_perl/5.005 /usr/local/lib/perl5/site_perl .) at ./swish.cgi line 608. + +This means that the swish.cgi script could not locate a required module. To correct this +locate where the SWISH::Template module is installed and add a "use lib" line to +your configuration file (or to the swish.cgi script): + + + ~/swishtest$ cat .swishcgi.conf + use lib '/home/bill/local/lib/perl'; + + return { + title => 'Search the Apache Documentation', + date_ranges => 0, + }; + + ~/swishtest$ SWISH_DEBUG=basic ./swish.cgi >outfile + Debug level set to: 1 + + ---------- Read config parameters from '.swishcgi.conf' ------ + $VAR1 = { + 'date_ranges' => 0, + 'title' => 'Search the Apache Documentation' + }; + ------------------------- + Enter a query [all]: + Using 'not asdfghjklzxcv' to match all records + Enter max results to display [1]: + Found 1 results + +That is much better! + +The "use lib" statement tells Perl where to look for modules by adding the path supplied +to an array called @INC. + +Note that most modules are in the SWISH namespace. For example, the default output +module is called SWISH::TemplateDefault. When Perl is looking for that module it is looking for +the file F<SWISH/TemplateDefault.pm>. If the "use lib" statement is set as: + + use lib '/home/bill/local/lib/perl'; + +then Perl will look (among other places) for the file + + /home/bill/local/lib/perl/SWISH/TemplateDefault.pm + +when attempting to load the SWISH::TemplateDefault module. Relative paths may also be used. + + use lib 'modules'; + +will cause Perl to look for the file: + + ./modules/SWISH/TemplateDefault.pm + +relative to where the swish.cgi script is running. (This is not true when running under mod_perl). + +Here's another common problem. Everything checks out, but when you run the script you see +the message: + + Swish returned unknown output + +Ok, let's find out what output it is returning: + + ~/swishtest$ SWISH_DEBUG=headers,output ./swish.cgi >outfile + Debug level set to: 13 + + ---------- Read config parameters from '.swishcgi.conf' ------ + $VAR1 = { + 'swish_binary' => '/usr/local/bin/swish-e', + 'date_ranges' => 0, + 'title' => 'Search the Apache Documentation' + }; + ------------------------- + Enter a query [all]: + Using 'not asdfghjklzxcv' to match all records + Enter max results to display [1]: + usage: swish [-i dir file ... ] [-S system] [-c file] [-f file] [-l] [-v (num)] + ... + version: 2.0 + docs: http://sunsite.berkeley.edu/SWISH-E/ + + *** 9872 Failed to run swish: 'Swish returned unknown output' *** + Failed to find any results + +Oh, looks like /usr/local/bin/swish-e is version 2.0 of swish. We need 2.1-dev and above! + +=head1 Frequently Asked Questions + +Here's some common questions and answers. + +=head2 How do I change the way the output looks? + +The script uses a module to generate output. By default it uses the +SWISH::TemplateDefault.pm module. The module used is selected in the +swish.cgi configuration file. Modules are located in the +example/modules/SWISH directory in the distribution, but are installed in +the $prefix/lib/swish-e/perl/SWISH/ directory. + +To make simple changes you can edit the installed SWISH::TemplatDefault +module directly, otherwise make a copy of the module and modify its package +name. For example, change directories to the location of the installed +module and copy the module to a new name: + + $ cp TemplateDefault.pm MyTemplateDefault.pm + +Then at the top of the module adjust the "package" line to: + + package SWISH::MyTemplateDefault; + +To use this modules you need to adjust the configuration settings (either at +the top of F<swish.cgi> or in a configuration file: + + + template => { + package => 'SWISH::MyTemplateDefault', + }, + +The module does not need to be in the SWISH namespace, and can be stored in +any location as long as the module can be found via the @INC array (i.e. +modify the "use lib" statement in swish.cgi if needed). + + +=head2 How do I use a templating system with swish.cgi? + +In addition to the TemplateDefault.pm module, the swish-e distribution includes two other Perl modules for +generating output using the templating systems HTML::Template and Template-Toolkit. + +Templating systems use template files to generate the HTML, and make maintaining the look of a large (or small) site +much easier. HTML::Template and Template-Toolkit are separate packages and can be downloaded from the CPAN. +See http://search.cpan.org. + +Two basic templates are provided as examples for generating output using these templating systems. +The example templates are located in the F<example> directory. +The module F<SWISH::TemplateHTMLTemplate> uses the file F<swish.tmpl> to generate its output, while the +module F<SWISH::TemplateToolkit> uses the F<swish.tt> file. +(Note: swish.tt was renamed from search.tt Jun 03, 2004.) + +To use either of these modules you will need to adjust the "template" configuration setting. Examples for +both templating systems are provided in the configuration settings near the top of the F<swish.cgi> program. + +Use of these modules is an advanced usage of F<swish.cgi> and are provided as examples only. + +All of the output generation modules are passed a hash with the results from the search, plus other data use to create the +output page. You can see this hash by using the debugging option "dump" or by using the included SWISH::TemplateDumper +module: + + ~/swishtest >cat .swishcgi.conf + return { + title => 'Search the Apache Documentation', + template => { + package => 'SWISH::TemplateDumper', + }, + }; + +And run a query. For example: + + http://localhost/swishtest/swish.cgi?query=install + +=head2 Why are there three different highlighting modules? + +Three are three highlighting modules included with the swish-e distribution. +Each is a trade-off of speed vs. accuracy: + + SWISH::DefaultHighlight - reasonably fast, but does not highlight phrases + SWISH::PhraseHighlight - reasonably slow, but is reasonably accurate + SWISH::SimpleHighlight - fast, some phrases, but least accurate + +Eh, the default is actually "PhraseHighlight". Oh well. + +All of the highlighting modules slow down the script. Optimizations to these modules are welcome! + +=head2 My ISP doesn't provide access to the web server logs + +There are a number of options. One way it to use the CGI::Carp module. Search in the +swish.cgi script for: + + use Carp; + # Or use this instead -- PLEASE see perldoc CGI::Carp for details + # use CGI::Carp qw(fatalsToBrowser warningsToBrowser); + +And change it to look like: + + #use Carp; + # Or use this instead -- PLEASE see perldoc CGI::Carp for details + use CGI::Carp qw(fatalsToBrowser warningsToBrowser); + +This should be only for debugging purposes, as if used in production you may end up sending +quite ugly and confusing messages to your browsers. + +=head2 Why does the output show (NULL)? + +Swish-e displays (NULL) when attempting to display a property that does not exist in the index. + +The most common reason for this message is that you did not use StoreDescription in your config file while indexing. + + StoreDescription HTML* <body> 200000 + +That tells swish to store the first 200,000 characters of text extracted from the body of each document parsed +by the HTML parser. The text is stored as property "swishdescription". + +The index must be recreated after changing the swish-e configuration. + +Running: + + ~/swishtest > ./swish-e -T index_metanames + +will display the properties defined in your index file. + +This can happen with other properties, too. +For example, this will happen when you are asking for a property to display that is not defined in swish. + + ~/swishtest > ./swish-e -w install -m 1 -p foo + # SWISH format: 2.1-dev-25 + # Search words: install + err: Unknown Display property name "foo" + . + + ~/swishtest > ./swish-e -w install -m 1 -x 'Property foo=<foo>\n' + # SWISH format: 2.1-dev-25 + # Search words: install + # Number of hits: 14 + # Search time: 0.000 seconds + # Run time: 0.038 seconds + Property foo=(NULL) + . + +To check that a property exists in your index you can run: + + ~/swishtest > ./swish-e -w not dkdk -T index_metanames | grep foo + foo : id=10 type=70 META_PROP:STRING(case:ignore) *presorted* + +Ok, in this case we see that "foo" is really defined as a property. Now let's make sure F<swish.cgi> +is asking for "foo" (sorry for the long lines): + + ~/swishtest > SWISH_DEBUG=command ./swish.cgi > /dev/null + Debug level set to: 3 + Enter a query [all]: + Using 'not asdfghjklzxcv' to match all records + Enter max results to display [1]: + ---- Running swish with the following command and parameters ---- + ./swish-e \ + -w \ + 'swishdefault=(not asdfghjklzxcv)' \ + -b \ + 1 \ + -m \ + 1 \ + -f \ + index.swish-e \ + -s \ + swishrank \ + desc \ + swishlastmodified \ + desc \ + -x \ + '<swishreccount>\t<swishtitle>\t<swishdescription>\t<swishlastmodified>\t<swishdocsize>\t<swishdocpath>\t<fos>\t<swishrank>\t<swishdocpath>\n' \ + -H \ + 9 + +If you look carefully you will see that the -x parameter has "fos" instead of "foo", so there's our problem. + +=head2 How do I use the SWISH::API perl module with swish.cgi? + +Use the C<use_library> configuration directive: + + use_library => 1, + +This will only provide improved performance when running under mod_perl or other persistent +environments. + +=head2 Why does the "Run time" differ when using the SWISH::API module + +When using the SWISH::API module the run (and search) times are calculated +within the script. When using the swish-e binary the swish-e program reports the +times. The "Run time" may include the time required to load and compile the SWISH::API +module. + +=head1 MOD_PERL + +This script can be run under mod_perl (see http://perl.apache.org) +This will improve the response time of the script compared to running under CGI by loading the +swish.cgi script into the Apache web server. + +You must have a mod_perl enabled Apache server to run this script under mod_perl. + +Configuration is simple. In your httpd.conf or your startup.pl file you need to +load the script. For example, in httpd.conf you can use a perl section: + + <perl> + use lib '/usr/local/apache/cgi-bin'; # location of the swish.cgi file + use lib '/home/yourname/swish-e/example/modules'; # modules required by swish.cgi + require "swish.cgi"; + </perl> + +Again, note that the paths used will depend on where you installed the script and the modules. +When running under mod_perl the swish.cgi script becomes a perl module, and therefore the script +does not need to be installed in the cgi-bin directory. (But, you can actually use the same script as +both a CGI script and a mod_perl module at the same time, read from the same location.) + +The above loads the script into mod_perl. Then to configure the script to run add this to your httpd.conf +configuration file: + + <location /search> + PerlSetVar Swish_Conf_File /home/yourname/swish-e/myconfig.pl + allow from all + SetHandler perl-script + PerlHandler SwishSearch + </location> + +Note that you use the "Swish_Conf_File" setting in httpd.conf to tell the script +which config file to use. This means you can use the same script (and loaded modules) +for different search sites (running on the same Apache server). You can just specify +differnt config files for each Location and they can search different indexes and +have a completely different look for each site, but all share the same code. + +B<Note> that the config files are cached in the swish.cgi script. Changes to the config file +will require restarting the Apache server before they will be reloaded into the swish.cgi +script. This avoids calling stat() for every request. + +Unlike CGI, mod_perl does not change the current directory to the location of the script, so +your settings for the swish binary and the path to your index files must be absolute +paths (or relative to the server root). + +Using the SWISH::API module with mod_perl will provide the most performance improvements. +Use of the SWISH::API module can be enabled by the configuration setting C<use_library>: + + use_library => 1, + +Without highlighting code enabled, using the SWISH::API module resulted in about 20 requests +per second, where running the swish-e binary slowed the script down to about 8 requests per second. + +Note that the highlighting code is slow. For the best search performance turn off highlighting. +In your config file you can add: + + highlighting => 0, # disable highlighting + +and the script will show the first 500 chars of the description (or whatever you set for "max_chars"). +Without highlight one test was processing about 20 request per second. +With The "PhraseHighlight" module that dropped to a little better than two requests per second, +"DefaultHighlight" was about 2.3 request per second, and "SimpleHighlight" was about 6 request per second. + +Experiement with different highlighting options when testing performance. + +Please post to the swish-e discussion list if you have any questions about running this +script under mod_perl. + +Here's some general request/second on an Athlon XP 1800+ with 1/2GB RAM, Linux 2.4.20. + + Highlighting Mode + + None Phrase Default Simple + Using SWISH::API 45 1.5 2 12 + ---------------------------------------------------------------------------- + Using swish-e 12 1.3 1.8 7.5 + binary + +As you can see the highlighting code is a limiting factor. + +=head1 SpeedyCGI + +SpeedyCGI (also called PersistentPerl) is another way to run Perl scripts persistently. +SpeedyCGI is good if you do not have mod_perl available or do not have root access. +SpeedyCGI works on Unix systems by loading the script into a "back end" process and keeping +it in memory between requests. New requests are passed to the back end processes which avoids +the startup time required by a Perl CGI script. + +Install SpeedyCGI from http://daemoninc.com/ (your OS may provide a packaged version of +SpeedyCGI) and then change the first line of swish.cgi. For example, if the speedy binary is +installed in /usr/bin/speedy, use the line: + + #! /usr/bin/speedy -w -- -t60 + +The -w option is passed to Perl, and all options following the double-dash are SpeedyCGI options. + +Note that when using SpeedyCGI configuration data is cached in memory. If you change the swish.cgi +configuration file (.swishcgi.conf) then touch the main swish.cgi script to force reloading of +configuration data. + +=head1 Spidering + +There are two ways to spider with swish-e. One uses the "http" input method that uses code that's +part of swish. The other way is to use the new "prog" method along with a perl helper program called +C<spider.pl>. + +Here's an example of a configuration file for spidering with the "http" input method. +You can see that the configuration is not much different than the file system input method. +(But, don't use the http input method -- use the -S prog method shown below.) + + # Define what to index + IndexDir http://www.myserver.name/index.html + IndexOnly .html .htm + + IndexContents HTML* .html .htm + DefaultContents HTML* + StoreDescription HTML* <body> 200000 + MetaNames swishdocpath swishtitle + + # Define http method specific settings -- see swish-e documentation + SpiderDirectory ../swish-e/src/ + Delay 0 + +You index with the command: + + swish-e -S http -c spider.conf + +Note that this does take longer. For example, spidering the Apache documentation on +a local web server with this method took over a minute, where indexing with the +file system took less than two seconds. Using the "prog" method can speed this up. + +Here's an example configuration file for using the "prog" input method: + + # Define the location of the spider helper program + IndexDir ../swish-e/prog-bin/spider.pl + + # Tell the spider what to index. + SwishProgParameters default http://www.myserver.name/index.html + + IndexContents HTML* .html .htm + DefaultContents HTML* + StoreDescription HTML* <body> 200000 + MetaNames swishdocpath swishtitle + +Then to index you use the command: + + swish-e -c prog.conf -S prog -v 0 + +Spidering with this method took nine seconds. + + +=head1 Stemmed Indexes + +Many people enable a feature of swish called word stemming to provide +"fuzzy" search options to their users. The stemming code does not +actually find the "stem" of word, rather removes and/or replaces +common endings on words. Stemming is far from perfect, and many words +do not stem as you might expect. Plus, currently only English is +supported. But, it can be a helpful tool for searching your site. +You may wish to create both a stemmed and non-stemmed index, and +provide a checkbox for selecting the index file. + +To enable a stemmed index you simply add to your configuration file: + + UseStemming yes + +If you want to use a stemmed index with this program and continue to highlight search terms you will need +to install a perl module that will stem words. This section explains how to do this. + +The perl module is included with the swish-e distribution. It can be found in the examples directory (where +you found this file) and called something like: + + SWISH-Stemmer-0.05.tar.gz + +The module should also be available on CPAN (http://search.cpan.org/) + +Here's an example session for installing the module. (There will be quite a bit of output +when running make.) + + + % gzip -dc SWISH-Stemmer-0.05.tar.gz |tar xof - + % cd SWISH-Stemmer-0.05 + % perl Makefile.PL + or + % perl Makefile.PL PREFIX=$HOME/perl_lib + % make + % make test + + (perhaps su root at this point if you did not use a PREFIX) + % make install + % cd .. + +Use the B<PREFIX> if you do not have root access or you want to install the modules +in a local library. If you do use a PREFIX setting, add a C<use lib> statement to the top of this +swish.cgi program. + +For example: + + use lib qw( + /home/bmoseley/perl_lib/lib/site_perl/5.6.0 + /home/bmoseley/perl_lib/lib/site_perl/5.6.0/i386-linux/ + ); + +Once the stemmer module is installed, and you are using a stemmed index, the C<swish.cgi> script will automatically +detect this and use the stemmer module. + +=head1 DISCLAIMER + +Please use this CGI script at your own risk. + +This script has been tested and used without problem, but you should still be aware that +any code running on your server represents a risk. If you have any concerns please carefully +review the code. + +See http://www.w3.org/Security/Faq/www-security-faq.html + +Security on Windows questionable. + +=head1 SUPPORT + +The SWISH-E discussion list is the place to ask for any help regarding SWISH-E or this example +script. See http://swish-e.org. + +Before posting please review: + + http://swish-e.org/2.2/docs/INSTALL.html#When_posting_please_provide_the_ + +Please do not contact the author or any of the swish-e developers directly. + +=head1 LICENSE + +swish.cgi $Revision: 1.22 $ Copyright (C) 2001 Bill Moseley search(a)hank.org +Example CGI program for searching with SWISH-E + + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version +2 of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + + +=head1 AUTHOR + +Bill Moseley + +=cut + + Property changes on: scripts/redmine-tools/swish.cgi ___________________________________________________________________ Added: svn:executable + *

1 0

r13 - scripts/maven-release
by maven-release＠users.forge.codelutin.com Jan. 17, 2014

Jan. 17, 2014

Author: maven-release Date: 2014-01-17 21:42:02 +0100 (Fri, 17 Jan 2014) New Revision: 13 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/13 Log: fixes #3653: Mettre en place le script de deploy sur demo via un GAV 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-01-17 20:30:17 UTC (rev 12) +++ scripts/maven-release/deploy-to-demo-from-GAV.sh 2014-01-17 20:42:02 UTC (rev 13) @@ -54,7 +54,7 @@ VERSION= PACKAGING=war CLASSIFIER= -DEPLOY_FILE +DEPLOY_FILE=deploy while getopts ":g:a:v:c:p:e:hbd" opt; do case $opt in

1 0

r12 - scripts/maven-release
by maven-release＠users.forge.codelutin.com Jan. 17, 2014

Jan. 17, 2014

Author: maven-release Date: 2014-01-17 21:30:17 +0100 (Fri, 17 Jan 2014) New Revision: 12 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/12 Log: fixes #3653: Mettre en place le script de deploy sur demo via un GAV Added: scripts/maven-release/deploy-to-demo-from-GAV.pom Modified: scripts/maven-release/deploy-to-demo-from-GAV.sh Added: scripts/maven-release/deploy-to-demo-from-GAV.pom =================================================================== --- scripts/maven-release/deploy-to-demo-from-GAV.pom (rev 0) +++ scripts/maven-release/deploy-to-demo-from-GAV.pom 2014-01-17 20:30:17 UTC (rev 12) @@ -0,0 +1,150 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <groupId>com.codelutin</groupId> + <artifactId>deploy-to-demo-from-GAV</artifactId> + <version>1.0</version> + <packaging>pom</packaging> + + <inceptionYear>2014</inceptionYear> + <organization> + <name>Code Lutin</name> + <url>http://www.codelutin.com/</url> + </organization> + + <licenses> + <license> + <name>General Public License (GPL)</name> + <url>http://www.gnu.org/licenses/gpl.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + + <developers> + <developer> + <id>chemit</id> + <name>Tony Chemit</name> + <email>chemit at codelutin dot com</email> + <organization>CodeLutin</organization> + <organizationUrl>http://www.codelutin.com</organizationUrl> + <roles> + <role>developer</role> + </roles> + <timezone>Europe/Paris</timezone> + </developer> + </developers> + + <properties> + <packaging>war</packaging> + <classifier/> + </properties> + + <build> + + <defaultGoal>validate</defaultGoal> + + <pluginManagement> + <plugins> + + <plugin> + <artifactId>maven-enforcer-plugin</artifactId> + <version>1.3.1</version> + </plugin> + + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.8</version> + </plugin> + </plugins> + </pluginManagement> + + <plugins> + <plugin> + <artifactId>maven-enforcer-plugin</artifactId> + <executions> + <execution> + <id>check-properties</id> + <goals> + <goal>enforce</goal> + </goals> + <phase>validate</phase> + <configuration> + <rules> + <requireProperty> + <property>groupId</property> + <message>You must set a groupId property!</message> + </requireProperty> + <requireProperty> + <property>artifactId</property> + <message>You must set a artifactId property!</message> + </requireProperty> + <requireProperty> + <property>version</property> + <message>You must set a version property!</message> + </requireProperty> + <requireProperty> + <property>file</property> + <message>You must set a file property!</message> + </requireProperty> + </rules> + <ignoreCache>true</ignoreCache> + <failFast>true</failFast> + <fail>true</fail> + + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>get-war</id> + <goals> + <goal>get</goal> + </goals> + <phase>validate</phase> + <configuration> + <groupId>${groupId}</groupId> + <artifactId>${artifactId}</artifactId> + <version>${version}</version> + <destination>${file}</destination> + <packaging>${packaging}</packaging> + <classifier>${classifier}</classifier> + <transitive>false</transitive> + <remoteRepositories> + http://nexus.nuiton.org/nexus/content/repositories/other-releases + </remoteRepositories> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> Modified: scripts/maven-release/deploy-to-demo-from-GAV.sh =================================================================== --- scripts/maven-release/deploy-to-demo-from-GAV.sh 2014-01-17 17:18:41 UTC (rev 11) +++ scripts/maven-release/deploy-to-demo-from-GAV.sh 2014-01-17 20:30:17 UTC (rev 12) @@ -1,5 +1,6 @@ #!/bin/sh -# script to update rev using the pom version + the svn revision +# to deploy a application to demo using a GAV +# OLD_PATH=$(pwd) APPLICATION_NAME=$(basename $OLD_PATH) @@ -17,16 +18,19 @@ print_usage_and_exit() { echo "-----------------------------------------------------------------------------------" - echo "usage $(basename $0) [-h] [-b] [-d] [-k] [-m extraBuildParameters] [-r svnRevision] deployType" + echo "usage $(basename $0) [-h] [-b] [-d] [-c classifier] [-p packaging] [-e deployFile] -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 " -k to keep incoming project version (do not transform version using the svn revision)" - echo " -m extraBuildParameters (add extra parameters to maven build)" - echo " -r svnRevision (update svn to a specific revision, by default use HEAD)" + 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 " -g groupId groupId of war to collect" + echo " -a artifactId artifactId of war to collect" + 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 -m\"-DperformRelease -Preporting\" -r101010 latest" + echo "example: $(basename $0) -b -s cerqual-nexus-repository -g fr.cerqual -a nflogement-extranet-web -v 1.1.5 latest" echo "-----------------------------------------------------------------------------------" bye_bye $1 @@ -41,14 +45,18 @@ echo "OK" fi } -echo -n "0/4 Check options and prepare svn..." -MAVEN_BUILD="clean install -Pcollect-deploy-files" -SVN_REV="HEAD" -KEEP_VERSION=0 # 0 when transform version using svn revision, 1 keep incoming version +echo -n "1/3 Check and prepare options..." BATCH_MODE=0 # 0 when interactive, 1 when batch mode DRY_RUN=0 # 0 when execute, 1 when dry run -while getopts ":m:r:hbdk" opt; do +GROUP_ID= +ARTIFACT_ID= +VERSION= +PACKAGING=war +CLASSIFIER= +DEPLOY_FILE + +while getopts ":g:a:v:c:p:e:hbd" opt; do case $opt in h) echo "OK" @@ -60,15 +68,24 @@ d) DRY_RUN=1 ;; - k) - KEEP_VERSION=1 + g) + GROUP_ID=$OPTARG ;; - m) - MAVEN_BUILD="$MAVEN_BUILD $OPTARG" + a) + ARTIFACT_ID=$OPTARG ;; - r) - SVN_REV="$OPTARG" + v) + VERSION=$OPTARG + ;; + p) + PACKAGING=$OPTARG ;; + c) + CLASSIFIER=$OPTARG + ;; + e) + DEPLOY_FILE=$OPTARG + ;; \?) echo "KO" echo "Invalid option: -$OPTARG" >&2 @@ -100,9 +117,9 @@ # check deploy structure cd $DEPLOY_TYPE -if [ ! -f deploy ]; then +if [ ! -f $DEPLOY_FILE ]; then echo "KO" - echo "Could not find $DEPLOY_TYPE/deploy file" + echo "Could not find $DEPLOY_TYPE/$DEPLOY_FILE file" bye_bye 1 fi if [ ! -f config ]; then @@ -110,58 +127,36 @@ echo "Could not find $DEPLOY_TYPE/config file" bye_bye 1 fi -if [ ! -d svn ]; then - echo "Could not find $DEPLOY_TYPE/svn directory" - bye_bye 1 -fi -cd svn - -# revert svn -svn revert -R . --non-interactive > /dev/null +FILE=$GROUP_ID-$ARTIFACT_ID-$CLASSIFIER-$VERSION.$PACKAGING -# update svn -svn up -r$SVN_REV --non-interactive > /dev/null - -# get subversion revision -REV=`svn info . | grep "vision" | head -n 1 | cut -d':' -f2 | sed 's/^ *//g'` - -# get project version -VERSION=`xmlstarlet sel -N "p=http://maven.apache.org/POM/4.0.0" -t -v "/p:project/p:version" pom.xml` - -# get new version -if [ $KEEP_VERSION -eq 1 ]; then - NEW_VERSION=$VERSION -else - NEW_VERSION=`${M2_HOME}/bin/mvn -N helper:transform-project-version -Dhelper.newVersionPattern="#V-rev#R" -Dhelper.revision=$REV -DhelperPluginVersion=2.0 -Dhelper.versionKey=deployKey help:evaluate -Dexpression=deployKey | grep -v "\[" | grep "-rev" | grep -v "Download"` -fi - echo "OK" echo "----------------------------------------------------------" echo "--- Deploy summary ---------------------------------------" echo "----------------------------------------------------------" -echo "- application = $APPLICATION_NAME" -echo "- deployType = $DEPLOY_TYPE" +echo "- application = $APPLICATION_NAME" +echo "- deployType = $DEPLOY_TYPE" +echo "- GAV = $GROUP_ID:$ARTIFACT_ID:$PACKAGING:$VERSION" if [ $BATCH_MODE -eq 1 ]; then - echo "- batchMode = ON" + echo "- batchMode = ON" fi if [ $DRY_RUN -eq 1 ]; then - echo "- dryRun = ON" + echo "- dryRun = ON" fi -if [ $KEEP_VERSION -eq 1 ]; then - echo "- keepVersion = ON" +if [ ! "$CLASSIFIER" = "" ]; then + echo "- classifier = $CLASSIFIER" fi -echo "- revision detected = $REV" -echo "- version detected = $VERSION" -echo "- new version = $NEW_VERSION" -echo "- build parameters = $MAVEN_BUILD" +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" ]; then + if [ ! -z "$r" -o "$r" = "Y" -o "$r" = "y" ]; then echo "User cancel operation" bye_bye 1 fi @@ -170,41 +165,28 @@ # log file LOG_FILE=/tmp/deploy-to-demo-$APPLICATION_NAME-$DEPLOY_TYPE.log -# change version in pom.xml -echo -n "1/4 Change to version $NEW_VERSION..." -if [ $KEEP_VERSION -eq 1 ]; then - echo "OK (keep version, skip this step)" -else - ${M2_HOME}/bin/mvn versions:set -DnewVersion=$NEW_VERSION > $LOG_FILE - test_ok_or_bye_bye $? "Error while executing '${M2_HOME}/bin/mvn versions:set -DnewVersion=$NEW_VERSION'" -fi +# 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" +${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 ..." -# build application -echo -n "2/4 Build application..." -${M2_HOME}/bin/mvn $MAVEN_BUILD > $LOG_FILE -test_ok_or_bye_bye $? "Error while executing '${M2_HOME}/bin/mvn $MAVEN_BUILD'" +echo -n "3/3 Deploy to demo..." -cd .. - -echo -n "3/4 Deploy to demo..." - if [ $DRY_RUN -eq 1 ]; then echo "OK (dry run, skip this step)" else # build the curl deploy options DEPLOY_ARGS="-s " - for i in $(cat deploy); do + for i in $(cat $DEPLOY_FILE); do DEPLOY_ARGS="$DEPLOY_ARGS -F \"$i\""; done - for i in $(cat svn/target/collect-deploy-files.txt); do - DEPLOY_ARGS="$DEPLOY_ARGS -F \"APP_WAR=@$i\"" - continue - done + DEPLOY_ARGS="$DEPLOY_ARGS -F \"APP_WAR=@$FILE\"" # Create a file to execute the curl command (pb with @ in bash execution...) DEPLOY_ARGS="$DEPLOY_ARGS http://demo-ng.codelutin.com/deploy.cgi" - DEPLOY_COMMAND=/tmp/deploy-to-demo-curl-$APPLICATION_NAME.sh + DEPLOY_COMMAND=/tmp/deploy-to-demo-curl-$APPLICATION_NAME-$DEPLOY_TYPE.sh cat << EOF > $DEPLOY_COMMAND curl $DEPLOY_ARGS EOF @@ -222,9 +204,4 @@ test_ok_or_bye_bye $? "Could not deploy to demo" fi -# revert any change -echo -n "4/4 Revert local modifications..." -svn revert -R svn > /dev/null -echo "OK" - bye_bye 0

1 0

r11 - in scripts/maven-release: . legacy legacy/backup
by tchemit＠users.forge.codelutin.com Jan. 17, 2014

Jan. 17, 2014

Author: tchemit Date: 2014-01-17 18:18:41 +0100 (Fri, 17 Jan 2014) New Revision: 11 Url: http://forge.codelutin.com/projects/adminsys/repository/revisions/11 Log: mise en place de scripts pour maven-release Added: scripts/maven-release/deploy-nightly-builds-to-demo.sh scripts/maven-release/deploy-snapshot-site.sh scripts/maven-release/deploy-to-demo-from-GAV.sh scripts/maven-release/deploy-to-demo-from-SVN.sh scripts/maven-release/isis-fish-docs-site.sh scripts/maven-release/legacy/ scripts/maven-release/legacy/backup/ scripts/maven-release/legacy/backup/deploy-to-demo.sh scripts/maven-release/legacy/backup/deploy-to-demo2.sh scripts/maven-release/legacy/deploy-by-curl.sh scripts/maven-release/legacy/deploy-demo.sh scripts/maven-release/legacy/deploy-sandra-to-glon.sh scripts/maven-release/legacy/deploy-to-BETA.sh scripts/maven-release/legacy/deploy-to-demo-BETA.sh scripts/maven-release/legacy/deploy-to-demo-ng.sh scripts/maven-release/legacy/deploy-to-demo-ng2.sh scripts/maven-release/legacy/deploy-to-demo.sh scripts/maven-release/legacy/deploy-to-demo2-ng.sh scripts/maven-release/legacy/deploy-to-demo2.sh scripts/maven-release/legacy/deploy-to-glon-BETA.sh scripts/maven-release/legacy/deploy-to-latest.sh scripts/maven-release/legacy/mavenpom-update.sh scripts/maven-release/legacy/mmvn.sh scripts/maven-release/legacy/svn-update.sh scripts/maven-release/mvn-ep.sh Added: scripts/maven-release/deploy-nightly-builds-to-demo.sh =================================================================== --- scripts/maven-release/deploy-nightly-builds-to-demo.sh (rev 0) +++ scripts/maven-release/deploy-nightly-builds-to-demo.sh 2014-01-17 17:18:41 UTC (rev 11) @@ -0,0 +1,26 @@ +#! /bin/sh +MAILTO=dev(a)codelutin.com + +# construit et deploie les applications pour tous les projets marque dans /var/cache/redmine/nightly-build/x/y.deploy-demo +# 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 l'application deployée, on supprimer le fichier de marquage + +cachedir=/var/cache/redmine/nightly-build +logdir=/var/log/deploy-nightly-builds-to-demo +for forge in $( ls $cachedir ) ; do + for f in $( ls $cachedir/$forge | grep .deploy-demo ) ; do + project=$(basename $f .deploy-demo) + logfile="$logdir/$forge-$project.log" + date >> $logfile + msgerror="Problème de construction ou déploiement du projet '$project' de la forge '$forge'.\nPlus de détails sur goh dans $logfile" + if [ -x /home/maven-release/projets/$forge/$project/deploy-latest-to-demo.sh ]; then + cd /home/maven-release/projets/$forge/$project/ + ./deploy-latest-to-demo.sh >> $logfile 2>&1 || echo -e $msgerror + else + echo "Script de déploiement (deploy-latest-to-demo.sh) manquant ou non exécutable" >> $logfile + fi + rm -rfv $cachedir/$forge/$f >> $logfile + done +done + Property changes on: scripts/maven-release/deploy-nightly-builds-to-demo.sh ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: scripts/maven-release/deploy-snapshot-site.sh =================================================================== --- scripts/maven-release/deploy-snapshot-site.sh (rev 0) +++ scripts/maven-release/deploy-snapshot-site.sh 2014-01-17 17:18:41 UTC (rev 11) @@ -0,0 +1,120 @@ +#! /bin/sh + +print_usage_and_exit() { + echo "-----------------------------------------------------------------------------------" + echo "usage $(basename $0) forge projectName [-h] [-d deployType] [-m extraBuildParameters]" + echo " forge (possible values : nuiton.org | chorem.org | forge.codelutin.com)" + echo " projectName (the directory name of the project in ~/projes/forge)" + echo " -h show usage and exit" + echo " -d deployType (deployType directory where to find svn)" + echo " -m extraBuildParameters (add extra parameters to maven build)" + echo "" + echo "example: $(basename $0) nuiton.org nuiton-utils" + echo "example: $(basename $0) chorem.org pollen -d latest -m\"-DperformRelease -Preporting\"" + echo "-----------------------------------------------------------------------------------" + + exit $1 +} + +# Deploy trunk site + +if [ $# -lt 2 ]; then + echo "Need at least 2 parameters" + print_usage_and_exit 1 +fi + +# Forge of the project +forge=$1 +shift + +# Project name +projectName=$1 +shift + +# deploy type +deployType="" + +# extra build params +extraBuildParams="" + +while getopts ":d:m:h" opt; do + case $opt in + h) + print_usage_and_exit 0 + ;; + d) + deployType="$OPTARG" + ;; + m) + extraBuildParams="$OPTARG" + ;; + \?) + echo "Option non reconnue: -$OPTARG" >&2 + print_usage_and_exit 1 + ;; + :) + echo "L'option -$OPTARG nécessite un argument." >&2 + print_usage_and_exit 1 + ;; + + esac +done + +# location of the project +dir=~/projets/$forge/$projectName/$deployType + +if [ ! -d $dir ]; then + + echo "Répertoire non trouvé $dir" + print_usage_and_exit 1 +fi + +if [ -z "$deployType" -a -d "$dir"latest ]; then + # for deploy-to-demo projects (by default use latest deploy type if none is specifiy) + dir="$dir"latest +fi + +if [ -d $dir/svn ]; then + # for deploy-to-demo projects (add the svn directoy) + dir=$dir/svn +fi + +echo "deploy trunk site from '$dir' (extra build params: $extraBuildParams)" +cd $dir + +# alway revert +svn revert -R . + +# always up to HEAD +svn up -rHEAD + +# Get project url +projectUrl=`xmlstarlet sel -N "p=http://maven.apache.org/POM/4.0.0" -t -v "/p:project/p:url" pom.xml` + +if [ -z $projectUrl ]; then + echo "pas de project.url trouvé dans le pom $dir"pom.xml + exit 1 +fi + +projectUrl=$projectUrl/SNAPSHOT +echo "project url : $projectUrl" + +# Get site deployement url +deployUrl=`xmlstarlet sel -N "p=http://maven.apache.org/POM/4.0.0" -t -v "/p:project/p:distributionManagement/p:site/p:url" pom.xml` + +if [ -z $deployUrl ]; then + echo "pas de project/distributionManagement/site/url trouvé dans le pom $dir/pom.xml" + exit 1 +fi + +deployUrl=$deployUrl/SNAPSHOT +echo "deploy url : $deployUrl" + +# Update pom project url and deploy url +xmlstarlet ed -P -S -N "p=http://maven.apache.org/POM/4.0.0" -u "/p:project/p:url" -v "$projectUrl" -u "/p:project/p:distributionManagement/p:site/p:url" -v "$deployUrl" pom.xml > pom.xml2 && mv pom.xml2 pom.xml + +# launch site-deploy +/opt/maven/bin/mvn clean verify site-deploy -DperformRelease $extraBuildParams + +# revert pom +svn revert pom.xml Property changes on: scripts/maven-release/deploy-snapshot-site.sh ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: scripts/maven-release/deploy-to-demo-from-GAV.sh =================================================================== --- scripts/maven-release/deploy-to-demo-from-GAV.sh (rev 0) +++ scripts/maven-release/deploy-to-demo-from-GAV.sh 2014-01-17 17:18:41 UTC (rev 11) @@ -0,0 +1,230 @@ +#!/bin/sh +# script to update rev using the pom version + the svn revision + +OLD_PATH=$(pwd) +APPLICATION_NAME=$(basename $OLD_PATH) + +DEPLOY_TYPES=$(find * -maxdepth 0 -type d -printf " %p") + +export JAVA_HOME=/opt/jdk +export JDK_HOME=$JAVA_HOME +export M2_HOME=/opt/maven + +bye_bye() { + cd $OLD_PATH + exit $1 +} + +print_usage_and_exit() { + echo "-----------------------------------------------------------------------------------" + echo "usage $(basename $0) [-h] [-b] [-d] [-k] [-m extraBuildParameters] [-r svnRevision] deployType" + echo " -h show usage and exit" + echo " -b for batch mode (no question asked)" + echo " -d for dryRun mode (nothing is deployed)" + echo " -k to keep incoming project version (do not transform version using the svn revision)" + echo " -m extraBuildParameters (add extra parameters to maven build)" + echo " -r svnRevision (update svn to a specific revision, by default use HEAD)" + echo " deployType type of deploy to do (must be one amoung [$DEPLOY_TYPES])" + echo "" + echo "example: $(basename $0) -b -m\"-DperformRelease -Preporting\" -r101010 latest" + echo "-----------------------------------------------------------------------------------" + + bye_bye $1 +} + +test_ok_or_bye_bye() { + if [ $1 -eq 1 ]; then + echo "KO" + echo "$2 (see at $LOG_FILE)" + bye_bye 1 + else + echo "OK" + fi +} +echo -n "0/4 Check options and prepare svn..." + +MAVEN_BUILD="clean install -Pcollect-deploy-files" +SVN_REV="HEAD" +KEEP_VERSION=0 # 0 when transform version using svn revision, 1 keep incoming version +BATCH_MODE=0 # 0 when interactive, 1 when batch mode +DRY_RUN=0 # 0 when execute, 1 when dry run +while getopts ":m:r:hbdk" opt; do + case $opt in + h) + echo "OK" + print_usage_and_exit 0 + ;; + b) + BATCH_MODE=1 + ;; + d) + DRY_RUN=1 + ;; + k) + KEEP_VERSION=1 + ;; + m) + MAVEN_BUILD="$MAVEN_BUILD $OPTARG" + ;; + r) + SVN_REV="$OPTARG" + ;; + \?) + echo "KO" + echo "Invalid option: -$OPTARG" >&2 + print_usage_and_exit 1 + ;; + :) + echo "KO" + echo "Option -$OPTARG requires an argument." >&2 + print_usage_and_exit 1 + ;; + esac + shift $((OPTIND-1)) +done + +# must have a last mandatory parameter +if [ ! $# -eq 1 ]; then + echo "KO" + echo "Mandatory deploy type not given" + print_usage_and_exit 1 +fi +DEPLOY_TYPE="$1" + +# check deploy type exist +if [ ! -d $DEPLOY_TYPE ]; then + echo "KO" + echo "Could not find deploy type $DEPLOY_TYPES (available: $DEPLOY_TYPES)" + bye_bye 1 +fi + +# check deploy structure +cd $DEPLOY_TYPE +if [ ! -f deploy ]; then + echo "KO" + echo "Could not find $DEPLOY_TYPE/deploy file" + bye_bye 1 +fi +if [ ! -f config ]; then + echo "KO" + echo "Could not find $DEPLOY_TYPE/config file" + bye_bye 1 +fi +if [ ! -d svn ]; then + echo "Could not find $DEPLOY_TYPE/svn directory" + bye_bye 1 +fi + +cd svn + +# revert svn +svn revert -R . --non-interactive > /dev/null + +# update svn +svn up -r$SVN_REV --non-interactive > /dev/null + +# get subversion revision +REV=`svn info . | grep "vision" | head -n 1 | cut -d':' -f2 | sed 's/^ *//g'` + +# get project version +VERSION=`xmlstarlet sel -N "p=http://maven.apache.org/POM/4.0.0" -t -v "/p:project/p:version" pom.xml` + +# get new version +if [ $KEEP_VERSION -eq 1 ]; then + NEW_VERSION=$VERSION +else + NEW_VERSION=`${M2_HOME}/bin/mvn -N helper:transform-project-version -Dhelper.newVersionPattern="#V-rev#R" -Dhelper.revision=$REV -DhelperPluginVersion=2.0 -Dhelper.versionKey=deployKey help:evaluate -Dexpression=deployKey | grep -v "\[" | grep "-rev" | grep -v "Download"` +fi + +echo "OK" +echo "----------------------------------------------------------" +echo "--- Deploy summary ---------------------------------------" +echo "----------------------------------------------------------" +echo "- application = $APPLICATION_NAME" +echo "- deployType = $DEPLOY_TYPE" +if [ $BATCH_MODE -eq 1 ]; then + echo "- batchMode = ON" +fi +if [ $DRY_RUN -eq 1 ]; then + echo "- dryRun = ON" +fi +if [ $KEEP_VERSION -eq 1 ]; then + echo "- keepVersion = ON" +fi +echo "- revision detected = $REV" +echo "- version detected = $VERSION" +echo "- new version = $NEW_VERSION" +echo "- build parameters = $MAVEN_BUILD" +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" ]; then + echo "User cancel operation" + bye_bye 1 + fi +fi + +# log file +LOG_FILE=/tmp/deploy-to-demo-$APPLICATION_NAME-$DEPLOY_TYPE.log + +# change version in pom.xml +echo -n "1/4 Change to version $NEW_VERSION..." +if [ $KEEP_VERSION -eq 1 ]; then + echo "OK (keep version, skip this step)" +else + ${M2_HOME}/bin/mvn versions:set -DnewVersion=$NEW_VERSION > $LOG_FILE + test_ok_or_bye_bye $? "Error while executing '${M2_HOME}/bin/mvn versions:set -DnewVersion=$NEW_VERSION'" +fi + +# build application +echo -n "2/4 Build application..." +${M2_HOME}/bin/mvn $MAVEN_BUILD > $LOG_FILE +test_ok_or_bye_bye $? "Error while executing '${M2_HOME}/bin/mvn $MAVEN_BUILD'" + +cd .. + +echo -n "3/4 Deploy to demo..." + +if [ $DRY_RUN -eq 1 ]; then + echo "OK (dry run, skip this step)" +else + + # build the curl deploy options + DEPLOY_ARGS="-s " + for i in $(cat deploy); do + DEPLOY_ARGS="$DEPLOY_ARGS -F \"$i\""; + done + for i in $(cat svn/target/collect-deploy-files.txt); do + DEPLOY_ARGS="$DEPLOY_ARGS -F \"APP_WAR=@$i\"" + continue + done + + # Create a file to execute the curl command (pb with @ in bash execution...) + DEPLOY_ARGS="$DEPLOY_ARGS http://demo-ng.codelutin.com/deploy.cgi" + DEPLOY_COMMAND=/tmp/deploy-to-demo-curl-$APPLICATION_NAME.sh + cat << EOF > $DEPLOY_COMMAND + curl $DEPLOY_ARGS +EOF + + chmod +x $DEPLOY_COMMAND + + # execute the curl command + cat $DEPLOY_COMMAND > $LOG_FILE + . $DEPLOY_COMMAND >> $LOG_FILE + + # check there is a Deploy success in response" + if [ $? -eq 0 ]; then + grep "Deploy success" $LOG_FILE > /dev/null + fi + test_ok_or_bye_bye $? "Could not deploy to demo" +fi + +# revert any change +echo -n "4/4 Revert local modifications..." +svn revert -R svn > /dev/null +echo "OK" + +bye_bye 0 Property changes on: scripts/maven-release/deploy-to-demo-from-GAV.sh ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: scripts/maven-release/deploy-to-demo-from-SVN.sh =================================================================== --- scripts/maven-release/deploy-to-demo-from-SVN.sh (rev 0) +++ scripts/maven-release/deploy-to-demo-from-SVN.sh 2014-01-17 17:18:41 UTC (rev 11) @@ -0,0 +1,230 @@ +#!/bin/sh +# script to update rev using the pom version + the svn revision + +OLD_PATH=$(pwd) +APPLICATION_NAME=$(basename $OLD_PATH) + +DEPLOY_TYPES=$(find * -maxdepth 0 -type d -printf " %p") + +export JAVA_HOME=/opt/jdk +export JDK_HOME=$JAVA_HOME +export M2_HOME=/opt/maven + +bye_bye() { + cd $OLD_PATH + exit $1 +} + +print_usage_and_exit() { + echo "-----------------------------------------------------------------------------------" + echo "usage $(basename $0) [-h] [-b] [-d] [-k] [-m extraBuildParameters] [-r svnRevision] deployType" + echo " -h show usage and exit" + echo " -b for batch mode (no question asked)" + echo " -d for dryRun mode (nothing is deployed)" + echo " -k to keep incoming project version (do not transform version using the svn revision)" + echo " -m extraBuildParameters (add extra parameters to maven build)" + echo " -r svnRevision (update svn to a specific revision, by default use HEAD)" + echo " deployType type of deploy to do (must be one amoung [$DEPLOY_TYPES])" + echo "" + echo "example: $(basename $0) -b -m\"-DperformRelease -Preporting\" -r101010 latest" + echo "-----------------------------------------------------------------------------------" + + bye_bye $1 +} + +test_ok_or_bye_bye() { + if [ $1 -eq 1 ]; then + echo "KO" + echo "$2 (see at $LOG_FILE)" + bye_bye 1 + else + echo "OK" + fi +} +echo -n "0/4 Check options and prepare svn..." + +MAVEN_BUILD="clean install -Pcollect-deploy-files" +SVN_REV="HEAD" +KEEP_VERSION=0 # 0 when transform version using svn revision, 1 keep incoming version +BATCH_MODE=0 # 0 when interactive, 1 when batch mode +DRY_RUN=0 # 0 when execute, 1 when dry run +while getopts ":m:r:hbdk" opt; do + case $opt in + h) + echo "OK" + print_usage_and_exit 0 + ;; + b) + BATCH_MODE=1 + ;; + d) + DRY_RUN=1 + ;; + k) + KEEP_VERSION=1 + ;; + m) + MAVEN_BUILD="$MAVEN_BUILD $OPTARG" + ;; + r) + SVN_REV="$OPTARG" + ;; + \?) + echo "KO" + echo "Invalid option: -$OPTARG" >&2 + print_usage_and_exit 1 + ;; + :) + echo "KO" + echo "Option -$OPTARG requires an argument." >&2 + print_usage_and_exit 1 + ;; + esac + shift $((OPTIND-1)) +done + +# must have a last mandatory parameter +if [ ! $# -eq 1 ]; then + echo "KO" + echo "Mandatory deploy type not given" + print_usage_and_exit 1 +fi +DEPLOY_TYPE="$1" + +# check deploy type exist +if [ ! -d $DEPLOY_TYPE ]; then + echo "KO" + echo "Could not find deploy type $DEPLOY_TYPES (available: $DEPLOY_TYPES)" + bye_bye 1 +fi + +# check deploy structure +cd $DEPLOY_TYPE +if [ ! -f deploy ]; then + echo "KO" + echo "Could not find $DEPLOY_TYPE/deploy file" + bye_bye 1 +fi +if [ ! -f config ]; then + echo "KO" + echo "Could not find $DEPLOY_TYPE/config file" + bye_bye 1 +fi +if [ ! -d svn ]; then + echo "Could not find $DEPLOY_TYPE/svn directory" + bye_bye 1 +fi + +cd svn + +# revert svn +svn revert -R . --non-interactive > /dev/null + +# update svn +svn up -r$SVN_REV --non-interactive > /dev/null + +# get subversion revision +REV=`svn info . | grep "vision" | head -n 1 | cut -d':' -f2 | sed 's/^ *//g'` + +# get project version +VERSION=`xmlstarlet sel -N "p=http://maven.apache.org/POM/4.0.0" -t -v "/p:project/p:version" pom.xml` + +# get new version +if [ $KEEP_VERSION -eq 1 ]; then + NEW_VERSION=$VERSION +else + NEW_VERSION=`${M2_HOME}/bin/mvn -N helper:transform-project-version -Dhelper.newVersionPattern="#V-rev#R" -Dhelper.revision=$REV -DhelperPluginVersion=2.0 -Dhelper.versionKey=deployKey help:evaluate -Dexpression=deployKey | grep -v "\[" | grep "-rev" | grep -v "Download"` +fi + +echo "OK" +echo "----------------------------------------------------------" +echo "--- Deploy summary ---------------------------------------" +echo "----------------------------------------------------------" +echo "- application = $APPLICATION_NAME" +echo "- deployType = $DEPLOY_TYPE" +if [ $BATCH_MODE -eq 1 ]; then + echo "- batchMode = ON" +fi +if [ $DRY_RUN -eq 1 ]; then + echo "- dryRun = ON" +fi +if [ $KEEP_VERSION -eq 1 ]; then + echo "- keepVersion = ON" +fi +echo "- revision detected = $REV" +echo "- version detected = $VERSION" +echo "- new version = $NEW_VERSION" +echo "- build parameters = $MAVEN_BUILD" +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" ]; then + echo "User cancel operation" + bye_bye 1 + fi +fi + +# log file +LOG_FILE=/tmp/deploy-to-demo-$APPLICATION_NAME-$DEPLOY_TYPE.log + +# change version in pom.xml +echo -n "1/4 Change to version $NEW_VERSION..." +if [ $KEEP_VERSION -eq 1 ]; then + echo "OK (keep version, skip this step)" +else + ${M2_HOME}/bin/mvn versions:set -DnewVersion=$NEW_VERSION > $LOG_FILE + test_ok_or_bye_bye $? "Error while executing '${M2_HOME}/bin/mvn versions:set -DnewVersion=$NEW_VERSION'" +fi + +# build application +echo -n "2/4 Build application..." +${M2_HOME}/bin/mvn $MAVEN_BUILD > $LOG_FILE +test_ok_or_bye_bye $? "Error while executing '${M2_HOME}/bin/mvn $MAVEN_BUILD'" + +cd .. + +echo -n "3/4 Deploy to demo..." + +if [ $DRY_RUN -eq 1 ]; then + echo "OK (dry run, skip this step)" +else + + # build the curl deploy options + DEPLOY_ARGS="-s " + for i in $(cat deploy); do + DEPLOY_ARGS="$DEPLOY_ARGS -F \"$i\""; + done + for i in $(cat svn/target/collect-deploy-files.txt); do + DEPLOY_ARGS="$DEPLOY_ARGS -F \"APP_WAR=@$i\"" + continue + done + + # Create a file to execute the curl command (pb with @ in bash execution...) + DEPLOY_ARGS="$DEPLOY_ARGS http://demo-ng.codelutin.com/deploy.cgi" + DEPLOY_COMMAND=/tmp/deploy-to-demo-curl-$APPLICATION_NAME.sh + cat << EOF > $DEPLOY_COMMAND + curl $DEPLOY_ARGS +EOF + + chmod +x $DEPLOY_COMMAND + + # execute the curl command + cat $DEPLOY_COMMAND > $LOG_FILE + . $DEPLOY_COMMAND >> $LOG_FILE + + # check there is a Deploy success in response" + if [ $? -eq 0 ]; then + grep "Deploy success" $LOG_FILE > /dev/null + fi + test_ok_or_bye_bye $? "Could not deploy to demo" +fi + +# revert any change +echo -n "4/4 Revert local modifications..." +svn revert -R svn > /dev/null +echo "OK" + +bye_bye 0 Property changes on: scripts/maven-release/deploy-to-demo-from-SVN.sh ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: scripts/maven-release/isis-fish-docs-site.sh =================================================================== --- scripts/maven-release/isis-fish-docs-site.sh (rev 0) +++ scripts/maven-release/isis-fish-docs-site.sh 2014-01-17 17:18:41 UTC (rev 11) @@ -0,0 +1,17 @@ +#!/bin/sh + +# +# Regenere le site web de la documentation isis-fish +# si l'argument clean est passe, alors un clean est fait avant site +# FIXME tchemit-2011-12-25 : pas une bonne idée de déployer quelquechose qui n'a pas été cleané avant ... + +#export MVN=/opt/maven/bin/mvn +export MVN=/opt/repository/apache-maven-3.0.5/bin/mvn +export M2_HOME=/opt/repository/apache-maven-3.0.5 + +( +date +cd /home/maven-release/projets/forge.codelutin.com/isis-fish-docs/svn/ +svn up +$MVN $1 site-deploy +) >> /var/log/isis-fish-docs.log Property changes on: scripts/maven-release/isis-fish-docs-site.sh ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: scripts/maven-release/legacy/backup/deploy-to-demo.sh =================================================================== --- scripts/maven-release/legacy/backup/deploy-to-demo.sh (rev 0) +++ scripts/maven-release/legacy/backup/deploy-to-demo.sh 2014-01-17 17:18:41 UTC (rev 11) @@ -0,0 +1,14 @@ +#!/bin/sh +# script to update rev using the pom version + the svn revision + +if [ $# -lt 1 ]; then + echo "usage : $0 webmodule [extra build parameters]" + exit 0 +fi + +webmodule=$1 +shift 1 +artifact=$webmodule + +deploy-to-demo2.sh $webmodule $artifact $@ + \ No newline at end of file Property changes on: scripts/maven-release/legacy/backup/deploy-to-demo.sh ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: scripts/maven-release/legacy/backup/deploy-to-demo2.sh =================================================================== --- scripts/maven-release/legacy/backup/deploy-to-demo2.sh (rev 0) +++ scripts/maven-release/legacy/backup/deploy-to-demo2.sh 2014-01-17 17:18:41 UTC (rev 11) @@ -0,0 +1,114 @@ +#!/bin/sh +# script to update rev using the pom version + the svn revision + +# checking usage + +if [ $# -lt 1 ]; then + echo "usage : $0 webmodule artifact [extra build parameters]" + exit 0 +fi + +if [ ! -d $1 ]; then + echo "$1 must be an existing directory" + echo "usage : $0 webmodule artifact [extra build parameters]" + exit 0 +fi + +# reading and using first command-line arguments + +applicationName=$(basename `pwd`) # the D directory, on demo server, like /var/local/D/... +webModule=$1 # name of the maven module (directory name) that produces the war +artifact=$2 # name of the .war file to find in "target" directory of webModule + +shift +shift + +# remaining arguments are maven build arguments + +buildParameters="clean install $@" + + +# first do a up +svn up + +# get subversion revision +rev=`svn info . | grep "vision" | head -n 1 | cut -d':' -f2 | sed 's/^ *//g'` + +# get project version +version=`xmlstarlet sel -N "p=http://maven.apache.org/POM/4.0.0" -t -v "/p:project/p:version" pom.xml` + +# get version suffix (Snapshot or not snapshot) +versionSuffix="" + +#echo $version | grep -e "-SNAPSHOT" > /dev/null +echo $version | grep -e "-" > /dev/null +if [ $? -eq 0 ]; then + versionSuffix=`echo $version | sed "s/[^-]*$-.*$/\1/"` + #versionSuffix="-SNAPSHOT" +fi + +# get new version to apply +newVersion=`echo $version | cut -d'-' -f1`"-rev-$rev$versionSuffix" +echo "application $applicationName, webmodule $webModule, artifact $artifact" +echo "revision detected : $rev - version detected : $version" +echo -n "new version = $newVersion, do the change ? [Y/n]" +read r + +if [ -z "$r" -o "$r" = "Y" ]; then + + logFile=/tmp/deploy-to-demo-$webModule.log + + # change version in pom.xml + echo -n "1/5 Change to version $newVersion..." + mvn versions:set -DnewVersion=$newVersion > $logFile + + if [ $? -eq 1 ]; then + echo "KO" + echo "Error while executing 'mvn versions:set -DnewVersion=$newVersion' (see at $logFile)" + else + echo "OK" + + # build application + echo -n "2/5 Build application mvn $buildParameters" + mvn $buildParameters > $logFile + + if [ $? -eq 1 ]; then + echo "KO" + echo "Error while executing 'mvn $buildParameters' (see at $logFile)" + else + echo "OK" + + # copy war to demo and (if ok) launch deploy.sh script from application location on demo (var/local/xxx) + warLocation="$webModule/target/$artifact-$newVersion.war" + warDestination=/var/local/$applicationName/war + echo -n "3/5 Deploy $warLocation to $warDestination..." + scp $warLocation root@demo.codelutin.com:$warDestination > $logFile + + if [ $? -eq 1 ]; then + echo "KO" + echo "Could not deploy to demo (see at $logFile)" + else + echo "OK" + + # find and execute the deploy.sh file specific to the application + scriptToExecute="( cd /var/local/$applicationName ; ./deploy.sh $newVersion )" + echo -n "4/5 Execute on demo : $scriptToExecute..." + (cd $webModule ; mvn org.nuiton:helper-maven-plugin:1.4:execute-remote-command -N -Dhelper.repositoryId=demo.codelutin.com -Dhelper.repositoryUrl=scpexe://demo.codelutin.com -Dhelper.command="$scriptToExecute" > $logFile) + + if [ $? -eq 1 ]; then + echo "KO" + echo"Could not execute script $scriptToExecute on demo (see at $logFile)" + else + echo "OK" + fi + fi + fi + fi + + # revert any change + echo -n "5/5 Revert local modifications..." + svn st | xargs svn revert > /dev/null + echo "OK" + +fi + Property changes on: scripts/maven-release/legacy/backup/deploy-to-demo2.sh ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: scripts/maven-release/legacy/deploy-by-curl.sh =================================================================== --- scripts/maven-release/legacy/deploy-by-curl.sh (rev 0) +++ scripts/maven-release/legacy/deploy-by-curl.sh 2014-01-17 17:18:41 UTC (rev 11) @@ -0,0 +1,29 @@ +#!/bin/bash +# script to deploy a form using curl command + +# checking usage + +if [ $# -lt 3 ]; then + echo "usage : $0 applicationName formInputFile url" + exit 0 +fi + +applicationName=$1 +inputFile=$2 +url=$3 + +args="" +while read line +do + args="$args -F \"$line\""; +done < $inputFile + +args="$args $url" + +echo "" +echo "curl $args" +echo "" + +echo "curl $args" > /tmp/yo +chmod +x /tmp/yo +bash /tmp/yo Property changes on: scripts/maven-release/legacy/deploy-by-curl.sh ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: scripts/maven-release/legacy/deploy-demo.sh =================================================================== --- scripts/maven-release/legacy/deploy-demo.sh (rev 0) +++ scripts/maven-release/legacy/deploy-demo.sh 2014-01-17 17:18:41 UTC (rev 11) @@ -0,0 +1,230 @@ +#!/bin/sh +# script to update rev using the pom version + the svn revision + +OLD_PATH=$(pwd) +APPLICATION_NAME=$(basename $OLD_PATH) + +DEPLOY_TYPES=$(find * -maxdepth 0 -type d -printf " %p") + +export JAVA_HOME=/opt/jdk +export JDK_HOME=$JAVA_HOME +export M2_HOME=/opt/maven + +bye_bye() { + cd $OLD_PATH + exit $1 +} + +print_usage_and_exit() { + echo "-----------------------------------------------------------------------------------" + echo "usage $(basename $0) [-h] [-b] [-d] [-k] [-m extraBuildParameters] [-r svnRevision] deployType" + echo " -h show usage and exit" + echo " -b for batch mode (no question asked)" + echo " -d for dryRun mode (nothing is deployed)" + echo " -k to keep incoming project version (do not transform version using the svn revision)" + echo " -m extraBuildParameters (add extra parameters to maven build)" + echo " -r svnRevision (update svn to a specific revision, by default use HEAD)" + echo " deployType type of deploy to do (must be one amoung [$DEPLOY_TYPES])" + echo "" + echo "example: $(basename $0) -b -m\"-DperformRelease -Preporting\" -r101010 latest" + echo "-----------------------------------------------------------------------------------" + + bye_bye $1 +} + +test_ok_or_bye_bye() { + if [ $1 -eq 1 ]; then + echo "KO" + echo "$2 (see at $LOG_FILE)" + bye_bye 1 + else + echo "OK" + fi +} +echo -n "0/4 Check options and prepare svn..." + +MAVEN_BUILD="clean install -Pcollect-deploy-files" +SVN_REV="HEAD" +KEEP_VERSION=0 # 0 when transform version using svn revision, 1 keep incoming version +BATCH_MODE=0 # 0 when interactive, 1 when batch mode +DRY_RUN=0 # 0 when execute, 1 when dry run +while getopts ":m:r:hbdk" opt; do + case $opt in + h) + echo "OK" + print_usage_and_exit 0 + ;; + b) + BATCH_MODE=1 + ;; + d) + DRY_RUN=1 + ;; + k) + KEEP_VERSION=1 + ;; + m) + MAVEN_BUILD="$MAVEN_BUILD $OPTARG" + ;; + r) + SVN_REV="$OPTARG" + ;; + \?) + echo "KO" + echo "Invalid option: -$OPTARG" >&2 + print_usage_and_exit 1 + ;; + :) + echo "KO" + echo "Option -$OPTARG requires an argument." >&2 + print_usage_and_exit 1 + ;; + esac + shift $((OPTIND-1)) +done + +# must have a last mandatory parameter +if [ ! $# -eq 1 ]; then + echo "KO" + echo "Mandatory deploy type not given" + print_usage_and_exit 1 +fi +DEPLOY_TYPE="$1" + +# check deploy type exist +if [ ! -d $DEPLOY_TYPE ]; then + echo "KO" + echo "Could not find deploy type $DEPLOY_TYPES (available: $DEPLOY_TYPES)" + bye_bye 1 +fi + +# check deploy structure +cd $DEPLOY_TYPE +if [ ! -f deploy ]; then + echo "KO" + echo "Could not find $DEPLOY_TYPE/deploy file" + bye_bye 1 +fi +if [ ! -f config ]; then + echo "KO" + echo "Could not find $DEPLOY_TYPE/config file" + bye_bye 1 +fi +if [ ! -d svn ]; then + echo "Could not find $DEPLOY_TYPE/svn directory" + bye_bye 1 +fi + +cd svn + +# revert svn +svn revert -R . --non-interactive > /dev/null + +# update svn +svn up -r$SVN_REV --non-interactive > /dev/null + +# get subversion revision +REV=`svn info . | grep "vision" | head -n 1 | cut -d':' -f2 | sed 's/^ *//g'` + +# get project version +VERSION=`xmlstarlet sel -N "p=http://maven.apache.org/POM/4.0.0" -t -v "/p:project/p:version" pom.xml` + +# get new version +if [ $KEEP_VERSION -eq 1 ]; then + NEW_VERSION=$VERSION +else + NEW_VERSION=`${M2_HOME}/bin/mvn -N helper:transform-project-version -Dhelper.newVersionPattern="#V-rev#R" -Dhelper.revision=$REV -DhelperPluginVersion=2.0 -Dhelper.versionKey=deployKey help:evaluate -Dexpression=deployKey | grep -v "\[" | grep "-rev" | grep -v "Download"` +fi + +echo "OK" +echo "----------------------------------------------------------" +echo "--- Deploy summary ---------------------------------------" +echo "----------------------------------------------------------" +echo "- application = $APPLICATION_NAME" +echo "- deployType = $DEPLOY_TYPE" +if [ $BATCH_MODE -eq 1 ]; then + echo "- batchMode = ON" +fi +if [ $DRY_RUN -eq 1 ]; then + echo "- dryRun = ON" +fi +if [ $KEEP_VERSION -eq 1 ]; then + echo "- keepVersion = ON" +fi +echo "- revision detected = $REV" +echo "- version detected = $VERSION" +echo "- new version = $NEW_VERSION" +echo "- build parameters = $MAVEN_BUILD" +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" ]; then + echo "User cancel operation" + bye_bye 1 + fi +fi + +# log file +LOG_FILE=/tmp/deploy-to-demo-$APPLICATION_NAME-$DEPLOY_TYPE.log + +# change version in pom.xml +echo -n "1/4 Change to version $NEW_VERSION..." +if [ $KEEP_VERSION -eq 1 ]; then + echo "OK (keep version, skip this step)" +else + ${M2_HOME}/bin/mvn versions:set -DnewVersion=$NEW_VERSION > $LOG_FILE + test_ok_or_bye_bye $? "Error while executing '${M2_HOME}/bin/mvn versions:set -DnewVersion=$NEW_VERSION'" +fi + +# build application +echo -n "2/4 Build application..." +${M2_HOME}/bin/mvn $MAVEN_BUILD > $LOG_FILE +test_ok_or_bye_bye $? "Error while executing '${M2_HOME}/bin/mvn $MAVEN_BUILD'" + +cd .. + +echo -n "3/4 Deploy to demo..." + +if [ $DRY_RUN -eq 1 ]; then + echo "OK (dry run, skip this step)" +else + + # build the curl deploy options + DEPLOY_ARGS="-s " + for i in $(cat deploy); do + DEPLOY_ARGS="$DEPLOY_ARGS -F \"$i\""; + done + for i in $(cat svn/target/collect-deploy-files.txt); do + DEPLOY_ARGS="$DEPLOY_ARGS -F \"APP_WAR=@$i\"" + continue + done + + # Create a file to execute the curl command (pb with @ in bash execution...) + DEPLOY_ARGS="$DEPLOY_ARGS http://demo-ng.codelutin.com/deploy.cgi" + DEPLOY_COMMAND=/tmp/deploy-to-demo-curl-$APPLICATION_NAME.sh + cat << EOF > $DEPLOY_COMMAND + curl $DEPLOY_ARGS +EOF + + chmod +x $DEPLOY_COMMAND + + # execute the curl command + cat $DEPLOY_COMMAND > $LOG_FILE + . $DEPLOY_COMMAND >> $LOG_FILE + + # check there is a Deploy success in response" + if [ $? -eq 0 ]; then + grep "Deploy success" $LOG_FILE > /dev/null + fi + test_ok_or_bye_bye $? "Could not deploy to demo" +fi + +# revert any change +echo -n "4/4 Revert local modifications..." +svn revert -R svn > /dev/null +echo "OK" + +bye_bye 0 Property changes on: scripts/maven-release/legacy/deploy-demo.sh ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: scripts/maven-release/legacy/deploy-sandra-to-glon.sh =================================================================== --- scripts/maven-release/legacy/deploy-sandra-to-glon.sh (rev 0) +++ scripts/maven-release/legacy/deploy-sandra-to-glon.sh 2014-01-17 17:18:41 UTC (rev 11) @@ -0,0 +1,95 @@ +#!/bin/sh +# script to update rev using the pom version + the svn revision + +#cd /home/maven-release/projets/glon/sandra + +# get application name +applicationName=sandra +# first do a up +svn up +# get web module name to deploy +webModule=sandra-ear +jarModule=sandra-scheduler +buildParameters="clean install -Pno-tests -Passembly-profile $@" + +# get subversion revision +rev=`svn info . | grep "vision" | head -n 1 | cut -d':' -f2 | sed 's/^ *//g'` +# get project version +version=`xmlstarlet sel -N "p=http://maven.apache.org/POM/4.0.0" -t -v "/p:project/p:version" pom.xml` +# get version suffix (Snapshot or not snapshot) +versionSuffix="" +echo $version | grep -e "-SNAPSHOT" > /dev/null +if [ $? -eq 0 ]; then + versionSuffix="-SNAPSHOT" +fi +# get new version to apply +newVersion=`echo $version | cut -d'-' -f1`"-rev-$rev$versionSuffix" +echo "application $applicationName, webmodule $webModule" +echo "revision detected : $rev - version detected : $version" +echo -n "new version = $newVersion, do the change ? [Y/n]" +read r + +if [ -z "$r" -o "$r" = "Y" ]; then + + logFile=/tmp/deploy-to-glon-$webModule.log + + # change version + echo -n "1/6 Change to version $newVersion..." + mvn versions:set -DnewVersion=$newVersion > $logFile + + if [ $? -eq 1 ]; then + echo "KO" + echo "Error while executing 'mvn versions:set -DnewVersion=$newVersion' (see at $logFile)" + else + echo "OK" + # build application + echo -n "2/6 Build application mvn $buildParameters" + mvn $buildParameters > $logFile + + if [ $? -eq 1 ]; then + echo "KO" + echo "Error while executing 'mvn $buildParameters' (see at $logFile)" + else + echo "OK" + + # copy war to glon and (if ok) launch deploy.sh script from application location on glon (var/local/xxx) + warLocation="$webModule/target/$webModule-$newVersion.ear" + warDestination="/data/sandra/$webModule/" + echo -n "3/6 Deploy $warLocation to $warDestination..." + scp $warLocation codelutin@glon.codelutin.com:$warDestination > $logFile + + if [ $? -eq 1 ]; then + echo "KO" + echo "Could not deploy ear file to glon (see at $logFile)" + else + echo "OK" + + # copy jar to glon and (if ok) launch deploy.sh script from application location on glon (var/local/xxx) + assemblyLocation="$jarModule/target/$jarModule-$newVersion-bin.zip" + assemblyDestination="/data/sandra/$jarModule/" + echo -n "4/6 Deploy $assemblyLocation to $assemblyDestination..." + scp $assemblyLocation codelutin@glon.codelutin.com:$assemblyDestination > $logFile + if [ $? -eq 1 ]; then + echo "KO" + echo "Could not deploy assembly to glon (see at $logFile)" + else + echo "OK" + scriptToExecute="( cd /data/sandra/bin ; ./deploy.sh $newVersion )" + echo -n "5/6 Execute on glon : $scriptToExecute..." + (cd $webModule ; mvn org.nuiton:helper-maven-plugin:1.4:execute-remote-command -Dhelper.repositoryId=glon.codelutin.com -Dhelper.repositoryUrl=scpexe://glon.codelutin.com -Dhelper.command="$scriptToExecute" > $logFile) + if [ $? -eq 1 ]; then + echo "KO" + echo"Could not execute script $scriptToExecute on glon (see at $logFile)" + else + echo "OK" + fi + fi + fi + fi + fi + + # revert any change + echo -n "6/6 Revert local modifications..." + svn st | xargs svn revert > /dev/null + echo "OK" +fi Property changes on: scripts/maven-release/legacy/deploy-sandra-to-glon.sh ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: scripts/maven-release/legacy/deploy-to-BETA.sh =================================================================== --- scripts/maven-release/legacy/deploy-to-BETA.sh (rev 0) +++ scripts/maven-release/legacy/deploy-to-BETA.sh 2014-01-17 17:18:41 UTC (rev 11) @@ -0,0 +1,118 @@ +#!/bin/sh +# script to update rev using the pom version + the svn revision + +# checking usage + +if [ $# -lt 1 ]; then + echo "usage : $0 applicationName instanceUrl [extra build parameters]" + exit 0 +fi + +# reading and using first command-line arguments +applicationName=$1 +shift 1 + +# reading and using second command-line arguments (instance url) +instanceUrl=$2 + +# remaining arguments are maven build arguments +buildParameters="clean install -Pcollect-deploy-files $@" + +# first do a up +svn up + +# get subversion revision +rev=`svn info . | grep "vision" | head -n 1 | cut -d':' -f2 | sed 's/^ *//g'` + +# get project version +version=`xmlstarlet sel -N "p=http://maven.apache.org/POM/4.0.0" -t -v "/p:project/p:version" pom.xml` + +# get version suffix (Snapshot or not snapshot) +versionSuffix="" + +#echo $version | grep -e "-SNAPSHOT" > /dev/null +echo $version | grep -e "-" > /dev/null +if [ $? -eq 0 ]; then + versionSuffix=`echo $version | sed "s/[^-]*$-.*$/\1/"` + #versionSuffix="-SNAPSHOT" +fi + +# dont add revision if SNAPSHOT not found (released version) +revVersionSufix="" +if [ ! -z "$versionSuffix" ]; then + revVersionSufix="-rev-$rev$versionSuffix" + + # get new version to apply + newVersion=`echo $version | cut -d'-' -f1`"$revVersionSufix" + echo "application $applicationName" + #echo "application $applicationName, webmodule $webModule, artifact $artifact" + echo "revision detected : $rev - version detected : $version" + echo -n "new version = $newVersion, do the change ? [Y/n]" + read r +fi + +if [ -z "$r" -o "$r" = "Y" -o ! -z "$versionSuffix" ]; then + + logFile=/tmp/deploy-to-demo-$applicationName.log + + if [ ! -z "$versionSuffix" ]; then + # change version in pom.xml + echo -n "1/5 Change to version $newVersion..." + mvn versions:set -DnewVersion=$newVersion > $logFile + else + echo -n "1/5 $version is a released version, nothing to do..." + fi + + if [ $? -eq 1 ]; then + echo "KO" + echo "Error while executing 'mvn versions:set -DnewVersion=$newVersion' (see at $logFile)" + else + echo "OK" + + # build application + echo -n "2/5 Build application mvn $buildParameters" + mvn $buildParameters > $logFile + + if [ $? -eq 1 ]; then + echo "KO" + echo "Error while executing 'mvn $buildParameters' (see at $logFile)" + else + echo "OK" + + # copy files to demo + remoteDir=/var/local/$applicationName + + echo -n "3/5 Deploy to $remoteDir..." + + for f in $(cat target/collect-deploy-files.txt); do + scp $f root@$instanceUrl:$remoteDir > $logFile + done + + if [ $? -eq 1 ]; then + echo "KO" + echo "Could not deploy to demo (see at $logFile)" + else + echo "OK" + + # find and execute the deploy.sh file specific to the application + scriptToExecute="( cd /var/local/$applicationName ; ./deploy.sh $newVersion )" + echo -n "4/5 Execute on demo : $scriptToExecute..." + mvn org.nuiton:helper-maven-plugin:1.4:execute-remote-command -N -Dhelper.repositoryId=$instanceUrl -Dhelper.repositoryUrl=scpexe://$instanceUrl -Dhelper.command="$scriptToExecute" > $logFile + + if [ $? -eq 1 ]; then + echo "KO" + echo"Could not execute script $scriptToExecute on demo (see at $logFile)" + else + echo "OK" + fi + fi + fi + fi + + # revert any change + echo -n "5/5 Revert local modifications..." + svn st | xargs svn revert > /dev/null + echo "OK" + +fi + Property changes on: scripts/maven-release/legacy/deploy-to-BETA.sh ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: scripts/maven-release/legacy/deploy-to-demo-BETA.sh =================================================================== --- scripts/maven-release/legacy/deploy-to-demo-BETA.sh (rev 0) +++ scripts/maven-release/legacy/deploy-to-demo-BETA.sh 2014-01-17 17:18:41 UTC (rev 11) @@ -0,0 +1,7 @@ +#!/bin/sh +# script to update rev using the pom version + the svn revision + +applicationName=$(basename `pwd`) # the D directory, on demo server, like /var/local/D/... +instanceUrl="demo.codelutin.com" + +deploy-to-BETA.sh $applicationName $instanceUrl $@ Property changes on: scripts/maven-release/legacy/deploy-to-demo-BETA.sh ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: scripts/maven-release/legacy/deploy-to-demo-ng.sh =================================================================== --- scripts/maven-release/legacy/deploy-to-demo-ng.sh (rev 0) +++ scripts/maven-release/legacy/deploy-to-demo-ng.sh 2014-01-17 17:18:41 UTC (rev 11) @@ -0,0 +1,7 @@ +#!/bin/sh +# script to update rev using the pom version + the svn revision + +applicationName=$(cd .. ; basename `pwd`) # the D directory, on demo server, like /var/local/D/... + +deploy-to-demo2-ng.sh $applicationName $@ + \ No newline at end of file Property changes on: scripts/maven-release/legacy/deploy-to-demo-ng.sh ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: scripts/maven-release/legacy/deploy-to-demo-ng2.sh =================================================================== --- scripts/maven-release/legacy/deploy-to-demo-ng2.sh (rev 0) +++ scripts/maven-release/legacy/deploy-to-demo-ng2.sh 2014-01-17 17:18:41 UTC (rev 11) @@ -0,0 +1,97 @@ +#!/bin/sh +# script to update rev using the pom version + the svn revision + +# checking usage + +if [ $# -lt 1 ]; then + echo "usage : $0 applicationName [extra build parameters]" + exit 0 +fi + +# reading and using first command-line arguments + +applicationName=$1 +shift 1 + +# remaining arguments are maven build arguments +buildParameters="clean install -Pcollect-deploy-files $@" + +# first do a up +svn up + +# get subversion revision +rev=`svn info . | grep "vision" | head -n 1 | cut -d':' -f2 | sed 's/^ *//g'` + +# get project version +version=`xmlstarlet sel -N "p=http://maven.apache.org/POM/4.0.0" -t -v "/p:project/p:version" pom.xml` + +# get new version +newVersion=`mvn -N helper:transform-project-version -Dhelper.newVersionPattern="#V-rev#R" -Dhelper.revision=$rev -DhelperPluginVersion=2.0 -Dhelper.versionKey=deployKey help:evaluate -Dexpression=deployKey | grep -v "\[" | grep "-rev" | grep -v "Download"` + +echo "application $applicationName" +#echo "application $applicationName, webmodule $webModule, artifact $artifact" +echo "revision detected : $rev - version detected : $version" +echo -n "new version = $newVersion, do the change ? [Y/n]" +read r + +if [ -z "$r" -o "$r" = "Y" ]; then + + logFile=/tmp/deploy-to-demo-$applicationName.log + + # change version in pom.xml + echo -n "1/5 Change to version $newVersion..." + mvn versions:set -DnewVersion=$newVersion > $logFile + + if [ $? -eq 1 ]; then + echo "KO" + echo "Error while executing 'mvn versions:set -DnewVersion=$newVersion' (see at $logFile)" + else + echo "OK" + + # build application + echo -n "2/5 Build application mvn $buildParameters" + mvn $buildParameters > $logFile + + if [ $? -eq 1 ]; then + echo "KO" + echo "Error while executing 'mvn $buildParameters' (see at $logFile)" + else + echo "OK" + + # copy files to demo + remoteDir=/var/local/$applicationName + + echo -n "3/5 Deploy to $remoteDir..." + + for f in $(cat target/collect-deploy-files.txt); do + scp $f root@demo.codelutin.com:$remoteDir > $logFile + done + + if [ $? -eq 1 ]; then + echo "KO" + echo "Could not deploy to demo (see at $logFile)" + else + echo "OK" + + # find and execute the deploy.sh file specific to the application + scriptToExecute="( cd /var/local/$applicationName ; ./deploy.sh $newVersion )" + echo -n "4/5 Execute on demo : $scriptToExecute..." + mvn org.nuiton:helper-maven-plugin:1.4:execute-remote-command -N -Dhelper.repositoryId=demo.codelutin.com -Dhelper.repositoryUrl=scpexe://demo.codelutin.com -Dhelper.command="$scriptToExecute" > $logFile + + if [ $? -eq 1 ]; then + echo "KO" + echo"Could not execute script $scriptToExecute on demo (see at $logFile)" + else + echo "OK" + fi + fi + fi + fi + + # revert any change + echo -n "5/5 Revert local modifications..." + svn st | xargs svn revert > /dev/null + echo "OK" + +fi + Property changes on: scripts/maven-release/legacy/deploy-to-demo-ng2.sh ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: scripts/maven-release/legacy/deploy-to-demo.sh =================================================================== --- scripts/maven-release/legacy/deploy-to-demo.sh (rev 0) +++ scripts/maven-release/legacy/deploy-to-demo.sh 2014-01-17 17:18:41 UTC (rev 11) @@ -0,0 +1,7 @@ +#!/bin/sh +# script to update rev using the pom version + the svn revision + +applicationName=$(basename `pwd`) # the D directory, on demo server, like /var/local/D/... + +deploy-to-demo2.sh $applicationName $@ + \ No newline at end of file Property changes on: scripts/maven-release/legacy/deploy-to-demo.sh ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: scripts/maven-release/legacy/deploy-to-demo2-ng.sh =================================================================== --- scripts/maven-release/legacy/deploy-to-demo2-ng.sh (rev 0) +++ scripts/maven-release/legacy/deploy-to-demo2-ng.sh 2014-01-17 17:18:41 UTC (rev 11) @@ -0,0 +1,107 @@ +#!/bin/sh +# script to update rev using the pom version + the svn revision + +# checking usage + +if [ $# -lt 2 ]; then + echo "usage : $0 applicationName deployType(latest, staging, stable) [extra build parameters]" + exit 0 +fi + +# reading and using first command-line arguments + +applicationName=$1 +shift 1 + +deployType=$1 +shift 1 + +deployFile=../deploy-$deployType + +if [ ! -f $deployFile ]; then + echo "Can't find deploy file at $deployFile" + exit 1 +fi + + +# remaining arguments are maven build arguments +buildParameters="clean install -Pcollect-deploy-files $@" + +# first do a up +svn up > /dev/null + +# get subversion revision +rev=`svn info . | grep "vision" | head -n 1 | cut -d':' -f2 | sed 's/^ *//g'` + +# get project version +version=`xmlstarlet sel -N "p=http://maven.apache.org/POM/4.0.0" -t -v "/p:project/p:version" pom.xml` + +# get new version +newVersion=`mvn -N helper:transform-project-version -Dhelper.newVersionPattern="#V-rev#R" -Dhelper.revision=$rev -DhelperPluginVersion=2.0 -Dhelper.versionKey=deployKey help:evaluate -Dexpression=deployKey | grep -v "\[" | grep "-rev" | grep -v "Download"` + +echo "application $applicationName - deployType $deployType" +echo "revision detected : $rev - version detected : $version" +echo -n "new version = $newVersion, do the change ? [Y/n]" +read r + +if [ -z "$r" -o "$r" = "Y" ]; then + + logFile=/tmp/deploy-to-demo-$applicationName.log + + # change version in pom.xml + echo -n "1/4 Change to version $newVersion..." + mvn versions:set -DnewVersion=$newVersion > $logFile + + if [ $? -eq 1 ]; then + echo "KO" + echo "Error while executing 'mvn versions:set -DnewVersion=$newVersion' (see at $logFile)" + else + echo "OK" + + # build application + echo -n "2/4 Build application mvn $buildParameters" + mvn $buildParameters > $logFile + + if [ $? -eq 1 ]; then + echo "KO" + echo "Error while executing 'mvn $buildParameters' (see at $logFile)" + else + echo "OK" + echo -n "3/4 Deploy to demo (using $deployFile)..." + + deploy_args="" + for i in $(cat $deployFile); do + deploy_args="$deploy_args -F \"$i\""; + done + for i in $(cat target/collect-deploy-files.txt); do + deploy_args="$deploy_args -F \"APP_WAR=@$i\"" + continue + done + + deploy_args="$deploy_args http://demo-ng.codelutin.com/deploy.cgi" + + #echo "Deploy url: $deploy_args" + + # use an external file to launch the curl command otherwise, can't make it work :( + curl_file=/tmp/deploy-to-demo-curl-$applicationName.sh + cat << EOF > $curl_file + curl $deploy_args +EOF + chmod +x $curl_file + . $curl_file + if [ $? -eq 1 ]; then + echo "KO" + echo "Could not deploy to demo (see at $logFile)" + else + echo "OK" + fi + fi + fi + + # revert any change + echo -n "4/4 Revert local modifications..." + svn st | xargs svn revert > /dev/null + echo "OK" + +fi + Property changes on: scripts/maven-release/legacy/deploy-to-demo2-ng.sh ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: scripts/maven-release/legacy/deploy-to-demo2.sh =================================================================== --- scripts/maven-release/legacy/deploy-to-demo2.sh (rev 0) +++ scripts/maven-release/legacy/deploy-to-demo2.sh 2014-01-17 17:18:41 UTC (rev 11) @@ -0,0 +1,97 @@ +#!/bin/sh +# script to update rev using the pom version + the svn revision + +# checking usage + +if [ $# -lt 1 ]; then + echo "usage : $0 applicationName [extra build parameters]" + exit 0 +fi + +# reading and using first command-line arguments + +applicationName=$1 +shift 1 + +# remaining arguments are maven build arguments +buildParameters="clean install -Pcollect-deploy-files $@" + +# first do a up +svn up + +# get subversion revision +rev=`svn info . | grep "vision" | head -n 1 | cut -d':' -f2 | sed 's/^ *//g'` + +# get project version +version=`xmlstarlet sel -N "p=http://maven.apache.org/POM/4.0.0" -t -v "/p:project/p:version" pom.xml` + +# get new version +newVersion=`mvn -N helper:transform-project-version -Dhelper.newVersionPattern="#V-rev#R" -Dhelper.revision=$rev -DhelperPluginVersion=2.0 -Dhelper.versionKey=deployKey help:evaluate -Dexpression=deployKey | grep -v "\[" | grep "-rev" | grep -v "Download"` + +echo "application $applicationName" +#echo "application $applicationName, webmodule $webModule, artifact $artifact" +echo "revision detected : $rev - version detected : $version" +echo -n "new version = $newVersion, do the change ? [Y/n]" +read r + +if [ -z "$r" -o "$r" = "Y" ]; then + + logFile=/tmp/deploy-to-demo-$applicationName.log + + # change version in pom.xml + echo -n "1/5 Change to version $newVersion..." + mvn versions:set -DnewVersion=$newVersion > $logFile + + if [ $? -eq 1 ]; then + echo "KO" + echo "Error while executing 'mvn versions:set -DnewVersion=$newVersion' (see at $logFile)" + else + echo "OK" + + # build application + echo -n "2/5 Build application mvn $buildParameters" + mvn $buildParameters > $logFile + + if [ $? -eq 1 ]; then + echo "KO" + echo "Error while executing 'mvn $buildParameters' (see at $logFile)" + else + echo "OK" + + # copy files to demo + remoteDir=/var/local/$applicationName + + echo -n "3/5 Deploy to $remoteDir..." + + for f in $(cat target/collect-deploy-files.txt); do + scp $f root@demo.codelutin.com:$remoteDir > $logFile + done + + if [ $? -eq 1 ]; then + echo "KO" + echo "Could not deploy to demo (see at $logFile)" + else + echo "OK" + + # find and execute the deploy.sh file specific to the application + scriptToExecute="( cd /var/local/$applicationName ; ./deploy.sh $newVersion )" + echo -n "4/5 Execute on demo : $scriptToExecute..." + mvn org.nuiton:helper-maven-plugin:1.4:execute-remote-command -N -Dhelper.repositoryId=demo.codelutin.com -Dhelper.repositoryUrl=scpexe://demo.codelutin.com -Dhelper.command="$scriptToExecute" > $logFile + + if [ $? -eq 1 ]; then + echo "KO" + echo"Could not execute script $scriptToExecute on demo (see at $logFile)" + else + echo "OK" + fi + fi + fi + fi + + # revert any change + echo -n "5/5 Revert local modifications..." + svn st | xargs svn revert > /dev/null + echo "OK" + +fi + Property changes on: scripts/maven-release/legacy/deploy-to-demo2.sh ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: scripts/maven-release/legacy/deploy-to-glon-BETA.sh =================================================================== --- scripts/maven-release/legacy/deploy-to-glon-BETA.sh (rev 0) +++ scripts/maven-release/legacy/deploy-to-glon-BETA.sh 2014-01-17 17:18:41 UTC (rev 11) @@ -0,0 +1,7 @@ +#!/bin/sh +# script to update rev using the pom version + the svn revision + +applicationName=$(basename `pwd`) # the D directory, on demo server, like /var/local/D/... +instanceUrl="glon.codelutin.com" + +deploy-to-BETA.sh $applicationName $instanceUrl $@ Property changes on: scripts/maven-release/legacy/deploy-to-glon-BETA.sh ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: scripts/maven-release/legacy/deploy-to-latest.sh =================================================================== --- scripts/maven-release/legacy/deploy-to-latest.sh (rev 0) +++ scripts/maven-release/legacy/deploy-to-latest.sh 2014-01-17 17:18:41 UTC (rev 11) @@ -0,0 +1,6 @@ +#!/bin/sh +# script to deploy app to demo latest env + +applicationName=$(cd .. ; basename `pwd`) +deploy-to-demo2-ng.sh $applicationName latest $@ + \ No newline at end of file Property changes on: scripts/maven-release/legacy/deploy-to-latest.sh ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: scripts/maven-release/legacy/mavenpom-update.sh =================================================================== --- scripts/maven-release/legacy/mavenpom-update.sh (rev 0) +++ scripts/maven-release/legacy/mavenpom-update.sh 2014-01-17 17:18:41 UTC (rev 11) @@ -0,0 +1,60 @@ +#!/bin/bash + +type="$1" +directory="$2" +version="$3" + +message="Update $type to $version." +projetsDirectory=~/projets/$directory + +reset +echo "***********************************************************************" +echo "Commit message : $message" +echo "Parent pom to use : $type - $version" +echo "Directory to scan : $projetsDirectory" + +old=`pwd` + +cd $projetsDirectory +echo "will work in $(pwd)" + +for i in $(ls | grep -v "*.iml"); do + echo "***********************************************************************" + + cd $projetsDirectory + + echo "update project $i" + (cd $i && svn up) + + echo "update pom.xml" + (cd $i && xmlstarlet ed -P -S -N "p=http://maven.apache.org/POM/4.0.0" -u "/p:project/p:parent/p:version" -v $version pom.xml > pom.xml2 && mv pom.xml pom.xml~ && mv pom.xml2 pom.xml) + + cd $i + svn diff pom.xml | grep "@@" + doCommit="$?" + echo "modified ? $doCommit" + cd .. + if [ $doCommit -eq 1 ]; then + echo "Nothing modified on $i/pom" + continue + fi + + r="Y" + echo "file $i/pom was modified" + (cd $i && svn diff pom.xml) + + echo -n "do commit pom.xml ? [Y/n] " + read r + + if [ -z "$r" -o "$r" == "Y" ]; then + + echo "commit $i/pom.xml" + (cd $i ; svn ci pom.xml -m"$message") + else + + echo "revert $i/pom.xml" + (cd $i ; mv pom.xml~ pom.xml) + fi +done + +cd $old Property changes on: scripts/maven-release/legacy/mavenpom-update.sh ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: scripts/maven-release/legacy/mmvn.sh =================================================================== --- scripts/maven-release/legacy/mmvn.sh (rev 0) +++ scripts/maven-release/legacy/mmvn.sh 2014-01-17 17:18:41 UTC (rev 11) @@ -0,0 +1,34 @@ +# /bin/sh + +FILE=/tmp/mmvn.tmp + +MAIN_DIR=`pwd` + +COMMAND=$1 + +rm -rf "$FILE" + +echo "detects maven projects from directory $MAIN_DIR" + +find $MAIN_DIR -name "pom.xml" -printf %h\\n >> $FILE + +echo -n "will execute command '$COMMAND' on " +echo -n `wc -l < $FILE` +echo " project(s)" + +for i in `cat $FILE` ; do + cd $MAIN_DIR + cd "$i" + echo -n `pwd` + echo -n "..." + eval $COMMAND > /dev/null + result="$?" + if [ $result -eq 1 ]; then + echo "KO" + else + echo "OK" + fi + +done + +cd $MAIN_DIR Property changes on: scripts/maven-release/legacy/mmvn.sh ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: scripts/maven-release/legacy/svn-update.sh =================================================================== --- scripts/maven-release/legacy/svn-update.sh (rev 0) +++ scripts/maven-release/legacy/svn-update.sh 2014-01-17 17:18:41 UTC (rev 11) @@ -0,0 +1,17 @@ +#!/bin/bash + +#type="$1" + +old=`pwd` +reset +for type in $@ ; do + echo "========================================================" + echo "mise a jour de repertoire ~/projets/$type" + cd ~/projets/$type + for i in $(ls | grep -v ".iml" | grep -v "meta-pom*"| grep -v "*~"| grep -v "tesdir"); do + echo $i + ( cd $i ; svn up ) + done +done + +cd $old Property changes on: scripts/maven-release/legacy/svn-update.sh ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: scripts/maven-release/mvn-ep.sh =================================================================== --- scripts/maven-release/mvn-ep.sh (rev 0) +++ scripts/maven-release/mvn-ep.sh 2014-01-17 17:18:41 UTC (rev 11) @@ -0,0 +1,18 @@ +#!/bin/sh +# script to encode a password via mvn with no console password + +# file where to read password to encode (by default pass file) +file=pass + +if [ $# -eq 1 ]; then + file=$1 +fi + +if [ ! -f $file ]; then + echo "$file does not exist!" + exit 0 +fi + +mypass=`cat $file` +mvn -ep $mypass +rm -rfv $file Property changes on: scripts/maven-release/mvn-ep.sh ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native

1 0