From e9b2badccd78561cae56789c6d9da950de031df9 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Tue, 30 Sep 2014 11:00:51 +0200
Subject: classify a bit

---
 global/overlay/etc/puppet/cosmos-rules.yaml        | 6 ++++++
 global/overlay/etc/puppet/manifests/cosmos-site.pp | 6 +-----
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'global/overlay/etc/puppet')

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' {
-- 
cgit v1.1