[Devil-linux-commit] build/scripts webmin,1.3,1.4

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6674

Modified Files:
	webmin 
Log Message:
more confg fixes


Index: webmin
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/webmin,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- webmin	6 May 2009 14:33:44 -0000	1.3
+++ webmin	9 May 2009 16:16:25 -0000	1.4
@@ -23,6 +23,12 @@
 # source functions and config
 source $MYDIR/settings
 
+# $1 filename $2 parameter $3 value
+function change_param ()
+{
+     perl -i -p -e "s%$2=.*%$2=$3%g" $1
+}
+
 
 case $1 in
     build )
@@ -70,12 +76,15 @@
 	    export nouninstall=1
 	    export nostart=1
 	    export crypt=x
+	    perl -i -p -e 's%#!/usr/local/bin/perl%#!/usr/bin/perl%g' *.pl
 	    ./setup.sh || exit 1
-	    perl -i -p -e 's%/usr/local/apache%/usr/sbin%g' /etc/webmin/apache/*
+	    echo "correcting config files"
+	    perl -i -p -e 's%/usr/local/apache%/usr%g' /etc/webmin/apache/*
 	    perl -i -p -e 's%/var/spool/cron%/var/cron%g' /etc/webmin/cron/*
 	    perl -i -p -e 's%/usr/local%%g' /etc/webmin/syslog-ng/*
 	    perl -i -p -e 's%/usr/local/mysql/%/usr/%g' /etc/webmin/mysql/*
-	     
+	    change_param /etc/webmin/apache/config httpd_conf /etc/apache2/httpd.conf
+
 	    rm /etc/webmin/*cache
 	    cp -dpvR /etc/webmin $ETCDIR/etc/ || exit 1
 	    echo "# Start Webmin?"