From 4c5f0726d3eee0caa62f509743762968dc4b544b Mon Sep 17 00:00:00 2001 From: varac Date: Sat, 13 Oct 2012 11:00:17 +0200 Subject: use debian unstable for couchdb --- puppet/modules/site_couchdb/manifests/init.pp | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 puppet/modules/site_couchdb/manifests/init.pp (limited to 'puppet/modules/site_couchdb/manifests') diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp new file mode 100644 index 00000000..4e347567 --- /dev/null +++ b/puppet/modules/site_couchdb/manifests/init.pp @@ -0,0 +1,6 @@ +class site_config::couchdb { + apt::sources_list { "unstable.list": + source => [ "puppet:///modules/site_apt/unstable.list"], + } + +} -- cgit v1.2.3 From 01732be30c06919f85e4887a500f7e9b11e56e4f Mon Sep 17 00:00:00 2001 From: varac Date: Sat, 13 Oct 2012 11:08:22 +0200 Subject: use site_couchdb --- puppet/modules/site_couchdb/manifests/init.pp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'puppet/modules/site_couchdb/manifests') diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp index 4e347567..bb14595a 100644 --- a/puppet/modules/site_couchdb/manifests/init.pp +++ b/puppet/modules/site_couchdb/manifests/init.pp @@ -1,6 +1,11 @@ -class site_config::couchdb { - apt::sources_list { "unstable.list": - source => [ "puppet:///modules/site_apt/unstable.list"], +class site_couchdb { + apt::sources_list { 'unstable.list': + source => [ 'puppet:///modules/site_apt/unstable.list'], + } + + + class { 'couchdb': + #bind => '0.0.0.0' } } -- cgit v1.2.3 From 06a1546a36698dd75fb500ad2a12e9bbf9b43f03 Mon Sep 17 00:00:00 2001 From: varac Date: Sat, 13 Oct 2012 11:30:30 +0200 Subject: install couchdb from unstable, see init.pp --- puppet/modules/site_couchdb/manifests/init.pp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'puppet/modules/site_couchdb/manifests') diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp index bb14595a..06c29181 100644 --- a/puppet/modules/site_couchdb/manifests/init.pp +++ b/puppet/modules/site_couchdb/manifests/init.pp @@ -1,8 +1,15 @@ class site_couchdb { + + # for now, we need to install couchdb from unstable, + # because of this bug while installing: + # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=681549 + # can be removed when couchdb/1.2.0-2 is integrated into testing apt::sources_list { 'unstable.list': source => [ 'puppet:///modules/site_apt/unstable.list'], } - + apt::preferences_snippet{ + 'couchdb': release => "unstable", priority => 999; + } class { 'couchdb': #bind => '0.0.0.0' -- cgit v1.2.3 From 69ba8553f483d99782775e8ed5ab01cd45a75e72 Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 30 Oct 2012 16:01:41 +0100 Subject: configure unstable pinning for couchdb before install --- puppet/modules/site_couchdb/manifests/init.pp | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'puppet/modules/site_couchdb/manifests') diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp index 06c29181..a9e6343a 100644 --- a/puppet/modules/site_couchdb/manifests/init.pp +++ b/puppet/modules/site_couchdb/manifests/init.pp @@ -1,18 +1,5 @@ class site_couchdb { - # for now, we need to install couchdb from unstable, - # because of this bug while installing: - # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=681549 - # can be removed when couchdb/1.2.0-2 is integrated into testing - apt::sources_list { 'unstable.list': - source => [ 'puppet:///modules/site_apt/unstable.list'], - } - apt::preferences_snippet{ - 'couchdb': release => "unstable", priority => 999; - } - - class { 'couchdb': - #bind => '0.0.0.0' - } + class {'site_couchdb::package':} -> class {'site_couchdb::configure':} } -- cgit v1.2.3 From 761e87e8ab93bfab4bd81b25125c1c8fb554c8a5 Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 30 Oct 2012 16:41:51 +0100 Subject: try explicit class relation --- puppet/modules/site_couchdb/manifests/init.pp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'puppet/modules/site_couchdb/manifests') diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp index a9e6343a..57b1d038 100644 --- a/puppet/modules/site_couchdb/manifests/init.pp +++ b/puppet/modules/site_couchdb/manifests/init.pp @@ -1,5 +1,10 @@ class site_couchdb { - class {'site_couchdb::package':} -> class {'site_couchdb::configure':} + # install couchdb package first, then configure it + + Class[site_couchdb::package] -> Class[site_couchdb::configure] + + include site_couchdb::package + include site_couchdb::configure } -- cgit v1.2.3 From 139fe307ebc544e95f7c84bc921bbed3d9f20857 Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 30 Oct 2012 16:42:00 +0100 Subject: try explicit class relation --- puppet/modules/site_couchdb/manifests/configure.pp | 7 +++++++ puppet/modules/site_couchdb/manifests/package.pp | 13 +++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 puppet/modules/site_couchdb/manifests/configure.pp create mode 100644 puppet/modules/site_couchdb/manifests/package.pp (limited to 'puppet/modules/site_couchdb/manifests') diff --git a/puppet/modules/site_couchdb/manifests/configure.pp b/puppet/modules/site_couchdb/manifests/configure.pp new file mode 100644 index 00000000..969e2e4d --- /dev/null +++ b/puppet/modules/site_couchdb/manifests/configure.pp @@ -0,0 +1,7 @@ +class site_couchdb::configure { + #Class[site_couchdb::package] -> Class[site_couchdb::configure] + class { 'couchdb': + #bind => '0.0.0.0' + } + +} diff --git a/puppet/modules/site_couchdb/manifests/package.pp b/puppet/modules/site_couchdb/manifests/package.pp new file mode 100644 index 00000000..c091316a --- /dev/null +++ b/puppet/modules/site_couchdb/manifests/package.pp @@ -0,0 +1,13 @@ +class site_couchdb::package { + + # for now, we need to install couchdb from unstable, + # because of this bug while installing: + # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=681549 + # can be removed when couchdb/1.2.0-2 is integrated into testing + apt::sources_list { 'unstable.list': + source => [ 'puppet:///modules/site_apt/unstable.list'], + } + apt::preferences_snippet{ + 'couchdb': release => 'unstable', priority => 999; + } +} -- cgit v1.2.3 From ffc0bba5390b30093b0cfdf9f927ba1f7db66ee8 Mon Sep 17 00:00:00 2001 From: varac Date: Thu, 1 Nov 2012 09:15:54 +0100 Subject: another try of class relationships --- puppet/modules/site_couchdb/manifests/configure.pp | 4 ++-- puppet/modules/site_couchdb/manifests/init.pp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'puppet/modules/site_couchdb/manifests') diff --git a/puppet/modules/site_couchdb/manifests/configure.pp b/puppet/modules/site_couchdb/manifests/configure.pp index 969e2e4d..3ab87e1e 100644 --- a/puppet/modules/site_couchdb/manifests/configure.pp +++ b/puppet/modules/site_couchdb/manifests/configure.pp @@ -1,7 +1,7 @@ class site_couchdb::configure { - #Class[site_couchdb::package] -> Class[site_couchdb::configure] + Class[site_couchdb::package] -> Class[couchdb] class { 'couchdb': + require => Class['site_couchdb::package'] #bind => '0.0.0.0' } - } diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp index 57b1d038..e27bdd59 100644 --- a/puppet/modules/site_couchdb/manifests/init.pp +++ b/puppet/modules/site_couchdb/manifests/init.pp @@ -1,10 +1,10 @@ class site_couchdb { # install couchdb package first, then configure it - - Class[site_couchdb::package] -> Class[site_couchdb::configure] + Class['site_couchdb::package'] -> Class['site_couchdb::configure'] include site_couchdb::package include site_couchdb::configure + include couchdb::deploy_config } -- cgit v1.2.3 From ced30b2e8eb182fa099d407e2d969288bb07b0dd Mon Sep 17 00:00:00 2001 From: varac Date: Thu, 1 Nov 2012 09:39:37 +0100 Subject: deploy ssl certs --- puppet/modules/site_couchdb/manifests/init.pp | 1 + 1 file changed, 1 insertion(+) (limited to 'puppet/modules/site_couchdb/manifests') diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp index e27bdd59..8865bde8 100644 --- a/puppet/modules/site_couchdb/manifests/init.pp +++ b/puppet/modules/site_couchdb/manifests/init.pp @@ -6,5 +6,6 @@ class site_couchdb { include site_couchdb::package include site_couchdb::configure + include couchdb::ssl::deploy_certs include couchdb::deploy_config } -- cgit v1.2.3 From 9f7a64ab2813e2c475a776efff4ad9a380ca6cc1 Mon Sep 17 00:00:00 2001 From: varac Date: Thu, 1 Nov 2012 10:09:37 +0100 Subject: deploy ssl cert working --- puppet/modules/site_couchdb/manifests/init.pp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'puppet/modules/site_couchdb/manifests') diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp index 8865bde8..f1cca46f 100644 --- a/puppet/modules/site_couchdb/manifests/init.pp +++ b/puppet/modules/site_couchdb/manifests/init.pp @@ -1,11 +1,19 @@ class site_couchdb { + $couchdb_config = hiera('couchdb') + $key = $couchdb_config['key'] + $cert = $couchdb_config['crt'] + # install couchdb package first, then configure it Class['site_couchdb::package'] -> Class['site_couchdb::configure'] include site_couchdb::package include site_couchdb::configure - include couchdb::ssl::deploy_certs + + couchdb::ssl::deploy_cert { 'cert': + key => $key, + cert => $cert, + } include couchdb::deploy_config } -- cgit v1.2.3 From 6a2453574e45b6778bfc66fc12a47421669d1614 Mon Sep 17 00:00:00 2001 From: varac Date: Thu, 1 Nov 2012 15:15:11 +0100 Subject: use couchdb x509 hiera values --- puppet/modules/site_couchdb/manifests/init.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'puppet/modules/site_couchdb/manifests') diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp index f1cca46f..e3f5e59f 100644 --- a/puppet/modules/site_couchdb/manifests/init.pp +++ b/puppet/modules/site_couchdb/manifests/init.pp @@ -1,8 +1,8 @@ class site_couchdb { - $couchdb_config = hiera('couchdb') - $key = $couchdb_config['key'] - $cert = $couchdb_config['crt'] + $x509 = hiera('x509') + $key = $x509['key'] + $cert = $x509['cert'] # install couchdb package first, then configure it Class['site_couchdb::package'] -> Class['site_couchdb::configure'] -- cgit v1.2.3 From 82c21f345c78c4f06e4aa78ab6020f1393816812 Mon Sep 17 00:00:00 2001 From: varac Date: Sat, 3 Nov 2012 10:18:38 +0100 Subject: added local.d/admin.ini to set admin pw --- puppet/modules/site_couchdb/manifests/configure.pp | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'puppet/modules/site_couchdb/manifests') diff --git a/puppet/modules/site_couchdb/manifests/configure.pp b/puppet/modules/site_couchdb/manifests/configure.pp index 3ab87e1e..0d0eb24f 100644 --- a/puppet/modules/site_couchdb/manifests/configure.pp +++ b/puppet/modules/site_couchdb/manifests/configure.pp @@ -1,7 +1,18 @@ class site_couchdb::configure { - Class[site_couchdb::package] -> Class[couchdb] + Class[site_couchdb::package] -> Class[couchdb] + class { 'couchdb': - require => Class['site_couchdb::package'] - #bind => '0.0.0.0' + require => Class['site_couchdb::package'], + } + + $adminpw = hiera('couchdb_adminpw') + file { '/etc/couchdb/local.d/admin.ini': + content => "[admins] +admin = $adminpw +", + mode => '0600', + owner => 'couchdb', + group => 'couchdb', + notify => Service[couchdb] } } -- cgit v1.2.3 From 5493d362f7b3abd6c8aa9350341a551c53622604 Mon Sep 17 00:00:00 2001 From: varac Date: Sat, 3 Nov 2012 11:33:38 +0100 Subject: configure apache ssl proxy for couchdb --- puppet/modules/site_couchdb/manifests/init.pp | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'puppet/modules/site_couchdb/manifests') 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': } } -- cgit v1.2.3 From 5981a73edce0a64f26bb8abb799c180b856abbbd Mon Sep 17 00:00:00 2001 From: varac Date: Sat, 3 Nov 2012 11:43:58 +0100 Subject: overwrite /etc/apache2/ports.conf so 0-default.conf and 0-default_ssl.conf don't start on port 80/443 --- puppet/modules/site_couchdb/manifests/init.pp | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'puppet/modules/site_couchdb/manifests') diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp index b296279c..4c923b35 100644 --- a/puppet/modules/site_couchdb/manifests/init.pp +++ b/puppet/modules/site_couchdb/manifests/init.pp @@ -16,12 +16,20 @@ class site_couchdb { # key => $key, # cert => $cert, #} - + include apache::ssl - apache::module { - 'rewrite': ensure => present; - 'proxy': ensure => present; - 'proxy_http': ensure => present; - } + 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', + } } -- cgit v1.2.3 From b7d3bd9c119ce70f1823ffd06567a127c390c4f0 Mon Sep 17 00:00:00 2001 From: varac Date: Sat, 3 Nov 2012 12:16:22 +0100 Subject: deploy server_cert.pem + server_key.pem, notify apache --- puppet/modules/site_couchdb/manifests/init.pp | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) (limited to 'puppet/modules/site_couchdb/manifests') diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp index 4c923b35..04b46bf6 100644 --- a/puppet/modules/site_couchdb/manifests/init.pp +++ b/puppet/modules/site_couchdb/manifests/init.pp @@ -11,12 +11,6 @@ class site_couchdb { include site_couchdb::configure include couchdb::deploy_config - - #couchdb::ssl::deploy_cert { 'cert': - # key => $key, - # cert => $cert, - #} - include apache::ssl apache::module { 'rewrite': ensure => present; @@ -32,4 +26,21 @@ class site_couchdb { 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], + } + } -- cgit v1.2.3 From 995bde9b3c1c54b70b5884e2d06534a5cf38d654 Mon Sep 17 00:00:00 2001 From: varac Date: Sat, 3 Nov 2012 21:34:54 +0100 Subject: query hiera adminpw in site_couchdb --- puppet/modules/site_couchdb/manifests/configure.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'puppet/modules/site_couchdb/manifests') diff --git a/puppet/modules/site_couchdb/manifests/configure.pp b/puppet/modules/site_couchdb/manifests/configure.pp index 0d0eb24f..3adce785 100644 --- a/puppet/modules/site_couchdb/manifests/configure.pp +++ b/puppet/modules/site_couchdb/manifests/configure.pp @@ -5,7 +5,7 @@ class site_couchdb::configure { require => Class['site_couchdb::package'], } - $adminpw = hiera('couchdb_adminpw') + $adminpw = $site_couchdb::adminpw file { '/etc/couchdb/local.d/admin.ini': content => "[admins] admin = $adminpw -- cgit v1.2.3 From 8f0ea9039310a348ade5e1e5637aa62fce01579f Mon Sep 17 00:00:00 2001 From: varac Date: Sat, 3 Nov 2012 21:44:12 +0100 Subject: install apache_ssl_proxy, add users, create DBs + security roles --- puppet/modules/site_couchdb/manifests/init.pp | 58 ++++++++++++++------------- 1 file changed, 30 insertions(+), 28 deletions(-) (limited to 'puppet/modules/site_couchdb/manifests') diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp index 04b46bf6..26e5cdfd 100644 --- a/puppet/modules/site_couchdb/manifests/init.pp +++ b/puppet/modules/site_couchdb/manifests/init.pp @@ -1,8 +1,16 @@ class site_couchdb { - $x509 = hiera('x509') - $key = $x509['key'] - $cert = $x509['cert'] + $x509 = hiera('x509') + $key = $x509['key'] + $cert = $x509['cert'] + $adminpw = hiera('couchdb_adminpw') + $couchdb_leap_web_user = hiera('couchdb_leap_web_user') + $couchdb_leap_web_username = $couchdb_leap_web_user['user'] + $couchdb_leap_web_pw = $couchdb_leap_web_user['pw'] + $couchdb_leap_ca_user = hiera('couchdb_leap_ca_user') + $couchdb_leap_ca_username = $couchdb_leap_ca_user['user'] + $couchdb_leap_ca_pw = $couchdb_leap_ca_user['pw'] + $couchdb_host = "admin:$adminpw@127.0.0.1:5984" # install couchdb package first, then configure it Class['site_couchdb::package'] -> Class['site_couchdb::configure'] @@ -11,36 +19,30 @@ class site_couchdb { include site_couchdb::configure include couchdb::deploy_config - include apache::ssl - apache::module { - 'rewrite': ensure => present; - 'proxy': ensure => present; - 'proxy_http': ensure => present; + site_couchdb::apache_ssl_proxy { 'apache_ssl_proxy': + key => $key, + cert => $cert } - 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', + + couchdb::add_user { $couchdb_leap_web_username: + host => $couchdb_host, + roles => '["certs"]', + pw => $couchdb_leap_web_pw } - file { '/etc/couchdb/server_cert.pem': - mode => '0644', - owner => 'couchdb', - group => 'couchdb', - content => $cert, - notify => Service[apache], + couchdb::add_user { $couchdb_leap_ca_username: + host => $couchdb_host, + roles => '["certs"]', + pw => $couchdb_leap_ca_pw } - file { '/etc/couchdb/server_key.pem': - mode => '0600', - owner => 'couchdb', - group => 'couchdb', - content => $key, - notify => Service[apache], + couchdb::create_db { 'leap_web': + host => $couchdb_host, + readers => "{ \"names\": [\"leap_web\"], \"roles\": [] }" } + couchdb::create_db { 'leap_ca': + host => $couchdb_host, + readers => "{ \"names\": [], \"roles\": [\"certs\"] }" + } } -- cgit v1.2.3 From b1a4e8c8b31e7b648b4eb5e7ef0e165a23a3110b Mon Sep 17 00:00:00 2001 From: varac Date: Sat, 3 Nov 2012 21:48:35 +0100 Subject: added apache_ssl_proxy.pp --- .../site_couchdb/manifests/apache_ssl_proxy.pp | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp (limited to 'puppet/modules/site_couchdb/manifests') 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], + } + +} -- cgit v1.2.3 From 0a3fdfff7bd8c11d6099f23aef505fbd5333ba99 Mon Sep 17 00:00:00 2001 From: varac Date: Sun, 4 Nov 2012 20:45:53 +0100 Subject: deploy couchdb initscript, restart couchdb after config file change --- puppet/modules/site_couchdb/manifests/configure.pp | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'puppet/modules/site_couchdb/manifests') diff --git a/puppet/modules/site_couchdb/manifests/configure.pp b/puppet/modules/site_couchdb/manifests/configure.pp index 3adce785..4343cc2b 100644 --- a/puppet/modules/site_couchdb/manifests/configure.pp +++ b/puppet/modules/site_couchdb/manifests/configure.pp @@ -2,10 +2,17 @@ class site_couchdb::configure { Class[site_couchdb::package] -> Class[couchdb] class { 'couchdb': - require => Class['site_couchdb::package'], + require => Class['site_couchdb::package'], } + + + file { '/etc/init.d/couchdb': + source => 'puppet:///modules/site_couchdb/couchdb', + mode => '0755', + owner => 'root', + group => 'root', } - $adminpw = $site_couchdb::adminpw + $adminpw = $site_couchdb::adminpw file { '/etc/couchdb/local.d/admin.ini': content => "[admins] admin = $adminpw @@ -15,4 +22,12 @@ admin = $adminpw group => 'couchdb', notify => Service[couchdb] } + + + exec { '/etc/init.d/couchdb restart; sleep 3': + path => ['/bin', '/usr/bin',], + subscribe => File['/etc/couchdb/local.d/admin.ini', + '/etc/couchdb/local.ini'], + refreshonly => true + } } -- cgit v1.2.3 From 41a10e2475d056a621964f17757b28581661b053 Mon Sep 17 00:00:00 2001 From: varac Date: Sun, 4 Nov 2012 20:47:25 +0100 Subject: working resource relationships for deployment --- puppet/modules/site_couchdb/manifests/init.pp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'puppet/modules/site_couchdb/manifests') diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp index 26e5cdfd..e4d97e34 100644 --- a/puppet/modules/site_couchdb/manifests/init.pp +++ b/puppet/modules/site_couchdb/manifests/init.pp @@ -12,8 +12,16 @@ class site_couchdb { $couchdb_leap_ca_pw = $couchdb_leap_ca_user['pw'] $couchdb_host = "admin:$adminpw@127.0.0.1:5984" - # install couchdb package first, then configure it - Class['site_couchdb::package'] -> Class['site_couchdb::configure'] + Class['site_couchdb::package'] + -> Package ['couchdb'] + -> File['/etc/init.d/couchdb'] + -> File['/etc/couchdb/local.ini'] + -> File['/etc/couchdb/local.d/admin.ini'] + -> Couchdb::Create_db[leap_web] + -> Couchdb::Create_db[leap_ca] + -> Couchdb::Add_user[leap_web] + -> Couchdb::Add_user[leap_ca] + -> Site_couchdb::Apache_ssl_proxy['apache_ssl_proxy'] include site_couchdb::package include site_couchdb::configure -- cgit v1.2.3 From 561ea1c6dace320455990b880d8a7da421fcb8bc Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 6 Nov 2012 10:36:18 +0100 Subject: sleep some more after couchdb restart, adopt new hiera creditials --- puppet/modules/site_couchdb/manifests/configure.pp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'puppet/modules/site_couchdb/manifests') diff --git a/puppet/modules/site_couchdb/manifests/configure.pp b/puppet/modules/site_couchdb/manifests/configure.pp index 4343cc2b..25ea7a0b 100644 --- a/puppet/modules/site_couchdb/manifests/configure.pp +++ b/puppet/modules/site_couchdb/manifests/configure.pp @@ -12,10 +12,9 @@ class site_couchdb::configure { group => 'root', } - $adminpw = $site_couchdb::adminpw file { '/etc/couchdb/local.d/admin.ini': content => "[admins] -admin = $adminpw +admin = $site_couchdb::couchdb_admin_pw ", mode => '0600', owner => 'couchdb', @@ -24,7 +23,7 @@ admin = $adminpw } - exec { '/etc/init.d/couchdb restart; sleep 3': + exec { '/etc/init.d/couchdb restart; sleep 6': path => ['/bin', '/usr/bin',], subscribe => File['/etc/couchdb/local.d/admin.ini', '/etc/couchdb/local.ini'], -- cgit v1.2.3 From a5b8f30cdb68997e523c0f9fac65d894acddf40f Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 6 Nov 2012 10:36:45 +0100 Subject: adopt new hiera creditials --- puppet/modules/site_couchdb/manifests/init.pp | 51 +++++++++++++++------------ 1 file changed, 29 insertions(+), 22 deletions(-) (limited to 'puppet/modules/site_couchdb/manifests') diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp index e4d97e34..30ce7f54 100644 --- a/puppet/modules/site_couchdb/manifests/init.pp +++ b/puppet/modules/site_couchdb/manifests/init.pp @@ -1,28 +1,33 @@ class site_couchdb { - $x509 = hiera('x509') - $key = $x509['key'] - $cert = $x509['cert'] - $adminpw = hiera('couchdb_adminpw') - $couchdb_leap_web_user = hiera('couchdb_leap_web_user') - $couchdb_leap_web_username = $couchdb_leap_web_user['user'] - $couchdb_leap_web_pw = $couchdb_leap_web_user['pw'] - $couchdb_leap_ca_user = hiera('couchdb_leap_ca_user') - $couchdb_leap_ca_username = $couchdb_leap_ca_user['user'] - $couchdb_leap_ca_pw = $couchdb_leap_ca_user['pw'] - $couchdb_host = "admin:$adminpw@127.0.0.1:5984" + $x509 = hiera('x509') + $key = $x509['key'] + $cert = $x509['cert'] + $couchdb_config = hiera('couch') + $couchdb_users = $couchdb_config['users'] + $couchdb_admin = $couchdb_users['admin'] + $couchdb_admin_user = $couchdb_admin['username'] + $couchdb_admin_pw = $couchdb_admin['password'] + $couchdb_webapp = $couchdb_users['webapp'] + $couchdb_webapp_user = $couchdb_webapp['username'] + $couchdb_webapp_pw = $couchdb_webapp['password'] + $couchdb_ca_daemon = $couchdb_users['ca_daemon'] + $couchdb_ca_daemon_user = $couchdb_ca_daemon['username'] + $couchdb_ca_daemon_pw = $couchdb_ca_daemon['password'] Class['site_couchdb::package'] -> Package ['couchdb'] -> File['/etc/init.d/couchdb'] -> File['/etc/couchdb/local.ini'] -> File['/etc/couchdb/local.d/admin.ini'] + -> File['/etc/couchdb/couchdb.netrc'] -> Couchdb::Create_db[leap_web] -> Couchdb::Create_db[leap_ca] - -> Couchdb::Add_user[leap_web] - -> Couchdb::Add_user[leap_ca] + -> Couchdb::Add_user[$couchdb_webapp_user] + -> Couchdb::Add_user[$couchdb_ca_daemon_user] -> Site_couchdb::Apache_ssl_proxy['apache_ssl_proxy'] + # Setup couchdb include site_couchdb::package include site_couchdb::configure include couchdb::deploy_config @@ -32,25 +37,27 @@ class site_couchdb { cert => $cert } - couchdb::add_user { $couchdb_leap_web_username: - host => $couchdb_host, + couchdb::query::setup { 'localhost': + user => $couchdb_admin_user, + pw => $couchdb_admin_pw + } + + # Populate couchdb + couchdb::add_user { $couchdb_webapp_user: roles => '["certs"]', - pw => $couchdb_leap_web_pw + pw => $couchdb_webapp_pw } - couchdb::add_user { $couchdb_leap_ca_username: - host => $couchdb_host, + couchdb::add_user { $couchdb_ca_daemon_user: roles => '["certs"]', - pw => $couchdb_leap_ca_pw + pw => $couchdb_ca_daemon_pw } couchdb::create_db { 'leap_web': - host => $couchdb_host, - readers => "{ \"names\": [\"leap_web\"], \"roles\": [] }" + readers => "{ \"names\": [\"$couchdb_webapp_user\"], \"roles\": [] }" } couchdb::create_db { 'leap_ca': - host => $couchdb_host, readers => "{ \"names\": [], \"roles\": [\"certs\"] }" } } -- cgit v1.2.3 From f1f6803eb12065ec7bc248241d781669f8c94579 Mon Sep 17 00:00:00 2001 From: varac Date: Thu, 8 Nov 2012 23:49:48 +0100 Subject: = true --- puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp | 1 + 1 file changed, 1 insertion(+) (limited to 'puppet/modules/site_couchdb/manifests') diff --git a/puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp b/puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp index 87b21e62..92170780 100644 --- a/puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp +++ b/puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp @@ -1,5 +1,6 @@ define site_couchdb::apache_ssl_proxy ($key, $cert) { + $apache_no_default_site = true include apache::ssl apache::module { 'rewrite': ensure => present; -- cgit v1.2.3 From 7b803d54a625e13f52a33e1c7a9264b344474df8 Mon Sep 17 00:00:00 2001 From: varac Date: Thu, 22 Nov 2012 17:48:29 +0100 Subject: call refresh_apt before installing couchdb, solves https://leap.se/code/issues/994 --- puppet/modules/site_couchdb/manifests/init.pp | 1 + 1 file changed, 1 insertion(+) (limited to 'puppet/modules/site_couchdb/manifests') diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp index 30ce7f54..10408094 100644 --- a/puppet/modules/site_couchdb/manifests/init.pp +++ b/puppet/modules/site_couchdb/manifests/init.pp @@ -16,6 +16,7 @@ class site_couchdb { $couchdb_ca_daemon_pw = $couchdb_ca_daemon['password'] Class['site_couchdb::package'] + -> Exec['refresh_apt'] -> Package ['couchdb'] -> File['/etc/init.d/couchdb'] -> File['/etc/couchdb/local.ini'] -- cgit v1.2.3 From 8d50b9ded53420fc4824b77933ce9357b11a5a45 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 4 Dec 2012 22:35:30 -0500 Subject: Stop the [warn] NameVirtualHost *:443 has no VirtualHosts errors When we include apache::ssl it ships the ssl.conf file which sets up the NameVirtualHost *:443, so we just do what that class does fixes: https://leap.se/code/issues/944 --- puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'puppet/modules/site_couchdb/manifests') diff --git a/puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp b/puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp index 92170780..21db3f56 100644 --- a/puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp +++ b/puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp @@ -1,9 +1,10 @@ define site_couchdb::apache_ssl_proxy ($key, $cert) { $apache_no_default_site = true - include apache::ssl + include apache apache::module { 'rewrite': ensure => present; + 'ssl': ensure => present; 'proxy': ensure => present; 'proxy_http': ensure => present; } -- cgit v1.2.3 From 8b7ca862253b1212ae392c58099df9b6feaa0ca2 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 4 Dec 2012 22:36:14 -0500 Subject: alphabetize the apache modules --- puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'puppet/modules/site_couchdb/manifests') diff --git a/puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp b/puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp index 21db3f56..a2ca9618 100644 --- a/puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp +++ b/puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp @@ -3,10 +3,10 @@ define site_couchdb::apache_ssl_proxy ($key, $cert) { $apache_no_default_site = true include apache apache::module { - 'rewrite': ensure => present; - 'ssl': ensure => present; 'proxy': ensure => present; 'proxy_http': ensure => present; + 'rewrite': ensure => present; + 'ssl': ensure => present; } apache::vhost::file { 'couchdb_proxy': } # prevent 0-default.conf and 0-default_ssl.conf from apache module -- cgit v1.2.3 From 2a9dbd931e095c933831edd19337607f5f356ae5 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 4 Dec 2012 22:36:34 -0500 Subject: remove no longer needed removal of the ports.conf file --- puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp | 8 -------- 1 file changed, 8 deletions(-) (limited to 'puppet/modules/site_couchdb/manifests') diff --git a/puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp b/puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp index a2ca9618..fb3477db 100644 --- a/puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp +++ b/puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp @@ -9,14 +9,6 @@ define site_couchdb::apache_ssl_proxy ($key, $cert) { 'ssl': 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', -- cgit v1.2.3 From febd4532872d8b3b6b6e846a6399a63152fac9a0 Mon Sep 17 00:00:00 2001 From: varac Date: Fri, 7 Dec 2012 16:39:18 +0100 Subject: removed pinning couchdb to unstable because 1.2.0-3 is in wheezy, finally --- puppet/modules/site_couchdb/manifests/configure.pp | 5 ----- puppet/modules/site_couchdb/manifests/init.pp | 8 +++----- puppet/modules/site_couchdb/manifests/package.pp | 13 ------------- 3 files changed, 3 insertions(+), 23 deletions(-) delete mode 100644 puppet/modules/site_couchdb/manifests/package.pp (limited to 'puppet/modules/site_couchdb/manifests') diff --git a/puppet/modules/site_couchdb/manifests/configure.pp b/puppet/modules/site_couchdb/manifests/configure.pp index 25ea7a0b..333511b5 100644 --- a/puppet/modules/site_couchdb/manifests/configure.pp +++ b/puppet/modules/site_couchdb/manifests/configure.pp @@ -1,9 +1,4 @@ class site_couchdb::configure { - Class[site_couchdb::package] -> Class[couchdb] - - class { 'couchdb': - require => Class['site_couchdb::package'], } - file { '/etc/init.d/couchdb': source => 'puppet:///modules/site_couchdb/couchdb', diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp index 10408094..3f577d8b 100644 --- a/puppet/modules/site_couchdb/manifests/init.pp +++ b/puppet/modules/site_couchdb/manifests/init.pp @@ -1,5 +1,7 @@ class site_couchdb { + include couchdb + $x509 = hiera('x509') $key = $x509['key'] $cert = $x509['cert'] @@ -15,9 +17,7 @@ class site_couchdb { $couchdb_ca_daemon_user = $couchdb_ca_daemon['username'] $couchdb_ca_daemon_pw = $couchdb_ca_daemon['password'] - Class['site_couchdb::package'] - -> Exec['refresh_apt'] - -> Package ['couchdb'] + Package ['couchdb'] -> File['/etc/init.d/couchdb'] -> File['/etc/couchdb/local.ini'] -> File['/etc/couchdb/local.d/admin.ini'] @@ -28,8 +28,6 @@ class site_couchdb { -> Couchdb::Add_user[$couchdb_ca_daemon_user] -> Site_couchdb::Apache_ssl_proxy['apache_ssl_proxy'] - # Setup couchdb - include site_couchdb::package include site_couchdb::configure include couchdb::deploy_config diff --git a/puppet/modules/site_couchdb/manifests/package.pp b/puppet/modules/site_couchdb/manifests/package.pp deleted file mode 100644 index c091316a..00000000 --- a/puppet/modules/site_couchdb/manifests/package.pp +++ /dev/null @@ -1,13 +0,0 @@ -class site_couchdb::package { - - # for now, we need to install couchdb from unstable, - # because of this bug while installing: - # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=681549 - # can be removed when couchdb/1.2.0-2 is integrated into testing - apt::sources_list { 'unstable.list': - source => [ 'puppet:///modules/site_apt/unstable.list'], - } - apt::preferences_snippet{ - 'couchdb': release => 'unstable', priority => 999; - } -} -- cgit v1.2.3 From b525a1799808959f702441b330ff3ab5de8fdf75 Mon Sep 17 00:00:00 2001 From: varac Date: Fri, 7 Dec 2012 17:12:10 +0100 Subject: new names for couchdb DBs --- puppet/modules/site_couchdb/manifests/init.pp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'puppet/modules/site_couchdb/manifests') diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp index 3f577d8b..04f2ca1a 100644 --- a/puppet/modules/site_couchdb/manifests/init.pp +++ b/puppet/modules/site_couchdb/manifests/init.pp @@ -22,8 +22,8 @@ class site_couchdb { -> File['/etc/couchdb/local.ini'] -> File['/etc/couchdb/local.d/admin.ini'] -> File['/etc/couchdb/couchdb.netrc'] - -> Couchdb::Create_db[leap_web] - -> Couchdb::Create_db[leap_ca] + -> Couchdb::Create_db['users'] + -> Couchdb::Create_db['client_certificates'] -> Couchdb::Add_user[$couchdb_webapp_user] -> Couchdb::Add_user[$couchdb_ca_daemon_user] -> Site_couchdb::Apache_ssl_proxy['apache_ssl_proxy'] @@ -52,11 +52,11 @@ class site_couchdb { pw => $couchdb_ca_daemon_pw } - couchdb::create_db { 'leap_web': + couchdb::create_db { 'users': readers => "{ \"names\": [\"$couchdb_webapp_user\"], \"roles\": [] }" } - couchdb::create_db { 'leap_ca': + couchdb::create_db { 'client_certificates': readers => "{ \"names\": [], \"roles\": [\"certs\"] }" } } -- cgit v1.2.3 From 3f0bbccb1b0020530ae4e4a0682fbf9f5f401e3b Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 10 Dec 2012 23:36:48 +0100 Subject: couchdb: use x509 module to deploy certs (fixes #1063) --- .../site_couchdb/manifests/apache_ssl_proxy.pp | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'puppet/modules/site_couchdb/manifests') diff --git a/puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp b/puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp index fb3477db..02aae0c3 100644 --- a/puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp +++ b/puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp @@ -10,20 +10,16 @@ define site_couchdb::apache_ssl_proxy ($key, $cert) { } apache::vhost::file { 'couchdb_proxy': } - file { '/etc/couchdb/server_cert.pem': - mode => '0644', - owner => 'couchdb', - group => 'couchdb', - content => $cert, - notify => Service[apache], + x509::key { + 'leap_couchdb': + content => $x509['key'], + notify => Service[apache]; } - file { '/etc/couchdb/server_key.pem': - mode => '0600', - owner => 'couchdb', - group => 'couchdb', - content => $key, - notify => Service[apache], + x509::cert { + 'leap_couchdb': + content => $x509['cert'], + notify => Service[apache]; } } -- cgit v1.2.3 From 93054f283f7f6e4e04fa9ddf901158654a62e9df Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 29 Jan 2013 15:17:28 -0500 Subject: eliminate dynamic lookup deprecation warnings for site_couchdb::apache_ssl_proxy --- puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'puppet/modules/site_couchdb/manifests') diff --git a/puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp b/puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp index 02aae0c3..7739473e 100644 --- a/puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp +++ b/puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp @@ -12,13 +12,13 @@ define site_couchdb::apache_ssl_proxy ($key, $cert) { x509::key { 'leap_couchdb': - content => $x509['key'], + content => $key, notify => Service[apache]; } x509::cert { 'leap_couchdb': - content => $x509['cert'], + content => $cert, notify => Service[apache]; } -- cgit v1.2.3 From dda36946d405301d9123bb455753650920d0756a Mon Sep 17 00:00:00 2001 From: varac Date: Thu, 31 Jan 2013 11:52:32 +0100 Subject: tag 'service' for all service classes --- puppet/modules/site_couchdb/manifests/init.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'puppet/modules/site_couchdb/manifests') diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp index 04f2ca1a..632df799 100644 --- a/puppet/modules/site_couchdb/manifests/init.pp +++ b/puppet/modules/site_couchdb/manifests/init.pp @@ -1,5 +1,5 @@ class site_couchdb { - + tag 'service' include couchdb $x509 = hiera('x509') -- cgit v1.2.3 From e6fe80f9460b8bc013068e1dda8be6230b8d60a4 Mon Sep 17 00:00:00 2001 From: varac Date: Thu, 31 Jan 2013 19:09:19 +0100 Subject: tag 'base' is a bad idea because it invokes apache::base as well --- puppet/modules/site_couchdb/manifests/init.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'puppet/modules/site_couchdb/manifests') diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp index 632df799..1789dd55 100644 --- a/puppet/modules/site_couchdb/manifests/init.pp +++ b/puppet/modules/site_couchdb/manifests/init.pp @@ -1,5 +1,5 @@ class site_couchdb { - tag 'service' + tag 'leap_service' include couchdb $x509 = hiera('x509') -- cgit v1.2.3 From 68b6e843aa852cdb71fdec4f741150e4daddaac9 Mon Sep 17 00:00:00 2001 From: varac Date: Wed, 6 Feb 2013 23:36:24 +0100 Subject: include shorewall config for webapp and couchdb --- puppet/modules/site_couchdb/manifests/init.pp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'puppet/modules/site_couchdb/manifests') diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp index 1789dd55..9ecde5e6 100644 --- a/puppet/modules/site_couchdb/manifests/init.pp +++ b/puppet/modules/site_couchdb/manifests/init.pp @@ -59,4 +59,6 @@ class site_couchdb { couchdb::create_db { 'client_certificates': readers => "{ \"names\": [], \"roles\": [\"certs\"] }" } + + include site_shorewall::couchdb } -- cgit v1.2.3