summaryrefslogtreecommitdiff
path: root/global/overlay/etc/puppet
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2014-09-30 11:00:51 +0200
committerLeif Johansson <leifj@sunet.se>2014-09-30 11:00:51 +0200
commite9b2badccd78561cae56789c6d9da950de031df9 (patch)
treebde874563622c107e9eca1b9b0ae6dd730c4f094 /global/overlay/etc/puppet
parent785260fd2e3fc5346b9279d0eac1800ef03024d5 (diff)
classify a bit
Diffstat (limited to 'global/overlay/etc/puppet')
-rw-r--r--global/overlay/etc/puppet/cosmos-rules.yaml6
-rw-r--r--global/overlay/etc/puppet/manifests/cosmos-site.pp6
2 files changed, 7 insertions, 5 deletions
diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index a102cf1..6006678 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -8,6 +8,12 @@
domain: sunet.se
registry.swamid.se:
webserver:
+mdx1.swamid.se:
+ webserver:
+ signer:
+mdx2.swamid.se:
+ webserver:
+ signer:
md-master.reep.refeds.org:
sunet:
swamidops:
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index ed9a460..5c09520 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -80,7 +80,7 @@ node 'sto-fre-kvm1.swamid.se' {
}
-node 'mdx1.swamid.se' {
+class signer {
include cosmos::httpsproxy
class {'varnish':
domain => 'swamid.se',
@@ -99,10 +99,6 @@ node 'mdx1.swamid.se' {
cacheDuration => 'PT5H',
replace => false
}
- ufw::allow { "allow-http":
- ip => 'any',
- port => 80
- }
}
node 'md-master.reep.refeds.org' {