summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2015-09-15 11:50:01 +0200
committerLeif Johansson <leifj@sunet.se>2015-09-15 11:50:01 +0200
commitdedd2eb50483c2137d4fa05e0dcbeeda38c44fe9 (patch)
tree1d0502bd2be80d820e9ab13953c17432acad7c39
parent5e605244e81490aee9c68e861fe8198d8b2fba5a (diff)
make nunoc a default class via rulessunet-ops-2015-09-15-v07
-rw-r--r--global/overlay/etc/puppet/cosmos-rules.yaml2
-rw-r--r--global/overlay/etc/puppet/manifests/cosmos-site.pp3
2 files changed, 5 insertions, 0 deletions
diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index 12803ae..1425dc4 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -1,3 +1,5 @@
+'.+':
+ nunoc:
'^cdr\d+\.sunet\.se$':
sunet-cdr:
sunetops:
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 608d21a..5ea59f3 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -31,6 +31,9 @@ class mailclient ($domain) {
# you need a default node, all nodes need ssh + ufw
node default {
+}
+
+class nunoc {
include sshaccess
if $::hostname !~ /random/ {
include sunet::simple_entropy