configure apache ssl proxy for couchdb

2 files changed, 18 insertions, 10 deletions

diff --git a/puppet/modules/site_couchdb/files/local.ini b/puppet/modules/site_couchdb/files/local.ini
index 79dd112e..485c9a29 100644
--- a/puppet/modules/site_couchdb/files/local.ini
+++ b/puppet/modules/site_couchdb/files/local.ini
@@ -46,14 +46,14 @@
 [daemons]
 ; enable SSL support by uncommenting the following line and supply the PEM's below.
 ; the default ssl port CouchDB listens on is 6984
-httpsd = {couch_httpd, start_link, [https]}
+;httpsd = {couch_httpd, start_link, [https]}
 
 [ssl]
-cert_file = /etc/couchdb/server_cert.pem
-key_file  = /etc/couchdb/server_key.pem
+;cert_file = /etc/couchdb/server_cert.pem
+;key_file  = /etc/couchdb/server_key.pem
 ;password = somepassword
 ; set to true to validate peer certificates
-verify_ssl_certificates = false
+;verify_ssl_certificates = false
 ; Path to file containing PEM encoded CA certificates (trusted
 ; certificates used for verifying a peer certificate). May be omitted if
 ; you do not want to verify the peer.
@@ -61,7 +61,7 @@ verify_ssl_certificates = false
 ; The verification fun (optionnal) if not specidied, the default
 ; verification fun will be used.
 ;verify_fun = {Module, VerifyFun}
-ssl_certificate_max_depth = 1
+;ssl_certificate_max_depth = 1
 ; To enable Virtual Hosts in CouchDB, add a vhost = path directive. All requests to
 ; the Virual Host will be redirected to the path. In the example below all requests
 ; to http://example.com/ are redirected to /database.
diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp
index e3f5e59f..b296279c 100644
--- a/puppet/modules/site_couchdb/manifests/init.pp
+++ b/puppet/modules/site_couchdb/manifests/init.pp
@@ -9,11 +9,19 @@ class site_couchdb {
 
   include site_couchdb::package
   include site_couchdb::configure
+  include couchdb::deploy_config
 
 
-  couchdb::ssl::deploy_cert { 'cert':
-    key  => $key,
-    cert => $cert,
-  }
-  include couchdb::deploy_config
+  #couchdb::ssl::deploy_cert { 'cert':
+  #  key  => $key,
+  #  cert => $cert,
+  #}
+  
+  include apache::ssl
+  apache::module { 
+    'rewrite': ensure => present;
+    'proxy':   ensure => present; 
+    'proxy_http':   ensure => present; 
+   }
+  apache::vhost::file { 'couchdb_proxy': }
 }