[Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r596: Cause lsb2 to proxy several HTTP services from lsb1.
Jeff Licquia
licquia at linuxfoundation.org
Thu Jun 26 19:55:16 UTC 2014
------------------------------------------------------------
revno: 596
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: puppet-lsb
timestamp: Thu 2014-06-26 15:55:16 -0400
message:
Cause lsb2 to proxy several HTTP services from lsb1.
modified:
modules/apachehttpd/files/vhosts.d/lsb1.linux-foundation.org/000-default.conf
modules/apachehttpd/files/vhosts.d/lsb2.linux-foundation.org/000-default.conf
-------------- next part --------------
=== modified file 'modules/apachehttpd/files/vhosts.d/lsb1.linux-foundation.org/000-default.conf'
--- a/modules/apachehttpd/files/vhosts.d/lsb1.linux-foundation.org/000-default.conf 2014-06-26 19:44:10 +0000
+++ b/modules/apachehttpd/files/vhosts.d/lsb1.linux-foundation.org/000-default.conf 2014-06-26 19:55:16 +0000
@@ -75,9 +75,18 @@
RewriteRule ^/spec http://refspecs.linuxfoundation.org/lsb.shtml [L,R=301]
- # cert system
-
- RewriteRule ^/lsb-cert(.*)$ https://www.linuxbase.org/lsb-cert$1 [L,R=301]
+ # lsb-cert
+
+ Alias /lsb-cert /srv/www/modules/lsb-cert
+
+ <Directory /srv/www/modules/lsb-cert>
+ Options FollowSymLinks Indexes
+ AllowOverride None
+ Order allow,deny
+ Allow from all
+ php_value upload_max_filesize 200M
+ php_value post_max_size 200M
+ </Directory>
# Navigator
@@ -116,7 +125,19 @@
# prdb
- RewriteRule ^/prdb(.*)$ https://www.linuxbase.org/prdb$1 [L,R=301]
+ Alias /prdb /srv/www/modules/prdb
+ <Directory "/srv/www/modules/prdb/">
+ Options +FollowSymLinks -Indexes
+ AllowOverride None
+ Order allow,deny
+ Allow from all
+
+ <FilesMatch "\.inc$">
+ Order allow,deny
+ allow from 127
+ deny from all
+ </FilesMatch>
+ </Directory>
# irc
@@ -214,6 +235,8 @@
Deny from all
</Directory>
+ # lsb-cert
+
Alias /lsb-cert /srv/www/modules/lsb-cert
<Directory /srv/www/modules/lsb-cert>
=== modified file 'modules/apachehttpd/files/vhosts.d/lsb2.linux-foundation.org/000-default.conf'
--- a/modules/apachehttpd/files/vhosts.d/lsb2.linux-foundation.org/000-default.conf 2014-06-26 19:44:10 +0000
+++ b/modules/apachehttpd/files/vhosts.d/lsb2.linux-foundation.org/000-default.conf 2014-06-26 19:55:16 +0000
@@ -205,16 +205,18 @@
Deny from all
</Directory>
- Alias /lsb-cert /srv/www/modules/lsb-cert
-
- <Directory /srv/www/modules/lsb-cert>
- Options FollowSymLinks Indexes
- AllowOverride None
+ ProxyPass /buildbot http://vm1.linuxbase.org/buildbot
+ ProxyPassReverse /buildbot http://vm1.linuxbase.org/buildbot
+
+ # lsb-cert
+
+ ProxyPass /lsb-cert http://vm1.linuxbase.org/lsb-cert
+ ProxyPassReverse /lsb-cert http://vm1.linuxbase.org/lsb-cert
+
+ <Location /lsb-cert>
Order allow,deny
Allow from all
- php_value upload_max_filesize 200M
- php_value post_max_size 200M
- </Directory>
+ </Location>
# buildbot
@@ -228,19 +230,13 @@
# prdb
- Alias /prdb /srv/www/modules/prdb
- <Directory "/srv/www/modules/prdb/">
- Options +FollowSymLinks -Indexes
- AllowOverride None
+ ProxyPass /prdb http://vm1.linuxbase.org/prdb
+ ProxyPassReverse /prdb http://vm1.linuxbase.org/prdb
+
+ <Location /prdb>
Order allow,deny
Allow from all
-
- <FilesMatch "\.inc$">
- Order allow,deny
- allow from 127
- deny from all
- </FilesMatch>
- </Directory>
+ </Location>
# irc
More information about the lsb-messages
mailing list