diff options
| author | mh <mh@immerda.ch> | 2011-03-31 23:30:12 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2011-03-31 23:30:12 +0200 |
| commit | 819afbcc311efd818abc72ffcf80e879d987b661 (patch) | |
| tree | 4c8ea4d2ecb5f251969b7ad39faec87e6125461a | |
| parent | db4dec6a9ab9205d5a76e76ac1d6244b33733c99 (diff) | |
add missing files and manage necessary files to run as specific user
| -rw-r--r-- | manifests/vhost/passenger.pp | 29 | ||||
| -rw-r--r-- | templates/vhosts/passenger/partial.erb | 7 |
2 files changed, 35 insertions, 1 deletions
diff --git a/manifests/vhost/passenger.pp b/manifests/vhost/passenger.pp index 7fd82d2..6df0bee 100644 --- a/manifests/vhost/passenger.pp +++ b/manifests/vhost/passenger.pp @@ -42,7 +42,8 @@ define apache::vhost::passenger( $vhost_destination = 'absent', $htpasswd_file = 'absent', $htpasswd_path = 'absent', - $passenger_ree = false + $passenger_ree = false, + $passenger_app = 'rails' ){ if $passenger_ree { @@ -65,6 +66,32 @@ define apache::vhost::passenger( documentroot_mode => $documentroot_mode, } } + + file{ + ["${path}/www/tmp", "${path}/www/logs"]: + ensure => directory, + owner => $documentroot_owner, group => $run_gid, mode => 0660; + "${path}/www/public": + ensure => directory, + owner => $documentroot_owner, group => $run_gid, mode => 0640; + } + if $passenger_app == 'rails' { + file{ + "${path}/www/config": + ensure => directory, + owner => $documentroot_owner, group => $run_gid, mode => 0640; + "${path}/www/config/environment.rb": + ensure => present, + owner => $run_uid, group => $run_gid, mode => 0660; + } + } else { + #rack based + file{ + "${path}/www/config.ru": + ensure => present, + owner => $run_uid, group => $run_gid, mode => 0660; + } + } # create vhost configuration file ::apache::vhost{$name: diff --git a/templates/vhosts/passenger/partial.erb b/templates/vhosts/passenger/partial.erb new file mode 100644 index 0000000..63f1b89 --- /dev/null +++ b/templates/vhosts/passenger/partial.erb @@ -0,0 +1,7 @@ + <Directory <%= documentroot %>/> + AllowOverride <%= allow_override %> + Options <%- unless options.to_s == 'absent' then -%><%= options %><%- end -%><%- unless !options.to_s.include?('MultiViews') then -%> -MultiViews<%- end -%> + + <%- end -%> +<%= scope.function_template('apache/vhosts/partials/authentication.erb') %> + </Directory>
\ No newline at end of file |