summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2015-03-06 16:00:45 +0100
committerLeif Johansson <leifj@sunet.se>2015-03-06 16:00:45 +0100
commitbde7757f79f00dd1129ffc4b93ac7e9560512a84 (patch)
tree2f827181a72b455b9b22019f6c156a71f5e40748
parent5b8d4281c7d586c1cf5483982063522df9cb1958 (diff)
wordpress on web-a1sunet-ops-2015-03-06-v20
-rw-r--r--global/overlay/etc/puppet/cosmos-rules.yaml3
-rw-r--r--global/overlay/etc/puppet/manifests/cosmos-site.pp4
2 files changed, 4 insertions, 3 deletions
diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index 37dcdbf..396a110 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -48,6 +48,3 @@ www2.eduid.se:
webappserver:
'^web-f[0-9]+\.sunet\.se$':
webfrontend:
-web-a1.sunet.se:
- sunet::wordpress:
- name: www.sunet.se
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index e512149..06f2337 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -782,3 +782,7 @@ class webfrontend {
class webappserver {
class { 'webcommon': }
}
+
+node 'web-a1.sunet.se' {
+ sunet::wordpress {'www_sunet_se': }
+}