Commit 6f8cfa15 authored by mh's avatar mh
Browse files

this needs to be passed over user_scripts_options

parent 622a8558
......@@ -83,7 +83,7 @@ define webhosting::php::wordpress(
webhosting::common{$name:
ensure => $ensure,
configuration => { wordpress_autoupdate => true } + $configuration,
configuration => $configuration,
uid => $uid,
uid_name => $real_uid_name,
gid => $gid,
......@@ -97,7 +97,7 @@ define webhosting::php::wordpress(
run_uid_name => $run_uid_name,
run_gid => $run_gid,
user_scripts => $user_scripts,
user_scripts_options => $user_scripts_options,
user_scripts_options => deep_merge({'update_wordpress' => { 'auto_update' => true }}, $user_scripts_options),
watch_adjust_webfiles => $watch_adjust_webfiles,
wwwmail => $wwwmail,
nagios_check => $nagios_check,
......
......@@ -20,7 +20,10 @@ define webhosting::user_scripts::manage(
'only_webreadable' => [],
'web_writable' => [],
},
'global' => {
'update_wordpress' => {
'auto_update' => false,
},
'global' => {
'contact' => true,
},
}
......
......@@ -20,5 +20,5 @@
# updates that run the update_wordpress script
# on a daily basis.
---
auto_update: <%= (@configuration['wordpress_autoupdate'] || false).to_s %>
auto_update: <%= ((@user_scripts_options['update_wordpress']||{})['auto_update'] || false).to_s %>
wp_directories: ['.']
Markdown is supported
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