svn: /SVNROOT/ httpd.conf
| From: | Rasmus Lerdorf | Date: | Tue, 17 Dec 2013 21:45:47 +0000 |
| Subject: | svn: /SVNROOT/ httpd.conf | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-74480@lists.php.net to get a copy of this message | ||
rasmus Tue, 17 Dec 2013 21:45:47 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=332452
Log:
svn2 Apache config
Changed paths:
U SVNROOT/httpd.conf
Modified: SVNROOT/httpd.conf
===================================================================
--- SVNROOT/httpd.conf 2013-12-17 20:41:01 UTC (rev 332451)
+++ SVNROOT/httpd.conf 2013-12-17 21:45:47 UTC (rev 332452)
@@ -1,20 +1,28 @@
<VirtualHost *:80>
ServerName svn.php.net
- CustomLog "|/local/bin/rotatelogs /home/svn/logs/svn-svn_log.%Y%m%d 86400" "%h
%t %u %{SVN-ACTION}e" env=SVN-ACTION
- CustomLog "|/local/bin/rotatelogs /home/svn/logs/svn-access_log.%Y%m%d 86400"
"%h %u %t \"%r\" %>s %b (%{cratio}n%%) \"%{Referer}i\"
\"%{User-Agent}i\""
- ErrorLog "|/local/bin/rotatelogs /home/svn/logs/svn-error_log.%Y%m%d 86400"
+ ServerAlias svn2.php.net
+ CustomLog "|/usr/sbin/rotatelogs /home/svn/logs/svn-svn_log.%Y%m%d 86400" "%h %t
%u %{SVN-ACTION}e" env=SVN-ACTION
+ CustomLog "|/usr/sbin/rotatelogs /home/svn/logs/svn-access_log.%Y%m%d 86400" "%h
%u %t \"%r\" %>s %b (%{cratio}n%%) \"%{Referer}i\"
\"%{User-Agent}i\""
+ ErrorLog "|/usr/sbin/rotatelogs /home/svn/logs/svn-error_log.%Y%m%d 86400"
DeflateCompressionLevel 6
DeflateFilterNote Ratio cratio
LogLevel info
+ Alias /shared /local/Web/sites/php-people-web/shared/
ScriptAlias /viewvc /home/svn/viewvc-svn/bin/cgi/viewvc.cgi
ScriptAlias /query /home/svn/viewvc-svn/bin/cgi/query.cgi
Alias /docroot /home/svn/viewvc-svn/templates/docroot
+ <Directory "/home/svn/viewvc-svn">
+ Order allow,deny
+ Allow from all
+ </Directory>
+
<Directory "/home/svn/viewvc-svn/bin/cgi">
Options +ExecCGI
Order allow,deny
Allow from all
</Directory>
+
<Location "/">
DirectoryIndex viewvc
Order allow,deny
@@ -44,20 +52,25 @@
NameVirtualHost *:443
<VirtualHost *:443>
- SSLEngine On
- SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL
- SSLCertificateFile /local/this-box/wildcard-php.net.crt
- SSLCertificateKeyFile /local/this-box/wildcard-php.net.key
- SSLCertificateChainFile /local/this-box/wildcard-php.net.GODADDY-CA.crt
+ AddType application/x-x509-ca-cert .crt
+ AddType application/x-pkcs7-crl .crl
+ SSLEngine on
+ SSLHonorCipherOrder on
+ SSLCipherSuite
ECDHE-RSA-RC4-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES128-SHA:DHE-RSA-CAMELLIA128-SHA:AES128-SHA:RC4-SHA:HIGH:!aNULL:!MD5:!ADH
+ SSLCertificateFile /etc/ssl/php/STAR_php_net.crt
+ SSLCertificateKeyFile /etc/ssl/php/STAR_php_net.key
+ SSLCertificateChainFile /etc/ssl/php/STAR_php_net.ca-bundle
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"
"%h %u %t \"%r\" %>s %b (%{cratio}n%%) \"%{Referer}i\"
\"%{User-Agent}i\""
- ErrorLog "|/local/bin/rotatelogs /home/svn/logs/svn-ssl-error_log.%Y%m%d 86400"
+ ServerAlias svn2.php.net
+ CustomLog "|/usr/sbin/rotatelogs /home/svn/logs/svn-ssl-svn_log.%Y%m%d 86400"
"%t %u %{SVN-ACTION}e" env=SVN-ACTION
+ CustomLog "|/usr/sbin/rotatelogs /home/svn/logs/svn-ssl-access_log.%Y%m%d 86400"
"%h %u %t \"%r\" %>s %b (%{cratio}n%%) \"%{Referer}i\"
\"%{User-Agent}i\""
+ ErrorLog "|/usr/sbin/rotatelogs /home/svn/logs/svn-ssl-error_log.%Y%m%d 86400"
DeflateCompressionLevel 6
DeflateFilterNote Ratio cratio
LogLevel info
+ Alias /shared /local/Web/sites/php-people-web/shared/
ScriptAlias /viewvc /home/svn/viewvc-svn/bin/cgi/viewvc.cgi
ScriptAlias /query /home/svn/viewvc-svn/bin/cgi/query.cgi
Alias /docroot /home/svn/viewvc-svn/templates/docroot