From b873b07a51779e2cc3926c27b7f8659d66cff27e Mon Sep 17 00:00:00 2001 From: Michael RICOIS Date: Tue, 18 Aug 2009 10:20:39 +0000 Subject: [PATCH] =?UTF-8?q?Merge=20des=20d=C3=A9finitions=20des=20vhosts?= =?UTF-8?q?=20pour=20les=20serveurs=20depuis=20la=20branche=201.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/local/README | 48 ++++++++++++++++++++-------------- config/ns359466.ovh.net/README | 29 ++++++++++++-------- config/sd-13408/README | 29 ++++++++++++-------- config/sdsrvdev01/.htaccess | 14 +--------- config/sdsrvdev01/README | 41 ++++++++++++++++------------- 5 files changed, 88 insertions(+), 73 deletions(-) diff --git a/config/local/README b/config/local/README index 02a199b54..69d18b66e 100644 --- a/config/local/README +++ b/config/local/README @@ -10,34 +10,42 @@ P.S : Modifier les chemins de stockage de fichier dans le vhost et dans le confi Configuration vhost =================== +# EXTRANET TRUNK ServerAdmin webmaster@extranet.devlocal.com ServerName extranet.devlocal.com AddDefaultCharset iso-8859-1 - DocumentRoot "D:/www/extranet/www" - + DocumentRoot "D:/www/extranet/www" + + Options Indexes FollowSymLinks AllowOverride All Order allow,deny - Allow from all - + Allow from all + - php_value auto_prepend_file "D:/www/extranet/config/prepend.php" - php_value auto_append_file "D:/home/www/extranet/config/append.php" + php_value auto_prepend_file "D:/www/extranet/config/prepend.php" + php_value auto_append_file "D:/www/extranet/config/append.php" - + - RewriteEngine On - RewriteBase / - RewriteCond %{REQUEST_FILENAME} !-f - RewriteCond %{REQUEST_FILENAME} !-d - RewriteCond %{REQUEST_URI} !=/favicon.ico - RewriteRule ^imgcache/(.*)$ ./image.php?q=$1 [L,NC] - RewriteRule ^pdf/(.*)$ ./datafile.php?type=pdf&q=$1 [L,NC] - RewriteRule ^logos/(.*)$ ./datafile.php?type=logos&q=$1 [L,NC] + RewriteEngine On + RewriteBase / + RewriteCond %{REQUEST_FILENAME} !-f + RewriteCond %{REQUEST_FILENAME} !-d + RewriteCond %{REQUEST_URI} !=/favicon.ico + RewriteRule ^imgcache/(.*)$ ./image.php?q=$1 [L,NC] + RewriteRule ^pdf/(.*)$ ./datafile.php?type=pdf&q=$1 [L,NC] + RewriteRule ^logos/(.*)$ ./datafile.php?type=logos&q=$1 [L,NC] - - + + + + + RewriteEngine on + RewriteRule ^([a-z]=.*) index.php?$1 [L,NE] + + AllowOverride none @@ -45,11 +53,11 @@ Configuration vhost Allow from all - + RewriteLog "logs/extranet.devlocal.com-rewrite.log" #RewriteLogLevel 3 - - + + # Possible values include: debug, info, notice, warn, error, crit, alert, emerg. LogLevel debug ErrorLog "logs/extranet.devlocal.com-error.log" diff --git a/config/ns359466.ovh.net/README b/config/ns359466.ovh.net/README index 14f4e53c5..ba4940fe2 100644 --- a/config/ns359466.ovh.net/README +++ b/config/ns359466.ovh.net/README @@ -9,6 +9,7 @@ Configuration vhost ServerAlias extranet3.scores-decisions.com DocumentRoot /home/www/extranet/www + Options FollowSymLinks AllowOverride None @@ -21,23 +22,29 @@ Configuration vhost Allow from all - php_value auto_prepend_file "/home/www/extranet/config/prepend.php" - php_value auto_append_file "/home/www/extranet/config/append.php" + php_value auto_prepend_file "/home/www/extranet/config/prepend.php" + php_value auto_append_file "/home/www/extranet/config/append.php" - RewriteEngine On - RewriteBase / - RewriteCond %{REQUEST_FILENAME} !-f - RewriteCond %{REQUEST_FILENAME} !-d - RewriteCond %{REQUEST_URI} !=/favicon.ico - RewriteRule ^imgcache/(.*)$ ./image.php?q=$1 [L,NC] - RewriteRule ^pdf/(.*)$ ./datafile.php?type=pdf&q=$1 [L,NC] - RewriteRule ^logos/(.*)$ ./datafile.php?type=logos&q=$1 [L,NC] + RewriteEngine On + RewriteBase / + RewriteCond %{REQUEST_FILENAME} !-f + RewriteCond %{REQUEST_FILENAME} !-d + RewriteCond %{REQUEST_URI} !=/favicon.ico + RewriteRule ^imgcache/(.*)$ ./image.php?q=$1 [L,NC] + RewriteRule ^pdf/(.*)$ ./datafile.php?type=pdf&q=$1 [L,NC] + RewriteRule ^logos/(.*)$ ./datafile.php?type=logos&q=$1 [L,NC] - + + + RewriteEngine on + RewriteRule ^([a-z]=.*) index.php?$1 [L,NE] + + + AllowOverride none Order allow,deny diff --git a/config/sd-13408/README b/config/sd-13408/README index 457e0ca8b..feb8cb966 100644 --- a/config/sd-13408/README +++ b/config/sd-13408/README @@ -9,6 +9,7 @@ Configuration vhost ServerAlias extranet2.scores-decisions.com DocumentRoot /var/www/extranet/www + Options FollowSymLinks AllowOverride None @@ -21,23 +22,29 @@ Configuration vhost Allow from all - php_value auto_prepend_file "/var/www/extranet/config/prepend.php" - php_value auto_append_file "/var/www/extranet/config/append.php" + php_value auto_prepend_file "/var/www/extranet/config/prepend.php" + php_value auto_append_file "/var/www/extranet/config/append.php" - RewriteEngine On - RewriteBase / - RewriteCond %{REQUEST_FILENAME} !-f - RewriteCond %{REQUEST_FILENAME} !-d - RewriteCond %{REQUEST_URI} !=/favicon.ico - RewriteRule ^imgcache/(.*)$ ./image.php?q=$1 [L,NC] - RewriteRule ^pdf/(.*)$ ./datafile.php?type=pdf&q=$1 [L,NC] - RewriteRule ^logos/(.*)$ ./datafile.php?type=logos&q=$1 [L,NC] + RewriteEngine On + RewriteBase / + RewriteCond %{REQUEST_FILENAME} !-f + RewriteCond %{REQUEST_FILENAME} !-d + RewriteCond %{REQUEST_URI} !=/favicon.ico + RewriteRule ^imgcache/(.*)$ ./image.php?q=$1 [L,NC] + RewriteRule ^pdf/(.*)$ ./datafile.php?type=pdf&q=$1 [L,NC] + RewriteRule ^logos/(.*)$ ./datafile.php?type=logos&q=$1 [L,NC] - + + + RewriteEngine on + RewriteRule ^([a-z]=.*) index.php?$1 [L,NE] + + + AllowOverride none Order allow,deny diff --git a/config/sdsrvdev01/.htaccess b/config/sdsrvdev01/.htaccess index e08a6bd8f..f726bf7b4 100644 --- a/config/sdsrvdev01/.htaccess +++ b/config/sdsrvdev01/.htaccess @@ -1,13 +1 @@ -php_value auto_prepend_file "/sites/extranet/config/prepend.php" -php_value auto_append_file "/sites/extranet/config/append.php" - - - RewriteEngine On - RewriteBase / - RewriteCond %{REQUEST_FILENAME} !-f - RewriteCond %{REQUEST_FILENAME} !-d - RewriteCond %{REQUEST_URI} !=/favicon.ico - RewriteRule ^imgcache/(.*)$ ./image.php?q=$1 [L,NC] - RewriteRule ^pdf/(.*)$ ./datafile.php?type=pdf&q=$1 [L,NC] - RewriteRule ^logos/(.*)$ ./datafile.php?type=logos&q=$1 [L,NC] - \ No newline at end of file +# Ce fichier ne sert qu'a tester les directives \ No newline at end of file diff --git a/config/sdsrvdev01/README b/config/sdsrvdev01/README index fe8b330b4..be43077aa 100644 --- a/config/sdsrvdev01/README +++ b/config/sdsrvdev01/README @@ -23,38 +23,43 @@ Configuration vhost Allow from all - php_value auto_prepend_file "/sites/extranet/config/prepend.php" - php_value auto_append_file "/sites/extranet/config/append.php" + php_value auto_prepend_file "/sites/extranet/config/prepend.php" + php_value auto_append_file "/sites/extranet/config/append.php" - RewriteEngine On - RewriteBase / - RewriteCond %{REQUEST_FILENAME} !-f - RewriteCond %{REQUEST_FILENAME} !-d - RewriteCond %{REQUEST_URI} !=/favicon.ico - RewriteRule ^imgcache/(.*)$ ./image.php?q=$1 [L,NC] - RewriteRule ^pdf/(.*)$ ./datafile.php?type=pdf&q=$1 [L,NC] - RewriteRule ^logos/(.*)$ ./datafile.php?type=logos&q=$1 [L,NC] + RewriteEngine On + RewriteBase / + RewriteCond %{REQUEST_FILENAME} !-f + RewriteCond %{REQUEST_FILENAME} !-d + RewriteCond %{REQUEST_URI} !=/favicon.ico + RewriteRule ^imgcache/(.*)$ ./image.php?q=$1 [L,NC] + RewriteRule ^pdf/(.*)$ ./datafile.php?type=pdf&q=$1 [L,NC] + RewriteRule ^logos/(.*)$ ./datafile.php?type=logos&q=$1 [L,NC] - - + + + + RewriteEngine on + RewriteRule ^([a-z]=.*) index.php?$1 [L,NE] + + + AllowOverride none Order allow,deny Allow from all - - RewriteLog /var/log/apache2/extranet-rewrite.log - RewriteLogLevel 3 - + # + # RewriteLog /var/log/apache2/extranet-rewrite.log + # RewriteLogLevel 3 + # # Possible values include: debug, info, notice, warn, error, crit, alert, emerg. LogLevel debug ErrorLog /var/log/apache2/extranet-error.log CustomLog /var/log/apache2/extranet-access.log combined - - + \ No newline at end of file