aboutsummaryrefslogtreecommitdiffstats
path: root/deployment/websites/templates/vhost_www.conf
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2012-02-13 21:01:00 +0000
committerMichael Scherer <misc@mageia.org>2012-02-13 21:01:00 +0000
commit181a9f4b840a7a895a9e52f28a6f01825fe03c80 (patch)
tree6fed3594b07d99bfc0fc3c26e1d41889b456128e /deployment/websites/templates/vhost_www.conf
parent8df321513e354fb4a2032a84b9dcab50b4f598d9 (diff)
downloadpuppet-181a9f4b840a7a895a9e52f28a6f01825fe03c80.tar
puppet-181a9f4b840a7a895a9e52f28a6f01825fe03c80.tar.gz
puppet-181a9f4b840a7a895a9e52f28a6f01825fe03c80.tar.bz2
puppet-181a9f4b840a7a895a9e52f28a6f01825fe03c80.tar.xz
puppet-181a9f4b840a7a895a9e52f28a6f01825fe03c80.zip
add old-wiki proxy to the previous wiki
Diffstat (limited to 'deployment/websites/templates/vhost_www.conf')
-rw-r--r--deployment/websites/templates/vhost_www.conf5
1 files changed, 5 insertions, 0 deletions
diff --git a/deployment/websites/templates/vhost_www.conf b/deployment/websites/templates/vhost_www.conf
index 6f9ce779..8c8c8acc 100644
--- a/deployment/websites/templates/vhost_www.conf
+++ b/deployment/websites/templates/vhost_www.conf
@@ -1,3 +1,8 @@
Redirect /wiki https://wiki.mageia.org/#
+# ProxyPreserveHost On is in another file
+ProxyPass /old-wiki/ http://ryu.zarb.org/wiki
+ProxyPassReverse /old-wiki/ http://ryu.zarb.org/wiki
+
+
php_value short_open_tag false