[Fedora-directory-commits] dsgw/orghtml orgchart.tmpl.in,1.1,1.2

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/dsgw/orghtml
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15541/dsgw/orghtml

Modified Files:
	orgchart.tmpl.in 
Log Message:
Renamed setup to setup-ds-dsgw to be consistent with other setup scripts
setup-ds-dsgw will attempt to use settings from pre-configured admin server
and directory server
Config files will use an ldap url and http url - this is so that we can use
http or https and ldap or ldaps - previously, dsgw was configured during
regular DS setup, which did not allow TLS/SSL setup - we must be able to
configure the dsgw for TLS/SSL during setup now
Changed XP_GetClientStr back to just always return a malloc'd string - there
are cases where we cannot use a static
There were some places where we were using a form with POST + a query string
Use SERVER_NAME instead of HTTP_HOST because the latter has the port number
already in it



Index: orgchart.tmpl.in
===================================================================
RCS file: /cvs/dirsec/dsgw/orghtml/orgchart.tmpl.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- orgchart.tmpl.in	28 Jan 2008 21:22:48 -0000	1.1
+++ orgchart.tmpl.in	30 Jan 2008 02:22:47 -0000	1.2
@@ -55,9 +55,11 @@
 #   Name/Value pairs below are (and need to be) separated with
 #   one or more tabs  (or spaces)
 #
-ldap-host	@host@
-ldap-port	@port@
+ldap-url	@ldapurl@/@suffix@
+#ldap-host	@host@
+#ldap-port	@port@
 ldap-search-base	@suffix@
+securitydir	@securitydir@
 
 #
 #  If you would like to have the phonebook icon visible, you must
@@ -69,7 +71,7 @@
 #      url-phonebook-base      http://hostname.domain.com/dsgw/bin/dosearch?context=default&hp=localhost&dn=
 #
 
-url-phonebook-base	http://@host@:@httpport@@cgiuri@/dosearch?context=pb&hp=@host@:@port@&dn=
+url-phonebook-base	@httpurl@@cgiuri@/dosearch?context=pb&hp=@host@:@port@&dn=
 
 #
 #   A name that has no value after it equates to "" for the value,