diff options
| author | Michael Scherer <misc@mageia.org> | 2012-01-14 23:17:40 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2012-01-14 23:17:40 +0000 |
| commit | 53721009dfe6d485cab90eb1b493ce2be2f87bdb (patch) | |
| tree | a67d21d84f021d563e0ed25eae63b183f72e6d40 | |
| parent | b03704f7ed09f23d2c6bc8c7b20290318dc0cb8b (diff) | |
| download | puppet-53721009dfe6d485cab90eb1b493ce2be2f87bdb.tar puppet-53721009dfe6d485cab90eb1b493ce2be2f87bdb.tar.gz puppet-53721009dfe6d485cab90eb1b493ce2be2f87bdb.tar.bz2 puppet-53721009dfe6d485cab90eb1b493ce2be2f87bdb.tar.xz puppet-53721009dfe6d485cab90eb1b493ce2be2f87bdb.zip | |
fix reverse proxy, the whole usage of use_ssl was incorrect ( some refactoring could be done, but not urgent )
| -rw-r--r-- | deployment/websites/manifests/www.pp | 4 | ||||
| -rw-r--r-- | deployment/websites/templates/vhost_proxy_mailman.conf | 12 | ||||
| -rw-r--r-- | deployment/websites/templates/vhost_proxy_mailman_ssl.conf | 14 |
3 files changed, 28 insertions, 2 deletions
diff --git a/deployment/websites/manifests/www.pp b/deployment/websites/manifests/www.pp index 511b537e..7eb6daea 100644 --- a/deployment/websites/manifests/www.pp +++ b/deployment/websites/manifests/www.pp @@ -19,7 +19,7 @@ class websites { } apache::vhost_base { "$vhost": - content => template('websites/vhost_www.conf'), + content => template('websites/vhost_www.conf', "websites/vhost_proxy_mailman.conf"), location => $vhostdir, options => ['FollowSymLinks'], } @@ -27,7 +27,7 @@ class websites { apache::vhost_base { "ssl_$vhost": use_ssl => true, vhost => $vhost, - content => template('websites/vhost_www.conf'), + content => template('websites/vhost_www.conf', "websites/vhost_proxy_mailman_ssl.conf"), location => $vhostdir, options => ['FollowSymLinks'], } diff --git a/deployment/websites/templates/vhost_proxy_mailman.conf b/deployment/websites/templates/vhost_proxy_mailman.conf new file mode 100644 index 00000000..e57679b4 --- /dev/null +++ b/deployment/websites/templates/vhost_proxy_mailman.conf @@ -0,0 +1,12 @@ + +ProxyRequests Off +ProxyPreserveHost On + +<Proxy *> + Order deny,allow + Allow from all +</Proxy> + +ProxyPass /mailman/ http://ryu.zarb.org/mailman/ +ProxyPassReverse /mailman/ http://ryu.zarb.org/mailman/ + diff --git a/deployment/websites/templates/vhost_proxy_mailman_ssl.conf b/deployment/websites/templates/vhost_proxy_mailman_ssl.conf new file mode 100644 index 00000000..479b912d --- /dev/null +++ b/deployment/websites/templates/vhost_proxy_mailman_ssl.conf @@ -0,0 +1,14 @@ + +ProxyRequests Off +ProxyPreserveHost On + +<Proxy *> + Order deny,allow + Allow from all +</Proxy> + +SSLProxyEngine On + +ProxyPass /mailman/ https://ryu.zarb.org/mailman/ +ProxyPassReverse /mailman/ https://ryu.zarb.org/mailman/ + |