diff options
| -rw-r--r-- | puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp | 13 | ||||
| -rw-r--r-- | puppet/modules/site_couchdb/manifests/init.pp | 6 |
2 files changed, 2 insertions, 17 deletions
diff --git a/puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp b/puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp deleted file mode 100644 index 536dd8db..00000000 --- a/puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp +++ /dev/null @@ -1,13 +0,0 @@ -class site_couchdb::apache_ssl_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 - - package { 'apache2': ensure => absent } - -} diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp index e0f379cd..0fc951c2 100644 --- a/puppet/modules/site_couchdb/manifests/init.pp +++ b/puppet/modules/site_couchdb/manifests/init.pp @@ -5,6 +5,7 @@ class site_couchdb ( $bigcouch = false ) { $key = $x509['key'] $cert = $x509['cert'] $ca = $x509['ca_cert'] + $couchdb_config = hiera('couch') $couchdb_users = $couchdb_config['users'] $couchdb_admin = $couchdb_users['admin'] @@ -16,6 +17,7 @@ class site_couchdb ( $bigcouch = false ) { $couchdb_ca_daemon = $couchdb_users['ca_daemon'] $couchdb_ca_daemon_user = $couchdb_ca_daemon['username'] $couchdb_ca_daemon_pw = $couchdb_ca_daemon['password'] + $bigcouch_config = $couchdb_config['bigcouch'] $bigcouch_cookie = $bigcouch_config['cookie'] @@ -32,10 +34,6 @@ class site_couchdb ( $bigcouch = false ) { -> Couchdb::Add_user[$couchdb_webapp_user] -> Couchdb::Add_user[$couchdb_ca_daemon_user] - # this is here to disable and remove the proxy - include site_couchdb::apache_ssl_proxy - - # the above apache_ssl_proxy is replaced by the following stunnel class { 'site_couchdb::stunnel': key => $key, cert => $cert, |