summaryrefslogtreecommitdiff
path: root/puppet/modules/site_apache
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-03-16 15:01:48 +0100
committervarac <varacanero@zeromail.org>2013-03-16 15:01:48 +0100
commit8c91365ca62d6f7e970f7a1fbda7be82a1fc83c3 (patch)
tree5ca58ed2e9d52f7bd4071b6902cba064a75d81f6 /puppet/modules/site_apache
parenta275999ab39b49afa2bb0c998c58aec424b4a8c0 (diff)
parent90c5b205c4764351e6ea707b965c5e6daca1c0b7 (diff)
Merge branch 'stunnel_switch' into develop
Diffstat (limited to 'puppet/modules/site_apache')
-rw-r--r--puppet/modules/site_apache/files/vhosts.d/couchdb_proxy.conf10
1 files changed, 0 insertions, 10 deletions
diff --git a/puppet/modules/site_apache/files/vhosts.d/couchdb_proxy.conf b/puppet/modules/site_apache/files/vhosts.d/couchdb_proxy.conf
deleted file mode 100644
index 0dff2cd6..00000000
--- a/puppet/modules/site_apache/files/vhosts.d/couchdb_proxy.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-Listen 0.0.0.0:6984
-
-<VirtualHost *:6984>
- SSLEngine On
- SSLProxyEngine On
- SSLCertificateKeyFile /etc/x509/keys/leap_couchdb.key
- SSLCertificateFile /etc/x509/certs/leap_couchdb.crt
- ProxyPass / http://127.0.0.1:5984/
- ProxyPassReverse / http://127.0.0.1:5984/
-</VirtualHost>