summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
Diffstat (limited to 'puppet')
m---------puppet/modules/couchdb0
m---------puppet/modules/postfix0
-rw-r--r--puppet/modules/site_apt/manifests/sid_repo.pp11
-rw-r--r--puppet/modules/site_couchdb/manifests/master.pp5
-rw-r--r--puppet/modules/site_sshd/manifests/init.pp2
-rw-r--r--puppet/modules/site_static/manifests/init.pp10
-rw-r--r--puppet/modules/site_webapp/manifests/hidden_service.pp1
7 files changed, 8 insertions, 21 deletions
diff --git a/puppet/modules/couchdb b/puppet/modules/couchdb
-Subproject 016ec71359f6b1b368624c6c94bac2b50979165
+Subproject 84b1d857b0ea8a9987be0748dab9f6a3ddaba94
diff --git a/puppet/modules/postfix b/puppet/modules/postfix
-Subproject 53572a8934fe5b0a3a567cdec10664f28892373
+Subproject b1875e4143713ee007ce6ceedeef132273a1616
diff --git a/puppet/modules/site_apt/manifests/sid_repo.pp b/puppet/modules/site_apt/manifests/sid_repo.pp
deleted file mode 100644
index 7c1d8783..00000000
--- a/puppet/modules/site_apt/manifests/sid_repo.pp
+++ /dev/null
@@ -1,11 +0,0 @@
-# configure debian unstable aka "sid"
-# currently only used for installations that
-# use plain couchdb instead of bigcouch
-class site_apt::sid_repo {
-
- apt::sources_list { 'debian_sid.list':
- content => "deb http://httpredir.debian.org/debian/ sid main\n",
- before => Exec[refresh_apt]
- }
-
-}
diff --git a/puppet/modules/site_couchdb/manifests/master.pp b/puppet/modules/site_couchdb/manifests/master.pp
index c50ed364..5dab6325 100644
--- a/puppet/modules/site_couchdb/manifests/master.pp
+++ b/puppet/modules/site_couchdb/manifests/master.pp
@@ -7,10 +7,5 @@ class site_couchdb::master {
pwhash_alg => $site_couchdb::couchdb_pwhash_alg
}
- # couchdb is not available in jessie, and the
- # leap deb repo only hosts a wheeyz version.
- # we install it therefore from unstable
- include site_apt::sid_repo
-
include site_check_mk::agent::couchdb::master
}
diff --git a/puppet/modules/site_sshd/manifests/init.pp b/puppet/modules/site_sshd/manifests/init.pp
index 5efd459f..be0d3368 100644
--- a/puppet/modules/site_sshd/manifests/init.pp
+++ b/puppet/modules/site_sshd/manifests/init.pp
@@ -75,7 +75,7 @@ MACs hmac-sha2-512,hmac-sha2-256,hmac-ripemd160'
print_motd => 'no',
tcp_forwarding => $ssh_config['AllowTcpForwarding'],
manage_client => false,
- use_storedconfigs => true,
+ use_storedconfigs => false,
tail_additional_options => $tail_additional_options
}
}
diff --git a/puppet/modules/site_static/manifests/init.pp b/puppet/modules/site_static/manifests/init.pp
index 8df53075..e317f580 100644
--- a/puppet/modules/site_static/manifests/init.pp
+++ b/puppet/modules/site_static/manifests/init.pp
@@ -28,10 +28,12 @@ class site_static {
}
}
- include site_apache::module::headers
- include site_apache::module::alias
- include site_apache::module::expires
- include site_apache::module::removeip
+ include apache::module::headers
+ include apache::module::alias
+ include apache::module::expires
+ include apache::module::removeip
+ include apache::module::dir
+ include apache::module::negotiation
include site_apache::common
include site_config::ruby::dev
diff --git a/puppet/modules/site_webapp/manifests/hidden_service.pp b/puppet/modules/site_webapp/manifests/hidden_service.pp
index 4cf7a8ca..efdefd8e 100644
--- a/puppet/modules/site_webapp/manifests/hidden_service.pp
+++ b/puppet/modules/site_webapp/manifests/hidden_service.pp
@@ -8,6 +8,7 @@ class site_webapp::hidden_service {
include apache::module::alias
include apache::module::expires
include apache::module::removeip
+ include apache::module::status
include tor::daemon
tor::daemon::hidden_service { 'webapp': ports => '80 127.0.0.1:80' }