diff options
| author | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2009-12-23 14:57:14 -0500 |
|---|---|---|
| committer | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2009-12-23 14:57:14 -0500 |
| commit | 124b25746ae4892d6ba4db24609320a5a782ac0d (patch) | |
| tree | 5ee1ab6f7b50295659d1bfa191ccb5dea745c870 /manifests | |
| parent | e87062cc4494ab28fb9e2b7fef5d7ee9e85f1dbc (diff) | |
fix debian support for itk and use correct httpd username in managed webdir
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/debian/itk.pp | 5 | ||||
| -rw-r--r-- | manifests/vhost/webdir.pp | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/manifests/debian/itk.pp b/manifests/debian/itk.pp index b876612..2dde883 100644 --- a/manifests/debian/itk.pp +++ b/manifests/debian/itk.pp @@ -1,5 +1,8 @@ class apache::debian::itk inherits apache::debian { - include ::apache::base::itk + File['htpasswd_dir']{ + group => 0, + mode => 0644, + } Package['apache']{ name => 'apache2-mpm-itk', } diff --git a/manifests/vhost/webdir.pp b/manifests/vhost/webdir.pp index 20ce44f..4fa9003 100644 --- a/manifests/vhost/webdir.pp +++ b/manifests/vhost/webdir.pp @@ -33,6 +33,7 @@ define apache::vhost::webdir( if $apache_default_user == '' { $real_owner = $operatingsystem ? { openbsd => 'www', + debian => 'www-data', default => $owner } } else { @@ -45,6 +46,7 @@ define apache::vhost::webdir( if $apache_default_group == '' { $real_group = $operatingsystem ? { openbsd => 'www', + debian => 'www-data', default => $group } } else { @@ -58,6 +60,7 @@ define apache::vhost::webdir( if $apache_default_user == '' { $real_documentroot_owner = $operatingsystem ? { openbsd => 'www', + debian => 'www-data', default => $documentroot_owner } } else { @@ -70,6 +73,7 @@ define apache::vhost::webdir( if $apache_default_group == '' { $real_documentroot_group = $operatingsystem ? { openbsd => 'www', + debian => 'www-data', default => $documentroot_group } } else { |