Commit 3cf5704f authored by mh's avatar mh
Browse files

ensure ordering for all users only when creating

parent 5af008fa
...@@ -133,7 +133,11 @@ define webhosting::php::wordpress( ...@@ -133,7 +133,11 @@ define webhosting::php::wordpress(
manage_config => $manage_config, manage_config => $manage_config,
config_webwriteable => $config_webwriteable, config_webwriteable => $config_webwriteable,
manage_directories => $manage_directories, manage_directories => $manage_directories,
require => User::Sftp_only[$real_uid_name], }
if $ensure != 'absent' {
Apache::Vhost::Php::Wordpress[$name]{
require => User::Sftp_only[$real_uid_name],
}
} }
if $run_mode in ['fpm','fcgid'] { if $run_mode in ['fpm','fcgid'] {
if ($run_uid_name == 'absent'){ if ($run_uid_name == 'absent'){
...@@ -174,7 +178,7 @@ define webhosting::php::wordpress( ...@@ -174,7 +178,7 @@ define webhosting::php::wordpress(
before => File["${documentroot}/wp-content/uploads"], before => File["${documentroot}/wp-content/uploads"],
} }
} }
if ($run_mode in ['fpm','fcgid']) and ($ensure != 'absent') { if ($run_mode in ['fpm','fcgid']) {
User::Managed[$real_run_uid_name] -> Wordpress::Instance[$name] User::Managed[$real_run_uid_name] -> Wordpress::Instance[$name]
} }
} }
......
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