cvs: SVNROOT / httpd.conf run-conversion.php

gwynne Wed Jul 8 08:36:33 2009 UTC Modified files: /SVNROOT httpd.conf run-conversion.php Log: put some more modules in the right places, and disable SSL in the httpd.conf for goodness sake http://cvs.php.net/viewvc.cgi/SVNROOT/httpd.conf?r1=1.6&r2=1.7&diff_format=u Index: SVNROOT/httpd.conf diff -u SVNROOT/httpd.conf:1.6 SVNROOT/httpd.conf:1.7 --- SVNROOT/httpd.conf:1.6 Sun Jun 21 16:35:00 2009 +++ SVNROOT/httpd.conf Wed Jul 8 08:36:33 2009 @@ -16,24 +16,24 @@ </VirtualHost> #NameVirtualHost *:443 -<VirtualHost *:443> - SSLEngine On - SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL - SSLCertificateFile /local/this-box/php.net.crt - SSLCertificateKeyFile /local/this-box/php.net.key - ServerName svn.php.net - CustomLog "|/local/bin/rotatelogs /home/svn/logs/svn-ssl-svn_log.%Y%m%d 86400" "%t %u %{SVN-ACTION}e" env=SVN-ACTION - CustomLog "|/local/bin/rotatelogs /home/svn/logs/svn-ssl-access_log.%Y%m%d 86400" combined - ErrorLog "|/local/bin/rotatelogs /home/svn/logs/svn-ssl-error_log.%Y%m%d 86400" - <Location "/"> - DAV svn - SVNPath "/home/svn/repository" - Satisfy All - Require valid-user - AuthType Digest - AuthName "PHP Subversion Repository" - AuthUserFile "/home/svn/SVNROOT/passwd.db" - AuthDigestDomain "/" - </Location> -</VirtualHost> +#<VirtualHost *:443> + # SSLEngine On + # SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL + # SSLCertificateFile /local/this-box/php.net.crt + # SSLCertificateKeyFile /local/this-box/php.net.key + # ServerName svn.php.net + # CustomLog "|/local/bin/rotatelogs /home/svn/logs/svn-ssl-svn_log.%Y%m%d 86400" "%t %u %{SVN-ACTION}e" env=SVN-ACTION + # CustomLog "|/local/bin/rotatelogs /home/svn/logs/svn-ssl-access_log.%Y%m%d 86400" combined + # ErrorLog "|/local/bin/rotatelogs /home/svn/logs/svn-ssl-error_log.%Y%m%d 86400" + # <Location "/"> + ## DAV svn + # SVNPath "/home/svn/repository" + # Satisfy All + # Require valid-user + # AuthType Digest + # AuthName "PHP Subversion Repository" + # AuthUserFile "/home/svn/SVNROOT/passwd.db" + # AuthDigestDomain "/" + # </Location> +#</VirtualHost> http://cvs.php.net/viewvc.cgi/SVNROOT/run-conversion.php?r1=1.69&r2=1.70&diff_format=u Index: SVNROOT/run-conversion.php diff -u SVNROOT/run-conversion.php:1.69 SVNROOT/run-conversion.php:1.70 --- SVNROOT/run-conversion.php:1.69 Tue Jul 7 15:39:14 2009 +++ SVNROOT/run-conversion.php Wed Jul 8 08:36:33 2009 @@ -7,7 +7,7 @@ // ----------------------------------------------------------------------------------------------------------------------------- // Constants -$version = substr('$Revision: 1.69 $', strlen('$Revision: '), -2); +$version = substr('$Revision: 1.70 $', strlen('$Revision: '), -2); $passes = array( 'svncreate', // Create various SVN repositories @@ -378,19 +378,20 @@ continue; } // Raw files in the cvs repo and empty directories (count(scandir()) == 2 (./..)) are not converted. - if (!is_dir("{$cvsPath}/{$cvs_module}") || count(scandir("{$cvsPath}/{$cvs_module}")) == 2) { + if (!is_dir("{$cvsPath}/{$cvs_module}") || count(scandir("{$cvsPath}/{$cvs_module}")) == 2 || in_array($cvs_module, array('phpdoc_de'))) { rm("{$cvsPath}/{$cvs_module}"); // Selected obsolete modules are archived in SVN } else if (in_array($cvs_module, array('smarty', 'smarty-web', 'php4.fubar', 'php4.unused', 'peardoc.backup', 'php3', 'phpfi', 'livedocs', 'Zend', 'functable', 'dialin', 'docstuff', 'jpgraph', 'phpdoc-fa_IR', 'lxr', 'portal', 'pres', 'embed', 'imapd', 'phpdoc-po'))) { mv("{$cvsPath}/{$cvs_module}", "{$cvsPath}/archived/{$cvs_module}"); + $converter->addCVSModule("archived/{$cvs_module}"); // Modules belonging to PHP-GTK go into cvs/gtk/<module> } else if (in_array($cvs_module, array('php-gtk', 'php-gtk-doc', 'old-php-gtk-modules', 'php-gtk-web'))) { mv("{$cvsPath}/{$cvs_module}", "{$cvsPath}/gtk/{$cvs_module}"); $converter->addCVSModule("gtk/{$cvs_module}"); // Modules belonging to the PHP base go into cvs/php/<module>. - } else if (in_array($cvs_module, array('ZendAPI', 'php-src', 'php-objc', 'php-lang', + } else if (in_array($cvs_module, array('ZendAPI', 'php-src', 'php-objc', 'php-lang', 'php-benchmarks', 'phpruntests', 'win-installer', 'bindlib_w32', 'zlib', 'pdo-specs', 'php-internals-win', 'fastcgi-isapi'))) { mv("{$cvsPath}/{$cvs_module}", "{$cvsPath}/php/{$cvs_module}"); $converter->addCVSModule("php/{$cvs_module}"); @@ -416,7 +417,7 @@ $converter->addCVSModule("web/{$dest_cvs_module}"); // Modules belonging to phpdoc (especially doc-base, see renamings) go into cvs/phpdoc/<module> // All modules matching "phpdoc-(.*)" are matched, and added with the "phpdoc-" prefix stripped. - } else if (strncmp($cvs_module, "phpdoc", 6) == 0 || $cvs_module == 'doc-base') { + } else if (strncmp($cvs_module, "phpdoc", 6) == 0 || $cvs_module == 'doc-base' || $cvs_module == 'doc-editor') { if (substr($cvs_module, 0, 7) == 'phpdoc-') { $dest_cvs_module = substr($cvs_module, 7); } else {