diff options
author | varac <varacanero@zeromail.org> | 2013-03-16 15:01:48 +0100 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2013-03-16 15:01:48 +0100 |
commit | 8c91365ca62d6f7e970f7a1fbda7be82a1fc83c3 (patch) | |
tree | 5ca58ed2e9d52f7bd4071b6902cba064a75d81f6 /puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp | |
parent | a275999ab39b49afa2bb0c998c58aec424b4a8c0 (diff) | |
parent | 90c5b205c4764351e6ea707b965c5e6daca1c0b7 (diff) |
Merge branch 'stunnel_switch' into develop
Diffstat (limited to 'puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp')
-rw-r--r-- | puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp | 30 |
1 files changed, 9 insertions, 21 deletions
diff --git a/puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp b/puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp index 7739473e..536dd8db 100644 --- a/puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp +++ b/puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp @@ -1,25 +1,13 @@ -define site_couchdb::apache_ssl_proxy ($key, $cert) { +class site_couchdb::apache_ssl_proxy { - $apache_no_default_site = true - include apache - apache::module { - 'proxy': ensure => present; - 'proxy_http': ensure => present; - 'rewrite': ensure => present; - 'ssl': ensure => present; - } - apache::vhost::file { 'couchdb_proxy': } +# This is here to disable the previously configured apache ssl proxy +# we were using this, but have switched to stunnel instead. +# +# Unfortunately, the current apache shared module doesn't handle +# ensure=>absent, so this is going to be done the crude way, and will only +# work for debian+derivitives, which is fine for now, but not good for the +# future - x509::key { - 'leap_couchdb': - content => $key, - notify => Service[apache]; - } - - x509::cert { - 'leap_couchdb': - content => $cert, - notify => Service[apache]; - } + package { 'apache2': ensure => absent } } |