Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion defaults/main/nginx_stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
# passenger_disable_anonymous_telemetry: on

# passenger_log_file: '/var/log/ondemand-nginx/%{user}/error.log'
Original file line number Diff line number Diff line change
Expand Up @@ -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
#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
#
Expand Down
3 changes: 3 additions & 0 deletions molecule/default/vars/nginx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
9 changes: 9 additions & 0 deletions templates/nginx_stage.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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
#
Expand Down