httpd-win32-msi-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r398286 - /httpd/httpd/win32-msi/trunk/InstallConf.awk
Date Sun, 30 Apr 2006 06:58:47 GMT
Author: wrowe
Date: Sat Apr 29 23:58:46 2006
New Revision: 398286

URL: http://svn.apache.org/viewcvs?rev=398286&view=rev
Log:

  2.0.58 time, and time to ship ssl.  Accomodate the redundantly named
  ssl-std.conf.in and it's obscure config tweaks.

Modified:
    httpd/httpd/win32-msi/trunk/InstallConf.awk

Modified: httpd/httpd/win32-msi/trunk/InstallConf.awk
URL: http://svn.apache.org/viewcvs/httpd/httpd/win32-msi/trunk/InstallConf.awk?rev=398286&r1=398285&r2=398286&view=diff
==============================================================================
--- httpd/httpd/win32-msi/trunk/InstallConf.awk (original)
+++ httpd/httpd/win32-msi/trunk/InstallConf.awk Sat Apr 29 23:58:46 2006
@@ -16,8 +16,10 @@
     servername = ARGV[2];
     serveradmin = ARGV[3];
     serverport = ARGV[4];
-    serverroot = ARGV[5];
+    serversslport = ARGV[5];
+    serverroot = ARGV[6];
 
+    delete ARGV[6];
     delete ARGV[5];
     delete ARGV[4];
     delete ARGV[3];
@@ -57,14 +59,19 @@
         print "Successfully removed " srcfl > tstfl;
     }
 
-    srcfl = confroot "ssl-std.conf";
+    srcfl = confroot "ssl-std.conf.in";
     dstfl = confroot "ssl.default.conf";
     while ( ( getline < srcfl ) > 0 ) {
-        gsub( /@@ServerRoot@@/, serverroot );
-        gsub( /@@DomainName@@/, domainname );
-        gsub( /@@ServerName@@/, servername );
-        gsub( /@@ServerAdmin@@/, serveradmin );
-        gsub( /@@Port@@/, serverport );
+	gsub( /@@ServerRoot@@/, serverroot );
+	gsub( /SSLMutex  file:@exp_runtimedir@\/ssl_mutex/, "SSLMutex default" );
+	gsub( /@exp_runtimedir@/, "logs" );
+	gsub( /@exp_htdocsdir@/, serverroot "/htdocs" );
+	gsub( /@exp_logfiledir@/, "logs" );
+	gsub( /@exp_sysconfdir@/, "conf" );
+	gsub( /@exp_cgidir@/, serverroot "/cgi" );
+        gsub( /www.example.com/, servername );
+        gsub( /you@example.com/, serveradmin );
+        gsub( /443/, serversslport );
         print $0 > dstfl;
     }
     if ( close(dstfl) >= 0 ) {



---------------------------------------------------------------------
To unsubscribe, e-mail: win32-msi-cvs-unsubscribe@httpd.apache.org
For additional commands, e-mail: win32-msi-cvs-help@httpd.apache.org


Mime
View raw message