Merge "Fix user/group for debian operating system" into stable/havana

xbezdick · Jan 7, 2014 · 6f5f602 · 6f5f602
2 parents ad9117d + 934a987
commit 6f5f602
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -22,14 +22,16 @@
       $httpd_config_file           = '/etc/apache2/conf.d/openstack-dashboard.conf'
       $httpd_listen_config_file    = '/etc/apache2/ports.conf'
       $root_url                    = '/horizon'
-      $apache_user                 = 'horizon'
-      $apache_group                = 'horizon'
       case $::operatingsystem {
         'Debian': {
             $package_name          = 'openstack-dashboard-apache'
+            $apache_user           = 'www-data'
+            $apache_group          = 'www-data'
         }
         default: {
             $package_name          = 'openstack-dashboard'
+            $apache_user           = 'horizon'
+            $apache_group          = 'horizon'
         }
       }
     }