diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-01-18 11:06:46 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-01-18 11:06:46 -0500 |
| commit | 7161b78b261cdbd959bf6f42d0780ceb78bf2e64 (patch) | |
| tree | b619e1b222476096122e64302efc29c214076e9c /src/lib/Bcfg2/Options.py | |
| parent | b79027f553c82be75e49bcf9bde2f92ab72304c7 (diff) | |
| parent | c2133f115673670992048f3567c22e7478281a79 (diff) | |
| download | bcfg2-7161b78b261cdbd959bf6f42d0780ceb78bf2e64.tar.gz bcfg2-7161b78b261cdbd959bf6f42d0780ceb78bf2e64.tar.bz2 bcfg2-7161b78b261cdbd959bf6f42d0780ceb78bf2e64.zip | |
Merge branch '1.3.1' into 1.4.x
Diffstat (limited to 'src/lib/Bcfg2/Options.py')
| -rw-r--r-- | src/lib/Bcfg2/Options.py | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Options.py b/src/lib/Bcfg2/Options.py index 1f5a8f689..decb726d0 100644 --- a/src/lib/Bcfg2/Options.py +++ b/src/lib/Bcfg2/Options.py @@ -922,6 +922,26 @@ CLIENT_YUM_VERIFY_FLAGS = \ default=[], cf=('YUM', 'verify_flags'), cook=list_split) +CLIENT_POSIX_UID_WHITELIST = \ + Option("UID ranges the POSIXUsers tool will manage", + default=[], + cf=('POSIXUsers', 'uid_whitelist'), + cook=list_split) +CLIENT_POSIX_GID_WHITELIST = \ + Option("GID ranges the POSIXUsers tool will manage", + default=[], + cf=('POSIXUsers', 'gid_whitelist'), + cook=list_split) +CLIENT_POSIX_UID_BLACKLIST = \ + Option("UID ranges the POSIXUsers tool will not manage", + default=[], + cf=('POSIXUsers', 'uid_blacklist'), + cook=list_split) +CLIENT_POSIX_GID_BLACKLIST = \ + Option("GID ranges the POSIXUsers tool will not manage", + default=[], + cf=('POSIXUsers', 'gid_blacklist'), + cook=list_split) # Logging options LOGGING_FILE_PATH = \ @@ -1065,7 +1085,11 @@ DRIVER_OPTIONS = \ yum_installed_action=CLIENT_YUM_INSTALLED_ACTION, yum_version_fail_action=CLIENT_YUM_VERSION_FAIL_ACTION, yum_verify_fail_action=CLIENT_YUM_VERIFY_FAIL_ACTION, - yum_verify_flags=CLIENT_YUM_VERIFY_FLAGS) + yum_verify_flags=CLIENT_YUM_VERIFY_FLAGS, + posix_uid_whitelist=CLIENT_POSIX_UID_WHITELIST, + posix_gid_whitelist=CLIENT_POSIX_UID_WHITELIST, + posix_uid_blacklist=CLIENT_POSIX_UID_BLACKLIST, + posix_gid_blacklist=CLIENT_POSIX_UID_BLACKLIST) CLIENT_COMMON_OPTIONS = \ dict(extra=CLIENT_EXTRA_DISPLAY, |