diff options
Diffstat (limited to 'manifests/vhost/passenger.pp')
| -rw-r--r-- | manifests/vhost/passenger.pp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/manifests/vhost/passenger.pp b/manifests/vhost/passenger.pp index 4a9b95e..c174079 100644 --- a/manifests/vhost/passenger.pp +++ b/manifests/vhost/passenger.pp @@ -1,10 +1,17 @@ # run_uid: the uid the vhost should run as with the mod_passenger module # run_gid: the gid the vhost should run as with the mod_passenger module +# # logmode: +# # - default: Do normal logging to CustomLog and ErrorLog # - nologs: Send every logging to /dev/null # - anonym: Don't log ips for CustomLog, send ErrorLog to /dev/null # - semianonym: Don't log ips for CustomLog, log normal ErrorLog +# +# mod_security: Whether we use mod_security or not (will include mod_security module) +# - false: don't activate mod_security +# - true: (*defaul*) activate mod_security +# define apache::vhost::passenger( $ensure = present, $domain = 'absent', @@ -20,10 +27,6 @@ define apache::vhost::passenger( $documentroot_owner = apache, $documentroot_group = 0, $documentroot_mode = 0640, - # TODO: think of a more generic way to handle user separation - # i.e. rename itk mode into something else - # e.g. default, moderate (use same user for access and run), strict (use different users for access and run) - $run_mode = 'normal', $run_uid = 'absent', $run_gid = 'absent', $allow_override = 'None', @@ -40,6 +43,9 @@ define apache::vhost::passenger( $htpasswd_file = 'absent', $htpasswd_path = 'absent' ){ + + include ::pasenger + if $manage_webdir { # create webdir ::apache::vhost::webdir{$name: @@ -67,7 +73,7 @@ define apache::vhost::passenger( domain => $domain, domainalias => $domainalias, server_admin => $server_admin, - run_mode => 'itk', + run_mode => 'normal', run_uid => $run_uid, run_gid => $run_gid, allow_override => $allow_override, |