[Fedora-directory-commits] adminserver/admserv/schema/ldif 10dsdata.ldif.tmpl, 1.2, 1.3 20asdata.ldif.tmpl, 1.1, 1.2

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/adminserver/admserv/schema/ldif
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16478/adminserver/admserv/schema/ldif

Modified Files:
	10dsdata.ldif.tmpl 20asdata.ldif.tmpl 
Log Message:
Resolves: bug 237356
Bug Description: Move DS Admin Code into Admin Server - admin server setup 
Reviewed by: nhosoi (Thanks!)
Fix Description: This implements support for admin server configuration and reconfiguration, so that we can remove setuputil related code from admserv/newinst/src.  The basic flow is this:
Ask user basic information.
Ask user if they want to either use an existing config ds or setup a new one.  If the user selects No, the code will gather information, create the directory server, and set it up to be the configuration DS.  Otherwise, it will just create the directory server and register it with the existing config DS.  The code will also create and setup and start the admin server, or reconfigure it and restart it as needed.  Note that setup-ds-admin.pl assumes that a config DS is to be used.  If you want to setup a directory server instance without using a config ds, use setup-ds.pl instead.
Platforms tested: RHEL4
Flag Day: Yes - autotool changes
Doc impact: Yes.



Index: 10dsdata.ldif.tmpl
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/schema/ldif/10dsdata.ldif.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 10dsdata.ldif.tmpl	15 Jun 2007 22:16:29 -0000	1.2
+++ 10dsdata.ldif.tmpl	19 Jun 2007 18:32:28 -0000	1.3
@@ -36,7 +36,6 @@
 cn: slapd-%dsid%
 uniqueMember: cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
 uniqueMember: cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
-userPassword: %ds_passwd%
 
 dn: cn=configuration,cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
 objectClass: nsResourceRef


Index: 20asdata.ldif.tmpl
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/schema/ldif/20asdata.ldif.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 20asdata.ldif.tmpl	13 Jun 2007 17:48:35 -0000	1.1
+++ 20asdata.ldif.tmpl	19 Jun 2007 18:32:28 -0000	1.2
@@ -26,7 +26,6 @@
 serverProductName: Administration Server
 serverHostName: %fqdn%
 uniqueMember: cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
-userPassword: %as_passwd%
 
 dn: cn=configuration, cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
 objectClass: nsConfig
@@ -44,7 +43,7 @@
 nsAdminUsers: %admpw%
 nsErrorLog: %as_error%
 nsPidLog: %as_pid%
-nsAccessLog: %as_access
+nsAccessLog: %as_access%
 nsAdminCacheLifetime: 600
 nsAdminAccessHosts: *.%domain%
 nsAdminAccessAddresses: *