aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2012-01-14 23:21:11 +0000
committerMichael Scherer <misc@mageia.org>2012-01-14 23:21:11 +0000
commita238cb2f9998add6f20cea78d2d12f058665880e (patch)
treec47ce67d240cd8031a10abfb3ccf16e4af7c393e
parent53721009dfe6d485cab90eb1b493ce2be2f87bdb (diff)
downloadpuppet-a238cb2f9998add6f20cea78d2d12f058665880e.tar
puppet-a238cb2f9998add6f20cea78d2d12f058665880e.tar.gz
puppet-a238cb2f9998add6f20cea78d2d12f058665880e.tar.bz2
puppet-a238cb2f9998add6f20cea78d2d12f058665880e.tar.xz
puppet-a238cb2f9998add6f20cea78d2d12f058665880e.zip
also clean the old configuration that was split by last commit
-rw-r--r--deployment/websites/templates/vhost_www.conf21
1 files changed, 0 insertions, 21 deletions
diff --git a/deployment/websites/templates/vhost_www.conf b/deployment/websites/templates/vhost_www.conf
index 5773670d..6f9ce779 100644
--- a/deployment/websites/templates/vhost_www.conf
+++ b/deployment/websites/templates/vhost_www.conf
@@ -1,24 +1,3 @@
Redirect /wiki https://wiki.mageia.org/#
-ProxyRequests Off
-
-<Proxy *>
- Order deny,allow
- Allow from all
-</Proxy>
-
-<%- if use_ssl then
- protocol = 'https://'
- else
- protocol = 'http://'
- end
--%>
-<%- if use_ssl -%>
-SSLProxyEngine On
-<%- end -%>
-
-ProxyPreserveHost On
-ProxyPass /mailman/ <%= protocol %>://ryu.zarb.org/mailman/
-ProxyPassReverse /mailman/ <%= protocol %>://ryu.zarb.org/mailman/
-
php_value short_open_tag false