From dedd2eb50483c2137d4fa05e0dcbeeda38c44fe9 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Tue, 15 Sep 2015 11:50:01 +0200 Subject: make nunoc a default class via rules --- global/overlay/etc/puppet/cosmos-rules.yaml | 2 ++ global/overlay/etc/puppet/manifests/cosmos-site.pp | 3 +++ 2 files changed, 5 insertions(+) (limited to 'global/overlay/etc') 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 -- cgit v1.1