www-data ownersunet-ops-2014-03-04-v01

1 files changed, 3 insertions, 15 deletions

diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index ca72a02..9dcd5a0 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -327,18 +327,6 @@ node 'samltest.swamid.se' {
 }
 
 node 'wp.sunet.se' {
-  group { 'wordpress': 
-     ensure => 'present'
-  } ->
-  user {'wordpress':
-     groups => 'wordpress',
-     comment => 'wordpress user created by puppet',
-     ensure => 'present'
-  }
-  class {'apache': 
-     mpm_module  => 'prefork',
-     default_vhost => false
-  }
   package {'libapache2-mod-php5': ensure => 'latest'}
   package {'php-mdb2-driver-mysql': ensure => 'latest'}
   apache::mod {'php5': }
@@ -348,9 +336,9 @@ node 'wp.sunet.se' {
      docroot => '/opt/wordpress'
   }
   include mysql::server
-  class { wordpress:
-      wp_owner       => 'wordpress',
-      wp_group       => 'wordpress',
+  class { 'wordpress':
+      wp_owner       => 'www-data',
+      wp_group       => 'www-data',
       db_user        => 'wp',
       db_password    => hiera('mysql_password', 'NOT_SET_IN_HIERA'),
       wp_multisite   => true,