summaryrefslogtreecommitdiff
path: root/global
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2014-03-03 17:05:55 +0100
committerLeif Johansson <leifj@sunet.se>2014-03-03 17:05:55 +0100
commit0fee2d373b47afdfe46c1f5eb7eea5d357ac7f58 (patch)
treec4d0ee0cab9ae37b1ca64c564afeb7dd84039786 /global
parentfd839b4dcf875677bfdca271e981648154ea4f04 (diff)
Diffstat (limited to 'global')
-rw-r--r--global/overlay/etc/puppet/cosmos-modules.conf1
-rw-r--r--global/overlay/etc/puppet/manifests/cosmos-site.pp2
2 files changed, 2 insertions, 1 deletions
diff --git a/global/overlay/etc/puppet/cosmos-modules.conf b/global/overlay/etc/puppet/cosmos-modules.conf
index 52d82be..dada134 100644
--- a/global/overlay/etc/puppet/cosmos-modules.conf
+++ b/global/overlay/etc/puppet/cosmos-modules.conf
@@ -17,3 +17,4 @@ 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 git://github.com/SUNET/puppet-wordpress.git yes sunet-*
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index c5e1f3f..0155a74 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -323,7 +323,7 @@ node 'samltest.swamid.se' {
type => 'ssh-rsa',
user => 'root'
}
-
+
}
class sunet-cdr {