summaryrefslogtreecommitdiff
path: root/global/overlay/etc/puppet/manifests/cosmos-site.pp
diff options
context:
space:
mode:
Diffstat (limited to 'global/overlay/etc/puppet/manifests/cosmos-site.pp')
-rw-r--r--global/overlay/etc/puppet/manifests/cosmos-site.pp33
1 files changed, 16 insertions, 17 deletions
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 109c00b..60e5ad1 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -13,10 +13,24 @@ include ufw
include apt
include cosmos
-# you need a default node
+class sshaccess {
+ package { ['openssh-server', 'emacs23-nox']:
+ ensure => 'installed'
+ }
-node default {
+ ufw::allow { 'allow-ssh-sunet':
+ port => '22',
+ ip => 'any', # both IPv4 and IPv6
+ proto => 'tcp'
+ } ->
+ service { 'ssh':
+ ensure => 'running',
+ }
+}
+# you need a default node, all nodes need ssh + ufw
+node default {
+ include sshaccess
}
class dockerhost {
@@ -569,21 +583,6 @@ class sunet-dhcp-hosts {
dhcp::host { 'mdx2.swamid': mac => "52:54:00:30:be:dd", ip => "130.242.125.92" }
}
-class sshaccess {
- package { ['openssh-server', 'emacs23-nox']:
- ensure => 'installed'
- }
-
- ufw::allow { 'allow-ssh-sunet':
- port => '22',
- ip => 'any', # both IPv4 and IPv6
- proto => 'tcp'
- } ->
- service { 'ssh':
- ensure => 'running',
- }
-}
-
class sunetops {
sunet::server { 'sunet_server': }