From a48feb88b225ad13d7c9effa7579041778f3e64a Mon Sep 17 00:00:00 2001 From: Tobias Herre Date: Wed, 21 Feb 2024 10:36:46 +0100 Subject: [PATCH] Works on Debian (>=12), raw parameter added --- nginx.cf | 8 ++++++++ templates/nginx-vhost.conf.mustache | 2 ++ 2 files changed, 10 insertions(+) diff --git a/nginx.cf b/nginx.cf index 3ecb03c..3376546 100644 --- a/nginx.cf +++ b/nginx.cf @@ -13,6 +13,14 @@ centos:: "cfg_dir" string => "/etc/nginx"; "vhost_cfg_dir" string => "$(cfg_dir)/conf.d"; "service_name" string => "nginx"; +debian:: + "www_dir" string => "/var/www",unless => isvariable( $(this.promiser) ) ; + "www_user" string => "www-data"; + "www_group" string => "www-data"; + "cfg_dir" string => "/etc/nginx"; + "vhost_cfg_dir" string => "$(cfg_dir)/conf.d"; + "service_name" string => "nginx"; + any:: diff --git a/templates/nginx-vhost.conf.mustache b/templates/nginx-vhost.conf.mustache index 44067d3..81dec63 100644 --- a/templates/nginx-vhost.conf.mustache +++ b/templates/nginx-vhost.conf.mustache @@ -13,6 +13,7 @@ server { alias {{vars.nginx.default_html_dir}}/.well-known/acme-challenge/; try_files $uri $uri/ =404; } + {{{vars.apache_vhost.site.raw}}} } {{/vars.nginx_vhost.site.ssl}} @@ -51,6 +52,7 @@ server { # ssl_dhparam /etc/nginx/dhparam.pem; root {{vars.nginx_vhost.site.doc_root}}; + {{{vars.apache_vhost.site.raw}}} }