Author: osallou-guest Date: 2013-05-31 11:41:22 +0000 (Fri, 31 May 2013) New Revision: 13773
Added: trunk/packages/mobyle/mobyle/trunk/debian/mobyle.conf Removed: trunk/packages/mobyle/mobyle/trunk/debian/mobyle.apache2 Modified: trunk/packages/mobyle/mobyle/trunk/debian/changelog trunk/packages/mobyle/mobyle/trunk/debian/control trunk/packages/mobyle/mobyle/trunk/debian/postinst trunk/packages/mobyle/mobyle/trunk/debian/rules Log: transition to apache 2.4 Modified: trunk/packages/mobyle/mobyle/trunk/debian/changelog =================================================================== --- trunk/packages/mobyle/mobyle/trunk/debian/changelog 2013-05-31 07:59:01 UTC (rev 13772) +++ trunk/packages/mobyle/mobyle/trunk/debian/changelog 2013-05-31 11:41:22 UTC (rev 13773) @@ -1,3 +1,9 @@ +mobyle (1.5.0+dfsg-2) UNRELEASED; urgency=low + + * Transition to Apache 2.4 (Closes: #669884). + + -- Olivier Sallou <[email protected]> Fri, 31 May 2013 13:11:20 +0200 + mobyle (1.5.0+dfsg-1) unstable; urgency=low * New upstream release Modified: trunk/packages/mobyle/mobyle/trunk/debian/control =================================================================== --- trunk/packages/mobyle/mobyle/trunk/debian/control 2013-05-31 07:59:01 UTC (rev 13772) +++ trunk/packages/mobyle/mobyle/trunk/debian/control 2013-05-31 11:41:22 UTC (rev 13773) @@ -2,9 +2,13 @@ Section: science Priority: optional Maintainer: Debian Med Packaging Team <[email protected]> -DM-Upload-Allowed: yes Uploaders: Olivier Sallou <[email protected]> -Build-Depends: debhelper (>= 8.9.7), python (>= 2.5), python-simpletal (>=4.1), python-simplejson (>= 1.7.1), python-imaging (>= 1.1.5), python-lxml (>= 2.2.4) +Build-Depends: debhelper (>= 8.9.7), python (>= 2.5), + python-simpletal (>=4.1), + python-simplejson (>= 1.7.1), + python-imaging (>= 1.1.5), + python-lxml (>= 2.2.4), + dh-apache2 Standards-Version: 3.9.4 Homepage: https://projets.pasteur.fr/projects/show/mobyle Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/mobyle/mobyle/trunk/ @@ -12,13 +16,13 @@ Package: mobyle Architecture: all -Depends: ${misc:Depends}, python (>= 2.5), apache2, python-simpletal (>=4.1), +Depends: ${misc:Depends}, python (>= 2.5), apache2 (>= 2.4) | httpd-cgi, python-simpletal (>=4.1), # see INSTALL python-simpletal (<< 5.0~), python-support (>= 0.90), python-pygraphviz, python-simplejson (>= 1.7.1), python-imaging (>= 1.1.5), python-lxml (>= 2.2.4), squizz (>=0.99b+dfsg), libjs-scriptaculous, libjs-jquery, libjs-prototype, mobyle-utils, jing, ttf-bitstream-vera Suggests: python-openid (>= 2.2.4), python-dnspython (>= 1.5.0) -Recommends: mobyle-programs (>= 5.1), mobyle-tutorials +Recommends: mobyle-programs (>= 3.1), mobyle-tutorials, ${misc:Recommends} Description: Web portal that provides web forms for command-line software Mobyle is a framework and web portal specifically aimed at the integration of bioinformatics software and databanks. It generates a web interface from an xml Deleted: trunk/packages/mobyle/mobyle/trunk/debian/mobyle.apache2 =================================================================== --- trunk/packages/mobyle/mobyle/trunk/debian/mobyle.apache2 2013-05-31 07:59:01 UTC (rev 13772) +++ trunk/packages/mobyle/mobyle/trunk/debian/mobyle.apache2 2013-05-31 11:41:22 UTC (rev 13773) @@ -1,37 +0,0 @@ - - Alias /mobyle /usr/share/mobyle/htdocs - - RewriteEngine on - #Support v0.97 URLs - RewriteCond %{REQUEST_URI} ^/cgi-bin/mobyle/portal.py - RewriteCond %{QUERY_STRING} form=(.*) - RewriteRule .* /cgi-bin/mobyle/portal.py?#forms::%1 [NE,R,L] - #Support v0.97 URLs - RewriteCond %{REQUEST_URI} ^/cgi-bin/mobyle/portal.py - RewriteCond %{QUERY_STRING} jobs=http://(.*)/(.*)/(.*)/(.*)/(.*) - RewriteRule .* /cgi-bin/mobyle/portal.py?#jobs::%4.%5 [NE,R,L] - - RewriteCond %{REQUEST_URI} ^/mobyle/data/jobs(\.*) - RewriteCond %{QUERY_STRING} ^save$ - RewriteRule (.*)/([^/]+)$ $1/$2 [E=SAVEDFILENAME:$2] - Header set Content-Disposition "attachment; filename=\"%{SAVEDFILENAME}e\"" env=SAVEDFILENAME - - - <Directory "/usr/lib/cgi-bin/mobyle"> - Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch - AllowOverride None - Options FollowSymLinks - Order allow,deny - Allow from all - SetEnv MOBYLEHOME /usr/share/mobyle/core - AddDefaultCharset ISO-8859-1 - </Directory> - - <Directory "/usr/share/mobyle/htdocs"> - Options -Indexes FollowSymLinks MultiViews - AllowOverride None - Order allow,deny - allow from all - </Directory> - - Copied: trunk/packages/mobyle/mobyle/trunk/debian/mobyle.conf (from rev 11173, trunk/packages/mobyle/mobyle/trunk/debian/mobyle.apache2) =================================================================== --- trunk/packages/mobyle/mobyle/trunk/debian/mobyle.conf (rev 0) +++ trunk/packages/mobyle/mobyle/trunk/debian/mobyle.conf 2013-05-31 11:41:22 UTC (rev 13773) @@ -0,0 +1,37 @@ + + Alias /mobyle /usr/share/mobyle/htdocs + + RewriteEngine on + #Support v0.97 URLs + RewriteCond %{REQUEST_URI} ^/cgi-bin/mobyle/portal.py + RewriteCond %{QUERY_STRING} form=(.*) + RewriteRule .* /cgi-bin/mobyle/portal.py?#forms::%1 [NE,R,L] + #Support v0.97 URLs + RewriteCond %{REQUEST_URI} ^/cgi-bin/mobyle/portal.py + RewriteCond %{QUERY_STRING} jobs=http://(.*)/(.*)/(.*)/(.*)/(.*) + RewriteRule .* /cgi-bin/mobyle/portal.py?#jobs::%4.%5 [NE,R,L] + + RewriteCond %{REQUEST_URI} ^/mobyle/data/jobs(\.*) + RewriteCond %{QUERY_STRING} ^save$ + RewriteRule (.*)/([^/]+)$ $1/$2 [E=SAVEDFILENAME:$2] + Header set Content-Disposition "attachment; filename=\"%{SAVEDFILENAME}e\"" env=SAVEDFILENAME + + + <Directory "/usr/lib/cgi-bin/mobyle"> + Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch + AllowOverride None + Options FollowSymLinks + Order allow,deny + Allow from all + SetEnv MOBYLEHOME /usr/share/mobyle/core + AddDefaultCharset ISO-8859-1 + </Directory> + + <Directory "/usr/share/mobyle/htdocs"> + Options -Indexes +FollowSymLinks +MultiViews + AllowOverride None + Order allow,deny + allow from all + </Directory> + + Modified: trunk/packages/mobyle/mobyle/trunk/debian/postinst =================================================================== --- trunk/packages/mobyle/mobyle/trunk/debian/postinst 2013-05-31 07:59:01 UTC (rev 13772) +++ trunk/packages/mobyle/mobyle/trunk/debian/postinst 2013-05-31 11:41:22 UTC (rev 13773) @@ -19,9 +19,12 @@ configure) chown -R www-data:www-data /var/log/mobyle chown -R www-data:www-data /var/lib/mobyle - a2enmod rewrite - a2enmod headers - invoke-rc.d apache2 restart + if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then + . /usr/share/apache2/apache2-maintscript-helper + apache2_invoke enmod rewrite + apache2_invoke enmod headers + apache2_invoke enmod alias + fi ;; abort-upgrade|abort-remove|abort-deconfigure) Modified: trunk/packages/mobyle/mobyle/trunk/debian/rules =================================================================== --- trunk/packages/mobyle/mobyle/trunk/debian/rules 2013-05-31 07:59:01 UTC (rev 13772) +++ trunk/packages/mobyle/mobyle/trunk/debian/rules 2013-05-31 11:41:22 UTC (rev 13773) @@ -4,7 +4,7 @@ #export DH_VERBOSE=1 %: - dh $@ --with python2 + dh $@ --with python2 --with apache2 override_dh_auto_build: # Nothing to do @@ -32,6 +32,7 @@ override_dh_auto_install-indep: debian/common-install-stamp find debian/mobyle/usr/share/mobyle/core -type f | xargs sed -i "s/MOBYLEHOME = '.*'/MOBYLEHOME = '\/usr\/share\/mobyle\/core'/g" + find debian/mobyle/usr/lib/cgi-bin/mobyle -type f | xargs sed -i "s/MOBYLEHOME = '.*'/MOBYLEHOME = '\/usr\/share\/mobyle\/core'/g" find debian/mobyle/usr/share/mobyle/core -type f | xargs sed -i "s/MOBYLEHTDOCS = '.*'/MOBYLEHTDOCS = '\/usr\/share\/mobyle\/htdocs'/g" mv debian/mobyle/usr/share/mobyle/htdocs/data debian/mobyle/var/lib/mobyle/ rm -rf debian/mobyle/usr/share/mobyle/core/Doc @@ -42,7 +43,6 @@ rm -rf debian/mobyle/usr/share/mobyle/core/Services/Tutorials cp debian/mobyle/usr/share/mobyle/core/Example/Local/Config/Config.template.py debian/mobyle/etc/mobyle/Config.py cp debian/mobyle/usr/share/mobyle/core/Example/Local/CustomClasses/__init__.py debian/mobyle/etc/mobyle/CustomClasses/__init__.py - cp debian/mobyle.apache2 debian/mobyle/etc/apache2/conf.d/mobyle find debian/mobyle -name *.html | xargs chmod 644 find debian/mobyle -name *.xml | xargs chmod 644 mv debian/mobyle/usr/share/mobyle/htdocs/portal/html/announcement.txt debian/mobyle/etc/mobyle/ _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
