Skip to content

Commit eea330b

Browse files
committed
Manually merge PR166 unit tests as well since they didn't make it into previous commit
git-svn-id: svn+ssh://svn.code.sf.net/p/migrid/code/trunk@6181 b75ad72c-e7d7-11dd-a971-7dbc132099af
1 parent 7bf0197 commit eea330b

File tree

3 files changed

+13
-0
lines changed

3 files changed

+13
-0
lines changed

tests/fixture/confs-stdlocal/MiGserver.conf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@ auto_add_filter_method = skip
3030
# auth methods explicitly enabled with auto_add_X_user. Space separated list of
3131
# user field and regexp-filter pattern pairs separated by colons.
3232
auto_add_user_permit = distinguished_name:.*
33+
# Optional limit on users who may sign up through autocreate without operator
34+
# interaction if a valid peer exists. Defaults to allow ANY distinguished name
35+
# if unset but only for auth methods explicitly enabled with auto_add_X_user.
36+
# Space separated list of user field and regexp-filter pattern pairs separated
37+
# by colons.
38+
auto_add_user_with_peer = distinguished_name:.*
3339
# Default account expiry unless set. Renew and web login extends by default.
3440
cert_valid_days = 365
3541
oid_valid_days = 365

tests/fixture/mig_shared_configuration--new.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,12 @@
1717
".*"
1818
]
1919
],
20+
"auto_add_user_with_peer": [
21+
[
22+
"distinguished_name",
23+
".*"
24+
]
25+
],
2026
"ca_dir": "",
2127
"ca_file": "",
2228
"ca_fqdn": "",

tests/fixture/mig_shared_configuration--new.json.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[DEFAULT]
22
auto_add_user_permit = array_of_tuples
3+
auto_add_user_with_peer = array_of_tuples
34
site_cloud_access = array_of_tuples
45
site_peers_permit = array_of_tuples
56
site_vgrid_creators = array_of_tuples

0 commit comments

Comments
 (0)