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 +++++++ 1 file changed, 7 insertions(+) create mode 100644 puppet/modules/site_couchdb/manifests/configure.pp (limited to 'puppet/modules/site_couchdb/manifests/configure.pp') 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' + } + +} -- 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 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'puppet/modules/site_couchdb/manifests/configure.pp') 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' } - } -- 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/configure.pp') 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 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/configure.pp') 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 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/configure.pp') 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 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/configure.pp') 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 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 ----- 1 file changed, 5 deletions(-) (limited to 'puppet/modules/site_couchdb/manifests/configure.pp') 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', -- cgit v1.2.3