Minor fixes to the PR on docs and the default command.

This commit is contained in:
Brian E. Granger
2015-12-12 14:43:59 -08:00
committed by Min RK
parent 8fca4e859d
commit 77b31d8542

View File

@@ -128,20 +128,24 @@ class LocalAuthenticator(Authenticator):
""" """
) )
add_user_cmd = Command(config=True, add_user_cmd = Command(config=True,
help="""add user command help="""The command to use for creating users as a list of strings.
USERNAME will be replaced with the user's name. For each element in the list, the string USERNAME will be replaced with
The user's name will be used as the last argument, e.g. the user's username. The username will also be appended as the final argument.
You may want to consult the difference between adduser and useradd. For Linux, the default value is:
useradd -d /home/USERNAME -s /bin/bash ['adduser', '-q', '--gecos', '""', '--disabled-password']
To specify a custom home directory, set this to:
will call ['adduser', '-q', '--gecos', '""', '--home', '/customhome/USERNAME', '--disabled-password']
This will run the command:
adduser -q --gecos "" --home /customhome/river --disabled-password river
useradd -d /home/river -s /bin/bash river when the user 'river' is created.
when the user 'river' is created
""" """
) )
def _add_user_cmd_default(self): def _add_user_cmd_default(self):
@@ -152,7 +156,7 @@ class LocalAuthenticator(Authenticator):
return ['pw', 'useradd', '-m'] return ['pw', 'useradd', '-m']
else: else:
# This appears to be the Linux non-interactive adduser command: # This appears to be the Linux non-interactive adduser command:
return ['adduser', '-q', '--gecos', '', '--disable-password'] return ['adduser', '-q', '--gecos', '""', '--disabled-password']
group_whitelist = Set( group_whitelist = Set(
config=True, config=True,