From 2e03ec8c02a54c407c12964d243ba4ac5de15b99 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 12 Feb 2013 13:45:20 -0500 Subject: switch to using stdlib's standard stages --- puppet/manifests/site.pp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'puppet/manifests/site.pp') diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp index 1ec806d9..c89bc7d1 100644 --- a/puppet/manifests/site.pp +++ b/puppet/manifests/site.pp @@ -1,9 +1,7 @@ # set a default exec path Exec { path => '/usr/bin:/usr/sbin/:/bin:/sbin:/usr/local/bin:/usr/local/sbin' } -stage { 'initial': - before => Stage['main'], -} +include stdlib import 'common' include site_config::default -- cgit v1.2.3 From 2acaf6e3aa171e22cc28141027ef1b09f335514b Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 12 Feb 2013 14:05:54 -0500 Subject: make sure that apt-get update is run before any package is installed (#1745) --- puppet/manifests/site.pp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'puppet/manifests/site.pp') diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp index c89bc7d1..8cfa92ef 100644 --- a/puppet/manifests/site.pp +++ b/puppet/manifests/site.pp @@ -1,6 +1,10 @@ # set a default exec path Exec { path => '/usr/bin:/usr/sbin/:/bin:/sbin:/usr/local/bin:/usr/local/sbin' } +# make sure apt is updated before any packages are installed +include apt::update +Package { require => Exec['apt_updated'] } + include stdlib import 'common' -- cgit v1.2.3 From 057420e9ceabf61d71642ab7d78a8e54d1d74ba3 Mon Sep 17 00:00:00 2001 From: varac Date: Sat, 9 Mar 2013 11:57:26 +0100 Subject: use site_couchdb::bigcouch --- puppet/manifests/site.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'puppet/manifests/site.pp') diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp index 8cfa92ef..193a93e1 100644 --- a/puppet/manifests/site.pp +++ b/puppet/manifests/site.pp @@ -21,7 +21,7 @@ if 'openvpn' in $services { } if 'couchdb' in $services { - include site_couchdb + include site_couchdb::bigcouch } if 'webapp' in $services { -- cgit v1.2.3 From 113b44d8ee21e4d9b7a678005f2536f2046ef1b2 Mon Sep 17 00:00:00 2001 From: varac Date: Sun, 10 Mar 2013 15:47:31 +0100 Subject: use parameterized couchdb class instead of calling site_couchdb::bigcouch directly --- puppet/manifests/site.pp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'puppet/manifests/site.pp') diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp index 193a93e1..f55e6925 100644 --- a/puppet/manifests/site.pp +++ b/puppet/manifests/site.pp @@ -21,7 +21,9 @@ if 'openvpn' in $services { } if 'couchdb' in $services { - include site_couchdb::bigcouch + class {'site_couchdb': + bigcouch => true + } } if 'webapp' in $services { -- cgit v1.2.3 From 9c1c97b2e2e5b2f361bebe991d7229d271773e24 Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 12 Mar 2013 23:54:28 +0100 Subject: enable leap deb package repository and leap apt key on all hosts --- puppet/manifests/site.pp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'puppet/manifests/site.pp') diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp index f55e6925..10ea40c6 100644 --- a/puppet/manifests/site.pp +++ b/puppet/manifests/site.pp @@ -1,6 +1,8 @@ # set a default exec path Exec { path => '/usr/bin:/usr/sbin/:/bin:/sbin:/usr/local/bin:/usr/local/sbin' } +$custom_key_dir = 'puppet:///modules/site_apt/keys' + # make sure apt is updated before any packages are installed include apt::update Package { require => Exec['apt_updated'] } -- cgit v1.2.3 From 0984ad1726a9166d7143fcdee5dd000f715e6150 Mon Sep 17 00:00:00 2001 From: varac Date: Thu, 14 Mar 2013 18:02:47 +0100 Subject: evalute $services before including site_config::* --- puppet/manifests/site.pp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'puppet/manifests/site.pp') diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp index 10ea40c6..34c19370 100644 --- a/puppet/manifests/site.pp +++ b/puppet/manifests/site.pp @@ -3,6 +3,10 @@ Exec { path => '/usr/bin:/usr/sbin/:/bin:/sbin:/usr/local/bin:/usr/local/sbin' } $custom_key_dir = 'puppet:///modules/site_apt/keys' +# parse services for host +$services=hiera_array('services') +notice("Services for ${fqdn}: ${services}") + # make sure apt is updated before any packages are installed include apt::update Package { require => Exec['apt_updated'] } @@ -13,9 +17,6 @@ import 'common' include site_config::default include site_config::slow -# parse services for host -$services=hiera_array('services') -notice("Services for ${fqdn}: ${services}") # configure eip if 'openvpn' in $services { -- cgit v1.2.3 From 92f565f349266f7c5adfc88b31d0d2902431efa4 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Wed, 10 Apr 2013 12:27:39 -0400 Subject: clean up ca_daemon things, it is not used any longer because it has been included in the web app (#1978) remove site_ca_daemon module and configuration in site.pp as well as the provider_base/services/ca.json --- puppet/manifests/site.pp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'puppet/manifests/site.pp') diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp index 34c19370..f1b02aca 100644 --- a/puppet/manifests/site.pp +++ b/puppet/manifests/site.pp @@ -33,10 +33,6 @@ if 'webapp' in $services { include site_webapp } -if 'ca' in $services { - include site_ca_daemon -} - if 'monitor' in $services { include site_nagios } -- cgit v1.2.3 From 2bd18fcad2e1446388948ed0b98232d93564b8ad Mon Sep 17 00:00:00 2001 From: varac Date: Wed, 24 Apr 2013 18:23:41 +0200 Subject: take out plain couchdb setup, always deploy bigcouch (Feature #2176) --- puppet/manifests/site.pp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'puppet/manifests/site.pp') diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp index f1b02aca..2d41d45f 100644 --- a/puppet/manifests/site.pp +++ b/puppet/manifests/site.pp @@ -24,9 +24,7 @@ if 'openvpn' in $services { } if 'couchdb' in $services { - class {'site_couchdb': - bigcouch => true - } + include site_couchdb } if 'webapp' in $services { -- cgit v1.2.3 From 450fb19a4df8f4740dcf077b585dbd77c096d133 Mon Sep 17 00:00:00 2001 From: elijah Date: Sat, 18 May 2013 17:13:05 -0700 Subject: added module site_nickserver --- puppet/manifests/site.pp | 1 + 1 file changed, 1 insertion(+) (limited to 'puppet/manifests/site.pp') diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp index 2d41d45f..22172584 100644 --- a/puppet/manifests/site.pp +++ b/puppet/manifests/site.pp @@ -29,6 +29,7 @@ if 'couchdb' in $services { if 'webapp' in $services { include site_webapp + include site_nickserver } if 'monitor' in $services { -- cgit v1.2.3 From 6bcc3f1ff91111c9138213463f8af79e57d83501 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Sun, 26 May 2013 16:08:08 -0400 Subject: Fixes #2669 - stop services array from being reported smashed together Change-Id: I74dfe1941eb338a89be994ac9e1b61739601d9db --- puppet/manifests/site.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'puppet/manifests/site.pp') diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp index 22172584..9e3d0232 100644 --- a/puppet/manifests/site.pp +++ b/puppet/manifests/site.pp @@ -4,7 +4,7 @@ Exec { path => '/usr/bin:/usr/sbin/:/bin:/sbin:/usr/local/bin:/usr/local/sbin' } $custom_key_dir = 'puppet:///modules/site_apt/keys' # parse services for host -$services=hiera_array('services') +$services=join(hiera_array('services'), ' ') notice("Services for ${fqdn}: ${services}") # make sure apt is updated before any packages are installed -- cgit v1.2.3 From 1f0aebf8a2edbf576b4d94c4f210b132b7b6084e Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 18 Jun 2013 16:02:03 -0400 Subject: The way we were testing if $services had a particular word in it is not very good. If we search for the word 'tor' we will find it when the variable contains "monitor". This commit makes the regular expression more specific based on the word boundaries. Change-Id: I4dcd80db7322cabc3f71b77fabf7eacd83b4d572 --- puppet/manifests/site.pp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'puppet/manifests/site.pp') diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp index 9e3d0232..f0319bc2 100644 --- a/puppet/manifests/site.pp +++ b/puppet/manifests/site.pp @@ -19,23 +19,23 @@ include site_config::slow # configure eip -if 'openvpn' in $services { +if $services =~ /\bopenvpn\b/ { include site_openvpn } -if 'couchdb' in $services { +if $services =~ /\bcouchdb\b/ { include site_couchdb } -if 'webapp' in $services { +if $services =~ /\bwebapp\b/ { include site_webapp include site_nickserver } -if 'monitor' in $services { +if $services =~ /\bmonitor\b/ { include site_nagios } -if 'tor' in $services { +if $services =~ /\btor\b/ { include site_tor } -- cgit v1.2.3 From 4b5b54d031344aa7a7b86254c820e391a4d4d762 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 25 Jun 2013 17:05:11 -0400 Subject: update the apt submodule in order to get the fix for unattended_upgrades (#2984) and the custom_key_dir as a class parameter remove the global variable from setup.pp and site.pp and instead pass it into the apt class declaration as a parameter Change-Id: I24806f2fd22b5a066b951c5f76f3dd748481b5b6 --- puppet/manifests/site.pp | 2 -- 1 file changed, 2 deletions(-) (limited to 'puppet/manifests/site.pp') diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp index f0319bc2..08cbbb9e 100644 --- a/puppet/manifests/site.pp +++ b/puppet/manifests/site.pp @@ -1,8 +1,6 @@ # set a default exec path Exec { path => '/usr/bin:/usr/sbin/:/bin:/sbin:/usr/local/bin:/usr/local/sbin' } -$custom_key_dir = 'puppet:///modules/site_apt/keys' - # parse services for host $services=join(hiera_array('services'), ' ') notice("Services for ${fqdn}: ${services}") -- cgit v1.2.3