Fix doc_root and add php-wrapper
This commit is contained in:
@@ -1,10 +1,10 @@
|
||||
# modules/frankenphp/manifests/app.pp
|
||||
|
||||
define frankenphp::app (
|
||||
Stdlib::Absolutepath $root_dir,
|
||||
String $user,
|
||||
String $listen_port,
|
||||
String $group = $user,
|
||||
String $root_dir = 'www',
|
||||
Stdlib::Absolutepath $docs_root = '/var/www',
|
||||
String $app_caddyfile_dir = '/etc/frankenphp/sites.d',
|
||||
String $supervisor_conf_dir = '/etc/supervisor/conf.d',
|
||||
@@ -15,11 +15,13 @@ define frankenphp::app (
|
||||
$app_name = $title
|
||||
$app_caddyfile = "${app_caddyfile_dir}/${app_name}.Caddyfile"
|
||||
$supervisor_conf = "${supervisor_conf_dir}/frankenphp-${app_name}.conf"
|
||||
$full_root_dir = "${docs_root}/${user}/${root_dir}"
|
||||
|
||||
exec { "refresh-frankenphp-${app_name}":
|
||||
command => "supervisorctl restart frankenphp-${app_name}",
|
||||
path => ['/usr/bin', '/bin'],
|
||||
refreshonly => true,
|
||||
require => Supervisord::Program["frankenphp-${app_name}"],
|
||||
}
|
||||
|
||||
if $ensure == 'present' {
|
||||
@@ -36,8 +38,17 @@ define frankenphp::app (
|
||||
|
||||
# Directories
|
||||
ensure_resource('file', $app_caddyfile_dir, { ensure => 'directory' })
|
||||
if ! $managed_root_dir {
|
||||
ensure_resource('file', $root_dir, {
|
||||
|
||||
ensure_resource('file', "${docs_root}/${user}", {
|
||||
ensure => 'directory',
|
||||
owner => $user,
|
||||
group => $group,
|
||||
mode => '0755',
|
||||
require => User[$user],
|
||||
})
|
||||
|
||||
if $managed_root_dir {
|
||||
ensure_resource('file', $full_root_dir, {
|
||||
ensure => 'directory',
|
||||
owner => $user,
|
||||
group => $group,
|
||||
@@ -49,7 +60,7 @@ define frankenphp::app (
|
||||
# Caddyfile
|
||||
$caddy_content = epp('frankenphp/app_caddyfile.epp', {
|
||||
listen_port => $listen_port,
|
||||
root_dir => $root_dir,
|
||||
root_dir => $full_root_dir,
|
||||
})
|
||||
|
||||
file { $app_caddyfile:
|
||||
|
||||
Reference in New Issue
Block a user