summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--global/overlay/etc/puppet/cosmos-modules.conf4
-rw-r--r--global/overlay/etc/puppet/cosmos-rules.yaml9
-rw-r--r--global/overlay/etc/puppet/manifests/cosmos-site.pp10
3 files changed, 18 insertions, 5 deletions
diff --git a/global/overlay/etc/puppet/cosmos-modules.conf b/global/overlay/etc/puppet/cosmos-modules.conf
index 024613f..92fba47 100644
--- a/global/overlay/etc/puppet/cosmos-modules.conf
+++ b/global/overlay/etc/puppet/cosmos-modules.conf
@@ -17,8 +17,8 @@ hiera-gpg git://github.com/SUNET/hiera-gpg.git no sunet-*
pound git://github.com/SUNET/puppet-pound.git yes sunet-*
augeas git://github.com/SUNET/puppet-augeas.git yes sunet-*
bastion git://github.com/SUNET/puppet-bastion.git yes sunet-*
-wordpress hunner/wordpress no
-mysql puppetlabs/mysql no
+#wordpress hunner/wordpress no
+#mysql puppetlabs/mysql no
apache puppetlabs/apache no
pyff git://github.com/samlbits/puppet-pyff.git yes puppet-pyff-*
postgresql git://github.com/SUNET/puppetlabs-postgresql.git yes sunet-*
diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index 4fe0137..34ccdfa 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -1,12 +1,15 @@
'^cdr\d+\.sunet\.se$':
+ sshaccess:
sunet-cdr:
sunetops:
'\.swamid\.se$':
+ sshaccess:
sunetops:
swamidops:
mailclient:
domain: sunet.se
'\.sunet\.se$':
+ sshaccess:
sunetops:
mailclient:
domain: sunet.se
@@ -27,8 +30,12 @@ mdx2.swamid.se:
docker_signer:
sto-tug-kvm2.swamid.se:
dockerhost:
+reep.tid.isoc.org:
+ sshaccess:
+ swamidops:
+ dockerhost:
md-master.reep.refeds.org:
- sunetops:
+ sshaccess:
swamidops:
'^random\d+\.nordu\.net$':
entropyserver:
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 47784c4..7676e61 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -96,6 +96,10 @@ node 'sto-fre-kvm1.swamid.se' {
}
+node 'reep.tid.isoc.org' {
+
+}
+
node 'docker.sunet.se' {
docker::image {'registry': }
docker::run {'registry':
@@ -489,8 +493,7 @@ class sunet-dhcp-hosts {
dhcp::host { 'mdx2.swamid': mac => "52:54:00:30:be:dd", ip => "130.242.125.92" }
}
-class sunetops {
-
+class sshaccess {
package { ['openssh-server', 'emacs23-nox']:
ensure => 'installed'
}
@@ -503,6 +506,9 @@ class sunetops {
service { 'ssh':
ensure => 'running',
}
+}
+
+class sunetops {
sunet::server { 'sunet_server': }