diff --git a/defaults/main/nginx_stage.yml b/defaults/main/nginx_stage.yml index e755081..57d7933 100644 --- a/defaults/main/nginx_stage.yml +++ b/defaults/main/nginx_stage.yml @@ -23,4 +23,6 @@ locations_ini: "{{ passenger_lib_dir }}/locations.ini" # passenger_disable_anonymous_telemetry is not defined as it's not supported # in many versions. -# passenger_disable_anonymous_telemetry: on \ No newline at end of file +# passenger_disable_anonymous_telemetry: on + +# passenger_log_file: '/var/log/ondemand-nginx/%{user}/error.log' diff --git a/molecule/default/fixtures/config/nginx_stage.yml.custom.Debian b/molecule/default/fixtures/config/nginx_stage.yml.custom.Debian index 6967f38..5e9b037 100644 --- a/molecule/default/fixtures/config/nginx_stage.yml.custom.Debian +++ b/molecule/default/fixtures/config/nginx_stage.yml.custom.Debian @@ -99,6 +99,11 @@ passenger_root: "/opt/ood/ondemand/root/usr/share/ruby/vendor_ruby/phusion_passe # passenger_pool_idle_time: 400 +# The path to the Passenger log file for the user. +# Set to `null` to use the default per-user NGINX error log. +# +passenger_log_file: '/var/log/ondemand-nginx/%{user}/ezzor.log' + # Option to disable the Passenger telemetry. # Set to `on` if you don't want to regularly send anonymous telemetry data to Phusion # diff --git a/molecule/default/fixtures/config/nginx_stage.yml.custom.RedHat b/molecule/default/fixtures/config/nginx_stage.yml.custom.RedHat index 3edd513..e0cb15b 100644 --- a/molecule/default/fixtures/config/nginx_stage.yml.custom.RedHat +++ b/molecule/default/fixtures/config/nginx_stage.yml.custom.RedHat @@ -99,6 +99,11 @@ passenger_root: "/opt/ood/ondemand/root/usr/share/ruby/vendor_ruby/phusion_passe # passenger_pool_idle_time: 400 +# The path to the Passenger log file for the user. +# Set to `null` to use the default per-user NGINX error log. +# +passenger_log_file: '/var/log/ondemand-nginx/%{user}/ezzor.log' + # Option to disable the Passenger telemetry. # Set to `on` if you don't want to regularly send anonymous telemetry data to Phusion # diff --git a/molecule/default/fixtures/config/nginx_stage.yml.default.Debian b/molecule/default/fixtures/config/nginx_stage.yml.default.Debian index f5577ec..f29511e 100644 --- a/molecule/default/fixtures/config/nginx_stage.yml.default.Debian +++ b/molecule/default/fixtures/config/nginx_stage.yml.default.Debian @@ -96,6 +96,11 @@ passenger_root: "/opt/ood/ondemand/root/usr/share/ruby/vendor_ruby/phusion_passe # passenger_pool_idle_time: 300 +# The path to the Passenger log file for the user. +# Set to `null` to use the default per-user NGINX error log. +# +#passenger_log_file: '/var/log/ondemand-nginx/%{user}/error.log' + # Option to disable the Passenger telemetry. # Set to `on` if you don't want to regularly send anonymous telemetry data to Phusion # diff --git a/molecule/default/fixtures/config/nginx_stage.yml.default.RedHat b/molecule/default/fixtures/config/nginx_stage.yml.default.RedHat index 2e80e3c..22b5980 100644 --- a/molecule/default/fixtures/config/nginx_stage.yml.default.RedHat +++ b/molecule/default/fixtures/config/nginx_stage.yml.default.RedHat @@ -96,6 +96,11 @@ passenger_root: "/opt/ood/ondemand/root/usr/share/ruby/vendor_ruby/phusion_passe # passenger_pool_idle_time: 300 +# The path to the Passenger log file for the user. +# Set to `null` to use the default per-user NGINX error log. +# +#passenger_log_file: '/var/log/ondemand-nginx/%{user}/error.log' + # Option to disable the Passenger telemetry. # Set to `on` if you don't want to regularly send anonymous telemetry data to Phusion # diff --git a/molecule/default/vars/nginx.yml b/molecule/default/vars/nginx.yml index 3bdcd75..554dabe 100644 --- a/molecule/default/vars/nginx.yml +++ b/molecule/default/vars/nginx.yml @@ -11,3 +11,6 @@ pun_custom_env: MY_ENV_VAR: 'is so cool' passenger_disable_anonymous_telemetry: 'on' + +# note the misspelling here that it's different than the default 'error.log'. +passenger_log_file: '/var/log/ondemand-nginx/%{user}/ezzor.log' \ No newline at end of file diff --git a/templates/nginx_stage.yml.j2 b/templates/nginx_stage.yml.j2 index 3bed561..9360590 100644 --- a/templates/nginx_stage.yml.j2 +++ b/templates/nginx_stage.yml.j2 @@ -110,6 +110,15 @@ passenger_root: "{{ locations_ini }}" # passenger_pool_idle_time: {{ passenger_pool_idle_time }} +# The path to the Passenger log file for the user. +# Set to `null` to use the default per-user NGINX error log. +# +{% if passenger_log_file is defined %} +passenger_log_file: '{{ passenger_log_file }}' +{% else %} +#passenger_log_file: '/var/log/ondemand-nginx/%{user}/error.log' +{% endif %} + # Option to disable the Passenger telemetry. # Set to `on` if you don't want to regularly send anonymous telemetry data to Phusion #