Merge branch 'feature/couchdb' into develop

Conflicts:
	puppet/modules/site_shorewall/manifests/eip.pp

1 files changed, 35 insertions, 0 deletions

diff --git a/puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp b/puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp
new file mode 100644
index 00000000..87b21e62
--- /dev/null
+++ b/puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp
@@ -0,0 +1,35 @@
+define site_couchdb::apache_ssl_proxy ($key, $cert) {
+
+  include apache::ssl
+  apache::module {
+    'rewrite':      ensure => present;
+    'proxy':        ensure => present;
+    'proxy_http':   ensure => present;
+  }
+  apache::vhost::file { 'couchdb_proxy': }
+  # prevent 0-default.conf and 0-default_ssl.conf from apache module
+  # from starting on port 80 / 443
+  file { '/etc/apache2/ports.conf':
+    content => '',
+    mode    => '0644',
+    owner   => 'root',
+    group   => 'root',
+  }
+
+  file { '/etc/couchdb/server_cert.pem':
+    mode    => '0644',
+    owner   => 'couchdb',
+    group   => 'couchdb',
+    content => $cert,
+    notify  => Service[apache],
+  }
+
+  file { '/etc/couchdb/server_key.pem':
+    mode    => '0600',
+    owner   => 'couchdb',
+    group   => 'couchdb',
+    content => $key,
+    notify  => Service[apache],
+  }
+
+}