[med-svn] r18711 - in trunk/packages/galaxy/trunk/debian/apache-proxy-files/etc/apache2: . conf-available

[Timothy Booth]

Author: tbooth-guest
Date: 2015-02-01 13:09:28 +0000 (Sun, 01 Feb 2015)
New Revision: 18711

Added:
   trunk/packages/galaxy/trunk/debian/apache-proxy-files/etc/apache2/conf-available/
   trunk/packages/galaxy/trunk/debian/apache-proxy-files/etc/apache2/conf-available/galaxy.conf
   trunk/packages/galaxy/trunk/debian/apache-proxy-files/etc/apache2/conf-available/pwauth.conf
Removed:
   trunk/packages/galaxy/trunk/debian/apache-proxy-files/etc/apache2/conf.d/
Log:
And a few changes that missed the last commit.


Added: trunk/packages/galaxy/trunk/debian/apache-proxy-files/etc/apache2/conf-available/galaxy.conf
===================================================================
--- trunk/packages/galaxy/trunk/debian/apache-proxy-files/etc/apache2/conf-available/galaxy.conf	                        (rev 0)
+++ trunk/packages/galaxy/trunk/debian/apache-proxy-files/etc/apache2/conf-available/galaxy.conf	2015-02-01 13:09:28 UTC (rev 18711)
@@ -0,0 +1,38 @@
+#  Note: These rules are essentially equivalent to the ones listed in the Wiki page
+#  but for those to work on BL they would need to be placed within the <VirtualHost>
+#  tags in /etc/apache2/sites-enabled/default whereas this variant can be put
+#  into conf.d without editing any existing files.  Order of rules is very important.
+
+#  The proxy directory holds the .htaccess file which activates pwauth authentication.
+#  If I put the .htaccess file in the top-level directory then pwauth ends up being run
+#  for every static file and it is slow, slow, slow.
+
+Alias /galaxy /usr/share/galaxy-server
+<Directory /usr/share/galaxy-server>
+Options -Indexes
+RewriteEngine on
+RewriteBase /galaxy
+RewriteRule ^(logout\..*) logout/$1 [L]
+RewriteRule ^(logout1\..*) static/$1 [L]
+RewriteRule ^logout/ - [L]
+RewriteRule ^static/style/(.*) static/june_2007_style/blue/$1 [L]
+RewriteRule ^static/scripts/packed/ - [L]
+RewriteRule ^static/scripts/(.*) static/scripts/packed/$1 [L]
+RewriteRule ^(static|test-data)/ - [L]
+RewriteRule ^(favicon.ico|robots.txt) static/$1 [L]
+RewriteRule (.*) proxy/$1
+</Directory>
+
+<Directory /usr/share/galaxy-server/logout>
+Options -Indexes
+AllowOverride AuthConfig FileInfo
+</Directory>
+
+<Directory /usr/share/galaxy-server/proxy>
+Options -Indexes
+DirectoryIndex ''
+AllowOverride AuthConfig FileInfo
+RewriteEngine on
+RewriteBase /galaxy/proxy
+RewriteRule (.*) http://localhost:8080/$1 [P,E=RU:%{REMOTE_USER}]
+</Directory>

Added: trunk/packages/galaxy/trunk/debian/apache-proxy-files/etc/apache2/conf-available/pwauth.conf
===================================================================
--- trunk/packages/galaxy/trunk/debian/apache-proxy-files/etc/apache2/conf-available/pwauth.conf	                        (rev 0)
+++ trunk/packages/galaxy/trunk/debian/apache-proxy-files/etc/apache2/conf-available/pwauth.conf	2015-02-01 13:09:28 UTC (rev 18711)
@@ -0,0 +1,4 @@
+#Added by the galaxy-server-apache-proxy package to enable users
+#to log into galaxy with their regular passwords.
+AddExternalAuth pwauth /usr/sbin/pwauth
+SetExternalAuthMethod pwauth pipe