Commit 99027885 authored by mh's avatar mh
Browse files

address puppet 3.x deprecation warnings

parent 662ec582
......@@ -106,11 +106,14 @@ define webhosting::php::mediawiki(
nagios_use => $nagios_use,
}
$mediawiki_php_settings = {
open_basedir => "/var/www/mediawiki:/var/www/vhosts/${name}/www:/var/www/upload_tmp_dir/${name}:/var/www/session.save_path/${name}",
}
if $wwwmail and ($contact != 'unmanaged'){
$mediawiki_php_settings['sendmail_path'] = "/usr/sbin/sendmail -t -f${contact} -i"
$sendmail_path = "/usr/sbin/sendmail -t -f${contact} -i"
} else {
$sendmail_path = undef
}
$mediawiki_php_settings = {
open_basedir => "/var/www/mediawiki:/var/www/vhosts/${name}/www:/var/www/upload_tmp_dir/${name}:/var/www/session.save_path/${name}",
sendmail_path => $sendmail_path,
}
$real_php_settings = merge($mediawiki_php_settings,$php_settings)
......
# This is the configuration file to adjust permissions in your webdirectory.
#
# This file contains a few information about what you can do. For further
# information please have a look at: <%= user_scripts_help %>
# information please have a look at: <%= @user_scripts_help %>
#
# A few things to note:
#
......@@ -48,7 +48,7 @@
# be reverted when these scripts run.
#
# 8. We do a lot to prevent that you can do anything nasty with that script. If
# you find something to trick us, please let us know immediately: <%= user_scripts_admin_address %>
# you find something to trick us, please let us know immediately: <%= @user_scripts_admin_address %>
#
# The following example will show you a configuration to do the following changes:
# * The folders cms, include and the file index.php will only be readable.
......@@ -70,11 +70,11 @@
#
# by default we do nothing
<% ['only_webreadable','web_writable' ].each do |option|
if user_scripts_options['adjust_permissions'][option].to_a.empty? -%>
if Array(@user_scripts_options['adjust_permissions'][option]).empty? -%>
<%= option %>: []
<% else -%>
<%= option %>:
<% user_scripts_options['adjust_permissions'][option].to_a.each do |path| -%>
<% Array(@user_scripts_options['adjust_permissions'][option]).each do |path| -%>
- <%= path %>
<% end
end
......
sftp_user: <%= sftp_user %>
run_user: <%= run_user %>
group: <%= web_group %>
webdir: <%= base_path %>/www
sftp_user: <%= @sftp_user %>
run_user: <%= @run_user %>
group: <%= @web_group %>
webdir: <%= @base_path %>/www
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment