cvs: SVNROOT / run-conversion.php

gwynne		Mon Nov 17 20:22:37 2008 UTC

  Modified files:              
    /SVNROOT	run-conversion.php 
  Log:
  Use specified paths instead of hardcoding in global httpd.conf, only remove temp dir on a full run
  
http://cvs.php.net/viewvc.cgi/SVNROOT/run-conversion.php?r1=1.46&r2=1.47&diff_format=u
Index: SVNROOT/run-conversion.php
diff -u SVNROOT/run-conversion.php:1.46 SVNROOT/run-conversion.php:1.47
--- SVNROOT/run-conversion.php:1.46	Mon Nov 17 20:14:46 2008
+++ SVNROOT/run-conversion.php	Mon Nov 17 20:22:37 2008
@@ -7,7 +7,7 @@
 
 // -----------------------------------------------------------------------------------------------------------------------------
 // Constants
-$version = substr('$Revision: 1.46 $', strlen('$Revision: '), -2);
+$version = substr('$Revision: 1.47 $', strlen('$Revision: '), -2);
 
 $passes = array(
     'processcvs',       // Process CVS modules
@@ -672,14 +672,17 @@
         v(2, "Not overwriting existing global user database.\n");
     }
     v(2, "Installing global Apache 2.2 configuration file....\n");
-    $apacheConf = $GLOBALS['options']['svnroot'] . DIR_SEP . 'httpd.conf';
+    $svnRoot = $GLOBALS['options']['svnroot'];
+    $logsDir = $svnRoot . DIR_SEP . 'logs' . DIR_SEP;
+    $apacheConf = $svnRoot. DIR_SEP . 'httpd.conf';
     $confContents = <<<EOHTTPD
 <VirtualHost *:80>
     ServerName svn.php.net
+    DocumentRoot "{$svnRoot}"
     LogLevel debug
-    CustomLog "|/local/bin/rotatelogs /home/svn/logs/svn-svn_log.%Y%m%d 86400" "%t %u %{SVN-ACTION}e" env=SVN-ACTION
-    CustomLog "|/local/bin/rotatelogs /home/svn/logs/svn-access_log.%Y%m%d 86400" combined
-    ErrorLog "|/local/bin/rotatelogs /home/svn/logs/svn-error_log.%Y%m%d 86400"
+    CustomLog "|/local/bin/rotatelogs {$logsDir}/svn-svn_log.%Y%m%d 86400" "%t %u %{SVN-ACTION}e" env=SVN-ACTION
+    CustomLog "|/local/bin/rotatelogs {$logsDir}/svn-access_log.%Y%m%d 86400" combined
+    ErrorLog "|/local/bin/rotatelogs {$logsDir}/svn-error_log.%Y%m%d 86400"
 
 EOHTTPD;
     foreach ($GLOBALS['repoList'] as $repo) {
@@ -693,7 +696,7 @@
 // -----------------------------------------------------------------------------------------------------------------------------
 // Cleanup
 
-if ($options['pass'] === NULL || $options['pass'] == end($passes)) {
+if ($options['pass'] === NULL) {
     v(2, "Removing temporary files.\n");
     system("rm -Rf " . escapeshellarg($temp_path));
 }