summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2015-09-07 11:26:46 +0200
committerLeif Johansson <leifj@sunet.se>2015-09-07 11:26:46 +0200
commitd56c4a7f19c0d6cd8227e33ccd39a373ef12bdd5 (patch)
treeb4b5636892ba6c00db92ae04186a044f1ab6df05
parente6dfdae858c9aea3ef794e0ae203ec9297a5bfae (diff)
run haveged & repollinate on non-random-generators
-rw-r--r--global/overlay/etc/puppet/manifests/cosmos-site.pp12
1 files changed, 7 insertions, 5 deletions
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index c886cf1..67ae10f 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -7,7 +7,6 @@ Exec {
include sunet::tools
include sunet::motd
include sunet::ntp
-include cosmos::rngtools
include ufw
include apt
include cosmos
@@ -27,9 +26,16 @@ class sshaccess {
}
}
+class mailclient ($domain) {
+ sunet::preseed_package {"postfix": ensure => present, options => {domain => $domain}}
+}
+
# you need a default node, all nodes need ssh + ufw
node default {
include sshaccess
+ if $::hostname !~ /random/ {
+ include sunet::simple_entropy
+ }
}
class dockerhost {
@@ -59,10 +65,6 @@ class webserver {
}
}
-class mailclient ($domain) {
- sunet::preseed_package {"postfix": ensure => present, options => {domain => $domain}}
-}
-
node 'sto-tug-kvm1.swamid.se' {
package {'python-vm-builder':