Commit dc15f3f1 authored by mh's avatar mh
Browse files

the right hand side overwrites and we want to enforce certain things otherwise...

the right hand side overwrites and we want to enforce certain things otherwise they don't make sense
parent 25aaa3b6
......@@ -155,7 +155,7 @@ define webhosting::common(
homedir => $vhost_path,
manage_user => false,
logpath => "${vhost_path}/logs",
run_flags => $hosting_run_flags + $default_run_flags,
run_flags => $default_run_flags + $hosting_run_flags,
tag => "user_${real_uid_name}",
}
podman::container{
......
......@@ -92,7 +92,7 @@ define webhosting::container(
user_scripts_options => $user_scripts_options,
configuration => $configuration + {
containers => {
$name => {
$name => $user_container_config + {
ensure => $ensure,
user => $uid_name,
uid => $real_uid,
......@@ -106,7 +106,7 @@ define webhosting::container(
'security-opt-label-type' => 'socat_httpd_sidecar',
},
},
} + $user_container_config,
},
},
},
} -> Service['apache']
......
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