diff --git a/manifests/params.pp b/manifests/params.pp index c0a46ead..5cc4c6f5 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -17,8 +17,8 @@ class horizon::params { $root_url = '/dashboard' $apache_user = 'apache' $apache_group = 'apache' - $wsgi_user = 'dashboard' - $wsgi_group = 'dashboard' + $wsgi_user = 'apache' + $wsgi_group = 'apache' $memcache_package = 'python-memcached' } 'Debian': { diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp index ead85617..595c36fa 100644 --- a/manifests/wsgi/apache.pp +++ b/manifests/wsgi/apache.pp @@ -171,14 +171,8 @@ class horizon::wsgi::apache ( Package['horizon'] -> Package['httpd'] Concat[$::horizon::params::config_file] ~> Service['httpd'] - $unix_user = $::osfamily ? { - 'RedHat' => $::horizon::params::apache_user, - default => $::horizon::params::wsgi_user - } - $unix_group = $::osfamily ? { - 'RedHat' => $::horizon::params::apache_group, - default => $::horizon::params::wsgi_group, - } + $unix_user = $::horizon::params::wsgi_user + $unix_group = $::horizon::params::wsgi_group file { $::horizon::params::logdir: ensure => directory, diff --git a/spec/classes/horizon_wsgi_apache_spec.rb b/spec/classes/horizon_wsgi_apache_spec.rb index dc9c66fb..615703ee 100644 --- a/spec/classes/horizon_wsgi_apache_spec.rb +++ b/spec/classes/horizon_wsgi_apache_spec.rb @@ -200,8 +200,8 @@ describe 'horizon::wsgi::apache' do :root_url => '/dashboard', :apache_user => 'apache', :apache_group => 'apache', - :wsgi_user => 'dashboard', - :wsgi_group => 'dashboard', + :wsgi_user => 'apache', + :wsgi_group => 'apache', :unix_user => 'apache', :unix_group => 'apache' } end