summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2016-02-26 01:45:07 -0800
committerelijah <elijah@riseup.net>2016-02-26 01:45:07 -0800
commit15ca782e3bcd22f131c2b8745d7fad118b4b8648 (patch)
treeab04c576d6024e2fce1490d00c86c4ba0ecced8e /puppet
parent89a3cd71f50a383a5f85510193087446da0e661f (diff)
parent0206d426bd51aa4805915f6e23b53d5fdb40d738 (diff)
Merge branch 'develop' of ssh://leap.se/leap_platform into develop
Diffstat (limited to 'puppet')
m---------puppet/modules/couchdb0
-rw-r--r--puppet/modules/leap/manifests/cli/install.pp2
-rw-r--r--puppet/modules/site_apache/manifests/common.pp6
-rw-r--r--puppet/modules/site_check_mk/manifests/agent.pp8
-rw-r--r--puppet/modules/site_couchdb/manifests/init.pp1
-rw-r--r--puppet/modules/site_couchdb/manifests/plain.pp3
6 files changed, 13 insertions, 7 deletions
diff --git a/puppet/modules/couchdb b/puppet/modules/couchdb
-Subproject b2dada713dd3486dec8eaf9bdcd1e223c9297f6
+Subproject 53a4c75ae09feb6d89b3535886663356d9ef428
diff --git a/puppet/modules/leap/manifests/cli/install.pp b/puppet/modules/leap/manifests/cli/install.pp
index 6a12a4a5..25e87033 100644
--- a/puppet/modules/leap/manifests/cli/install.pp
+++ b/puppet/modules/leap/manifests/cli/install.pp
@@ -4,7 +4,6 @@ class leap::cli::install ( $source = false ) {
# needed for building leap_cli from source
include ::git
include ::rubygems
- include ::site_config::packages::build_essential
class { '::ruby':
install_dev => true
@@ -14,7 +13,6 @@ class leap::cli::install ( $source = false ) {
Class[Ruby] ->
Class[rubygems] ->
- Class[::site_config::packages::build_essential] ->
Class[bundler::install]
diff --git a/puppet/modules/site_apache/manifests/common.pp b/puppet/modules/site_apache/manifests/common.pp
index dadf7ea5..8a11759a 100644
--- a/puppet/modules/site_apache/manifests/common.pp
+++ b/puppet/modules/site_apache/manifests/common.pp
@@ -4,7 +4,11 @@ class site_apache::common {
include apache::module::rewrite
include apache::module::env
- class { '::apache': no_default_site => true, ssl => true }
+ class { '::apache':
+ no_default_site => true,
+ ssl => true,
+ ssl_cipher_suite => 'HIGH:MEDIUM:!aNULL:!MD5'
+ }
# needed for the mod_ssl config
include apache::module::mime
diff --git a/puppet/modules/site_check_mk/manifests/agent.pp b/puppet/modules/site_check_mk/manifests/agent.pp
index 589041eb..8d8ab814 100644
--- a/puppet/modules/site_check_mk/manifests/agent.pp
+++ b/puppet/modules/site_check_mk/manifests/agent.pp
@@ -1,9 +1,14 @@
+# installs check-mk agent
class site_check_mk::agent {
$ssh_hash = hiera('ssh')
$pubkey = $ssh_hash['authorized_keys']['monitor']['key']
$type = $ssh_hash['authorized_keys']['monitor']['type']
+
+ # /usr/bin/mk-job depends on /usr/bin/time
+ ensure_packages('time')
+
class { 'site_apt::preferences::check_mk': } ->
class { 'check_mk::agent':
@@ -11,7 +16,8 @@ class site_check_mk::agent {
agent_logwatch_package_name => 'check-mk-agent-logwatch',
method => 'ssh',
homedir => '/etc/nagios/check_mk',
- register_agent => false
+ register_agent => false,
+ require => Package['time']
} ->
class { 'site_check_mk::agent::mrpe': } ->
diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp
index 3f670ed2..c4fe6277 100644
--- a/puppet/modules/site_couchdb/manifests/init.pp
+++ b/puppet/modules/site_couchdb/manifests/init.pp
@@ -38,7 +38,6 @@ class site_couchdb {
$couchdb_backup = $couchdb_config['backup']
$couchdb_mode = $couchdb_config['mode']
- $couchdb_pwhash_alg = $couchdb_config['pwhash_alg']
# ensure bigcouch has been purged from the system:
# TODO: remove this check in 0.9 release
diff --git a/puppet/modules/site_couchdb/manifests/plain.pp b/puppet/modules/site_couchdb/manifests/plain.pp
index 9338e56a..b40fc100 100644
--- a/puppet/modules/site_couchdb/manifests/plain.pp
+++ b/puppet/modules/site_couchdb/manifests/plain.pp
@@ -3,8 +3,7 @@ class site_couchdb::plain {
class { 'couchdb':
admin_pw => $site_couchdb::couchdb_admin_pw,
admin_salt => $site_couchdb::couchdb_admin_salt,
- chttpd_bind_address => '127.0.0.1',
- pwhash_alg => 'pbkdf2'
+ chttpd_bind_address => '127.0.0.1'
}
include site_check_mk::agent::couchdb::plain