ANNEXE 20 - Patchs httpd.conf pour DS_setup_vserver.sh
======================================================

/local/vservers/DS_setup_vserver-http.conf.patch :
--------------------------------------------------

--- httpd.conf  Sun Aug  1 10:07:17 2004
+++ DS_setup_vserver-http.conf  Sun Aug  1 10:04:29 2004
@@ -1,6 +1,8 @@
 #
-# Debian-secinst v0.2.0 : ANNEXE 6 - Fichier de configuration Apache minimal
+# Debian-secinst v0.2.1 : ANNEXE 6 - Fichier de configuration Apache minimal
 # Simon Castro
+# Patche par : DS_patch_setup_vserver-http.conf.patch (debian-secinst v0.2.1)
+# => DS_setup_vserver-http.conf
 #
 
 ####################################
@@ -43,15 +45,13 @@
 LoadModule expires_module /usr/lib/apache/1.3/mod_expires.so
 LoadModule unique_id_module /usr/lib/apache/1.3/mod_unique_id.so
 LoadModule setenvif_module /usr/lib/apache/1.3/mod_setenvif.so
-LoadModule ssl_module /usr/lib/apache/1.3/mod_ssl.so
 
 #
 # Configuration generale du serveur
 #
 
 Port 80
-Listen 80
-Listen 443
+Listen $IP:80
 
 #
 # Repertoires et permissions
@@ -185,43 +185,20 @@
 HostnameLookups Off
 
 LogLevel warn
-SSLLogLevel warn
 
 LogFormat "%h %l %u %v %A:%p %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" common
-LogFormat "%h %l %u %v %A:%p %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %{SSL_PROTOCOL}x %{SSL_CIPHER}x %{SSL_CIPHER_USEKEYSIZE}x/%{SSL_CIPHER_ALGKEYSIZE}x" commonssl
 
 CustomLog /var/log/apache/access.log common
 ErrorLog /var/log/apache/error.log
-SSLLog /var/log/apache/ssl.log
-
-###################
-### Gestion SSL ###
-###################
-
-SSLSessionCache none
-SSLMutex sem
-SSLRandomSeed startup builtin
 
 ####################
 ### VirtualHosts ###
 ####################
 
-<VirtualHost {@IP}> 
+<VirtualHost $HOSTNAME> 
   DocumentRoot /var/www/htdocs
-  ServerName {@IP}
+  ServerName $HOSTNAME
 
   CustomLog /var/log/apache/access.log common
-  ErrorLog /var/log/apache/error.log
-</VirtualHost>
-
-<VirtualHost {@IP ou HOSTNAME}:443> 
-  DocumentRoot /var/www/htdocs
-  ServerName {@IP ou HOSTNAME}
-
-  SSLEngine On
-  SSLCertificateFile /etc/apache/ssl/{HOSTNAME}.crt
-  SSLCertificateKeyFile /etc/apache/ssl/{HOSTNAME}.key
-
-  CustomLog /var/log/apache/access_ssl.log commonssl
   ErrorLog /var/log/apache/error.log
 </VirtualHost>

/local/vservers/DS_setup_vserver-http_ssl.conf.patch :
------------------------------------------------------

--- httpd.conf  Sun Aug  1 10:07:17 2004
+++ DS_setup_vserver-http_ssl.conf      Sun Aug  1 10:05:47 2004
@@ -1,6 +1,8 @@
 #
-# Debian-secinst v0.2.0 : ANNEXE 6 - Fichier de configuration Apache minimal
+# Debian-secinst v0.2.1 : ANNEXE 6 - Fichier de configuration Apache minimal
 # Simon Castro
+# Patche par : DS_patch_setup_vserver-http_ssl.conf.patch (debian-secinst v0.2.1)
+# => DS_setup_vserver-http_ssl.conf
 #
 
 ####################################
@@ -50,8 +52,8 @@
 #
 
 Port 80
-Listen 80
-Listen 443
+Listen $IP:80
+Listen $IP:443
 
 #
 # Repertoires et permissions
@@ -206,21 +208,21 @@
 ### VirtualHosts ###
 ####################
 
-<VirtualHost {@IP}> 
+<VirtualHost $HOSTNAME> 
   DocumentRoot /var/www/htdocs
-  ServerName {@IP}
+  ServerName $HOSTNAME
 
   CustomLog /var/log/apache/access.log common
   ErrorLog /var/log/apache/error.log
 </VirtualHost>
 
-<VirtualHost {@IP ou HOSTNAME}:443> 
+<VirtualHost $HOSTNAME:443> 
   DocumentRoot /var/www/htdocs
-  ServerName {@IP ou HOSTNAME}
+  ServerName $HOSTNAME
 
   SSLEngine On
-  SSLCertificateFile /etc/apache/ssl/{HOSTNAME}.crt
-  SSLCertificateKeyFile /etc/apache/ssl/{HOSTNAME}.key
+  SSLCertificateFile /etc/apache/ssl/$HOSTNAME.crt
+  SSLCertificateKeyFile /etc/apache/ssl/$HOSTNAME.key
 
   CustomLog /var/log/apache/access_ssl.log commonssl
   ErrorLog /var/log/apache/error.log

/local/vservers/DS_setup_vserver-http_ssl_php.conf.patch :
----------------------------------------------------------

--- httpd.conf  Sun Aug  1 10:07:17 2004
+++ DS_setup_vserver-http_ssl_php.conf  Sun Aug  1 10:06:11 2004
@@ -1,6 +1,8 @@
 #
-# Debian-secinst v0.2.0 : ANNEXE 6 - Fichier de configuration Apache minimal
+# Debian-secinst v0.2.1 : ANNEXE 6 - Fichier de configuration Apache minimal
 # Simon Castro
+# Patche par : DS_patch_setup_vserver-http_ssl_php.conf.patch (debian-secinst v0.2.1)
+# => DS_setup_vserver-http_ssl_php.conf
 #
 
 ####################################
@@ -44,14 +46,15 @@
 LoadModule unique_id_module /usr/lib/apache/1.3/mod_unique_id.so
 LoadModule setenvif_module /usr/lib/apache/1.3/mod_setenvif.so
 LoadModule ssl_module /usr/lib/apache/1.3/mod_ssl.so
+LoadModule php4_module /usr/lib/apache/1.3/libphp4.so
 
 #
 # Configuration generale du serveur
 #
 
 Port 80
-Listen 80
-Listen 443
+Listen $IP:80
+Listen $IP:443
 
 #
 # Repertoires et permissions
@@ -84,7 +87,7 @@
 #
 
 <IfModule mod_dir.c>
-    DirectoryIndex index.html index.htm index.shtml index.cgi
+    DirectoryIndex index.html index.htm index.php index.shtml index.cgi
 </IfModule>
 
 <IfModule mod_autoindex.c>
@@ -150,6 +153,7 @@
     <IfModule mod_negotiation.c>
         LanguagePriority en da nl et fr de el it ja pl pt pt-br ltz ca es sv
     </IfModule>
+    AddType application/x-httpd-php .php .php4 .php3
     AddType application/x-tar .tgz
     AddType image/bmp .bmp
     AddType text/x-hdml .hdml
@@ -206,21 +210,21 @@
 ### VirtualHosts ###
 ####################
 
-<VirtualHost {@IP}> 
+<VirtualHost $HOSTNAME> 
   DocumentRoot /var/www/htdocs
-  ServerName {@IP}
+  ServerName $HOSTNAME
 
   CustomLog /var/log/apache/access.log common
   ErrorLog /var/log/apache/error.log
 </VirtualHost>
 
-<VirtualHost {@IP ou HOSTNAME}:443> 
+<VirtualHost $HOSTNAME:443> 
   DocumentRoot /var/www/htdocs
-  ServerName {@IP ou HOSTNAME}
+  ServerName $HOSTNAME
 
   SSLEngine On
-  SSLCertificateFile /etc/apache/ssl/{HOSTNAME}.crt
-  SSLCertificateKeyFile /etc/apache/ssl/{HOSTNAME}.key
+  SSLCertificateFile /etc/apache/ssl/$HOSTNAME.crt
+  SSLCertificateKeyFile /etc/apache/ssl/$HOSTNAME.key
 
   CustomLog /var/log/apache/access_ssl.log commonssl
   ErrorLog /var/log/apache/error.log