summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2014-03-03 19:58:31 +0100
committerLeif Johansson <leifj@sunet.se>2014-03-03 19:58:31 +0100
commit8628f8ab7c249bcee9e9d9254ab16cdb281deb52 (patch)
treea05da268da56991de15dd31ebf3eb9dce69e9ce4
parent0eec3f08dde80d52d10428509908632f880acc0a (diff)
-rw-r--r--global/overlay/etc/puppet/cosmos-modules.conf2
-rw-r--r--global/overlay/etc/puppet/manifests/cosmos-site.pp14
2 files changed, 13 insertions, 3 deletions
diff --git a/global/overlay/etc/puppet/cosmos-modules.conf b/global/overlay/etc/puppet/cosmos-modules.conf
index 2ac9536..3c0f0e3 100644
--- a/global/overlay/etc/puppet/cosmos-modules.conf
+++ b/global/overlay/etc/puppet/cosmos-modules.conf
@@ -18,3 +18,5 @@ 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
+apache puppetlabs/apache no
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 1c23b8d..03ff3ef 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -327,10 +327,18 @@ node 'samltest.swamid.se' {
}
node 'wp.sunet.se' {
+ class {'apache':
+ mpm_module => 'prefork'
+ }
+ apache::mod {'php': }
+ include mysql::server
class { wordpress:
- wordpress_db_name => 'wp',
- wordpress_db_user => 'wp',
- wordpress_db_password => hiera('mysql_password', 'NOT_SET_IN_HIERA')
+ wp_owner => 'wordpress',
+ wp_group => 'wordpress',
+ db_user => 'wp',
+ db_password => hiera('mysql_password', 'NOT_SET_IN_HIERA')
+ wp_multisite => true,
+ wp_site_tomain => 'wp.sunet.se'
}
}