Improved restricted shell messages

[brandonbiggs]

This PR adds two new configuration items in /etc/ood/config/nginx_stage.yml.

• disable_nginx_stage_help_message: true/false
• disabled_shell_message: string message that gets displayed when a user has a disabled shell

Most folks running OOD would never need to worry about this. But this is helpful for those who do need to configure disabled_shell.

With the current installation, and the new installation, here is what is shown when a user has a disabled_shell.

# /opt/ood/nginx_stage/sbin/nginx_stage pun --user username
user has disabled shell: username
Run 'nginx_stage --help' to see a full list of available command line options.

When disable_nginx_stage_help_message: true in nginx_stage.yml:

# /opt/ood/nginx_stage/sbin/nginx_stage pun --user username
user has disabled shell: username

Second line is hidden.

When disabled_shell_message: 'this is a test':

# /opt/ood/nginx_stage/sbin/nginx_stage pun --user username
this is a test

[johrstrom]

My guess is tests will fail because you need to add these to the example template file: https://github.com/OSC/ondemand/blob/master/nginx_stage/share/nginx_stage_example.yml (we run tests to be sure that any configuration is also listed in this example config)

[johrstrom]

I don't like double negatives here. Instead of disable set to false can we have just nginx_stage_help_message set to true?

Or maybe it's show_nginx_stage_help_message set to true?

It's just the double negatives that make it hard to understand at a glance.

[brandonbiggs]

Makes sense to me. I like the show_nginx_stage_help_message = true

[brandonbiggs]

Okay, this should be updated.

[brandonbiggs]

My guess is tests will fail because you need to add these to the example template file: https://github.com/OSC/ondemand/blob/master/nginx_stage/share/nginx_stage_example.yml (we run tests to be sure that any configuration is also listed in this example config)

I'll get this fixed too.

[brandonbiggs]

My guess is tests will fail because you need to add these to the example template file: https://github.com/OSC/ondemand/blob/master/nginx_stage/share/nginx_stage_example.yml (we run tests to be sure that any configuration is also listed in this example config)

Okay, I've added this as well.