Skip to content

support nginx shell message and disabling #288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
johrstrom merged 2 commits into from
Jan 30, 2026
Merged

support nginx shell message and disabling #288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59c0f4f
support nginx shell message and disabling
johrstrom Jan 29, 2026
3b2d1d6
rm extra newline in fixture
johrstrom Jan 29, 2026
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
3 changes: 3 additions & 0 deletions defaults/main/nginx_stage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,6 @@ locations_ini: "{{ passenger_lib_dir }}/locations.ini"
# passenger_disable_anonymous_telemetry: on

# passenger_log_file: '/var/log/ondemand-nginx/%{user}/error.log'

# disabled_shell_message: 'user has a disabled shell: %s'
# show_nginx_stage_help_message: true
8 changes: 8 additions & 0 deletions molecule/default/fixtures/config/nginx_stage.yml.custom.Debian
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,14 @@ min_uid: 500
#
#disabled_shell: '/access/denied'

# Define an error message that is displayed to users when they have a
# disabled_shell.
disabled_shell_message: 'user %s has a disabled shell. Open a ticket with Support.'

# Hide the stderr "Run 'nginx_stage --help' to see a full list of available
# command line options." message when calling nginx_stage
show_nginx_stage_help_message: false

# Set BUNDLE_USER_CONFIG to /dev/null in the PUN environment
# NB: This prevents a user's ~/.bundle/config from affecting OnDemand applications
#
Expand Down
8 changes: 8 additions & 0 deletions molecule/default/fixtures/config/nginx_stage.yml.custom.RedHat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,14 @@ min_uid: 500
#
#disabled_shell: '/access/denied'

# Define an error message that is displayed to users when they have a
# disabled_shell.
disabled_shell_message: 'user %s has a disabled shell. Open a ticket with Support.'

# Hide the stderr "Run 'nginx_stage --help' to see a full list of available
# command line options." message when calling nginx_stage
show_nginx_stage_help_message: false

# Set BUNDLE_USER_CONFIG to /dev/null in the PUN environment
# NB: This prevents a user's ~/.bundle/config from affecting OnDemand applications
#
Expand Down
8 changes: 8 additions & 0 deletions molecule/default/fixtures/config/nginx_stage.yml.default.Debian
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,14 @@ app_root:
#
#disabled_shell: '/access/denied'

# Define an error message that is displayed to users when they have a
# disabled_shell.
#disabled_shell_message: 'user has a disabled shell: %s'

# Hide the stderr "Run 'nginx_stage --help' to see a full list of available
# command line options." message when calling nginx_stage
#show_nginx_stage_help_message: true

# Set BUNDLE_USER_CONFIG to /dev/null in the PUN environment
# NB: This prevents a user's ~/.bundle/config from affecting OnDemand applications
#
Expand Down
8 changes: 8 additions & 0 deletions molecule/default/fixtures/config/nginx_stage.yml.default.RedHat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,14 @@ app_root:
#
#disabled_shell: '/access/denied'

# Define an error message that is displayed to users when they have a
# disabled_shell.
#disabled_shell_message: 'user has a disabled shell: %s'

# Hide the stderr "Run 'nginx_stage --help' to see a full list of available
# command line options." message when calling nginx_stage
#show_nginx_stage_help_message: true

# Set BUNDLE_USER_CONFIG to /dev/null in the PUN environment
# NB: This prevents a user's ~/.bundle/config from affecting OnDemand applications
#
Expand Down
6 changes: 5 additions & 1 deletion molecule/default/vars/nginx.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,8 @@ pun_custom_env:
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'
passenger_log_file: '/var/log/ondemand-nginx/%{user}/ezzor.log'


disabled_shell_message: 'user %s has a disabled shell. Open a ticket with Support.'
show_nginx_stage_help_message: false
16 changes: 16 additions & 0 deletions templates/nginx_stage.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,22 @@ min_uid: {{ nginx_min_uid }}
#
#disabled_shell: '/access/denied'

# Define an error message that is displayed to users when they have a
# disabled_shell.
{% if disabled_shell_message is defined %}
disabled_shell_message: '{{ disabled_shell_message }}'
{% else %}
#disabled_shell_message: 'user has a disabled shell: %s'
{% endif %}

# Hide the stderr "Run 'nginx_stage --help' to see a full list of available
# command line options." message when calling nginx_stage
{% if show_nginx_stage_help_message is defined %}
show_nginx_stage_help_message: {{ show_nginx_stage_help_message | bool | lower }}
{% else %}
#show_nginx_stage_help_message: true
{% endif %}

# Set BUNDLE_USER_CONFIG to /dev/null in the PUN environment
# NB: This prevents a user's ~/.bundle/config from affecting OnDemand applications
#
Expand Down