[Fedora-directory-commits] ldapserver/ldap/cm/newinst setup, 1.12, 1.13

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/ldapserver/ldap/cm/newinst
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3786/ldapserver/ldap/cm/newinst

Modified Files:
	setup 
Log Message:
Bug(s) fixed: 172056
Bug Description: Fix internal component versions and formats for initial 
FDS 1.0 build
Reviewed by: Noriko (Thanks!)
Fix Description: Some of the naming conventions needed to change e.g. 
/s/b/c/ldapconsole10ext became /fedora/components/directoryconsole/1.0.  
Made the ds onlinehelp docs available to build externally.  Perldap has 
no zip file anymore, just the dirs we copy over.  Adminserver includes 
the unzipped directories - we need to fix that eventually, but in the 
meantime, I made tar skip those unzipped directories.  I also merged 
Noriko's fix for the assecure.txt problem in setup into Fedora DS.  Noriko also pointed out an unused Makefile variable.
Platforms tested: RHEL3
Flag Day: no
Doc impact: no



Index: setup
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/setup,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- setup	25 Oct 2005 16:55:49 -0000	1.12
+++ setup	31 Oct 2005 15:55:35 -0000	1.13
@@ -312,38 +312,43 @@
 }
 
 SSLOn() {
-	for dir in `cat dssecure.txt` ; do
-		if [ -f $dir/config/dse.ldif ]; then
-			security=`grep -i "^nsslapd-security:" $dir/config/dse.ldif | awk '{print $1}'`
-			$dir/stop-slapd
-			cat $dir/config/dse.ldif | sed -e "s/\($security\) .*/\1 on/g" > $dir/config/dse.ldif.0
-			mv $dir/config/dse.ldif.0 $dir/config/dse.ldif
-			echo "$dir/config/dse.ldif: SSL on ..."
-			echo "Restarting Directory Server: $dir/start-slapd"
-			$dir/start-slapd
-		fi
-	done
+	if [ -f dssecure.txt ]; then
+		for dir in `cat dssecure.txt` ; do
+			if [ -f $dir/config/dse.ldif ]; then
+				security=`grep -i "^nsslapd-security:" $dir/config/dse.ldif | awk '{print $1}'`
+				$dir/stop-slapd
+				cat $dir/config/dse.ldif | sed -e "s/\($security\) .*/\1 on/g" > $dir/config/dse.ldif.0
+				mv $dir/config/dse.ldif.0 $dir/config/dse.ldif
+				echo "$dir/config/dse.ldif: SSL on ..."
+				echo "Restarting Directory Server: $dir/start-slapd"
+				$dir/start-slapd
+			fi
+		done
+		rm -f dssecure.txt > /dev/null 2>&1
+	fi
 
 	if [ $isadminsslon -ne 0 ]; then
 		$sroot/stop-admin
 	fi
-	for confline in `cat assecure.txt` ; do
-		conffile=`echo $confline | awk -F= '{print $1}'`
-		confparam=`echo $confline | awk -F= '{print $2}'`
-		echo $conffile | grep "\.xml$" > /dev/null 2>&1
-		rval=$?
-		if [ $rval -eq 0 ]; then
-			adminXmlSSLOn $conffile $confparam
-		else
-			adminSSLOn $conffile $confparam
-		fi
-	done
+	if [ -f assecure.txt ]; then
+		for confline in `cat assecure.txt` ; do
+			conffile=`echo $confline | awk -F= '{print $1}'`
+			confparam=`echo $confline | awk -F= '{print $2}'`
+			echo $conffile | grep "\.xml$" > /dev/null 2>&1
+			rval=$?
+			if [ $rval -eq 0 ]; then
+				adminXmlSSLOn $conffile $confparam
+			else
+				adminSSLOn $conffile $confparam
+			fi
+		done
+		rm -f assecure.txt > /dev/null 2>&1
+	fi
 	if [ $isadminsslon -ne 0 ]; then
 		echo "Restarting Administration Server: $sroot/start-admin"
 		$sroot/start-admin
 	fi
 
-	rm -f dssecure.txt assecure.txt > /dev/null 2>&1
 }
 
 # check whether it is an in-place installation
@@ -362,7 +367,7 @@
 		suitespotgroup=`ls -l $sroot/$dsinst/config/dse.ldif | awk '{print $4}'`
 		admindomain=`echo $ldaphost | awk -F. '{print $5 ? $2 "." $3 "." $4 "." $5: $4 ? $2 "." $3 "." $4 : $3 ? $2 "." $3 : $2 ? $2 : ""}'`
 		if [ "$admindomain" = "" ]; then
-    		admindomain=`domainname`
+			admindomain=`domainname`
 		fi
 
 		echo "In order to reconfigure your installation, the Configuration Directory"
@@ -376,8 +381,8 @@
 		echo "administrator ID: $siepid"
 		siepasswd=""
 		while [ "$siepasswd" = "" ]; do
-    		printf "Password: "
-    		read siepasswd
+			printf "Password: "
+			read siepasswd
 		done
 
 		inffile=$sroot/setup/myinstall.inf