diff options
| author | Jason Gerard DeRose <jderose@redhat.com> | 2008-10-15 12:24:15 -0600 |
|---|---|---|
| committer | Jason Gerard DeRose <jderose@redhat.com> | 2008-10-15 12:24:15 -0600 |
| commit | af7c0ee595bf522a7f52e5e1b6515a3a27292846 (patch) | |
| tree | cc9822e5cf636d4d3f979c6a66f8696e618bad9b /ipalib/config.py | |
| parent | e5d0bfa86bdf6ba1ad72241fc135a3fb065578ef (diff) | |
| parent | 789a248daa71d5d1377e0dc9f0cd3afe107d4f2a (diff) | |
| download | freeipa.git-af7c0ee595bf522a7f52e5e1b6515a3a27292846.tar.gz freeipa.git-af7c0ee595bf522a7f52e5e1b6515a3a27292846.tar.xz freeipa.git-af7c0ee595bf522a7f52e5e1b6515a3a27292846.zip | |
Resolved conficts in Rob's merge
Diffstat (limited to 'ipalib/config.py')
| -rw-r--r-- | ipalib/config.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ipalib/config.py b/ipalib/config.py index a606a40b..42bf7787 100644 --- a/ipalib/config.py +++ b/ipalib/config.py @@ -25,8 +25,11 @@ DEFAULT_CONF='/etc/ipa/ipa.conf' def generate_env(d={}): default = dict( + container_accounts = 'cn=accounts', basedn = 'dc=example,dc=com', container_user = 'cn=users,cn=accounts', + container_group = 'cn=groups,cn=accounts', + container_service = 'cn=services,cn=accounts', domain = LazyProp(get_domain), interactive = True, query_dns = True, |