Author: glen Date: Tue May 4 15:20:04 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- tabs
---- Files affected:
packages/drupal:
drupal.conf (1.16 -> 1.17)
---- Diffs:
================================================================
Index: packages/drupal/drupal.conf
diff -u packages/drupal/drupal.conf:1.16 packages/drupal/drupal.conf:1.17
--- packages/drupal/drupal.conf:1.16 Tue May 4 17:13:55 2010
+++ packages/drupal/drupal.conf Tue May 4 17:19:59 2010
@@ -7,103 +7,103 @@
# Please note that drupal-ID's don't work in subdirs, you need vhost for that.
<Directory /usr/share/drupal/htdocs>
- Options FollowSymLinks
- AllowOverride None
- <IfModule mod_access.c>
- order allow,deny
- allow from all
- </IfModule>
-
- # Set the default handler.
- <IfModule mod_dir.c>
- DirectoryIndex index.php
- </IfModule>
-
- # Override PHP settings. More exist in sites/default/settings.php, but
- # the following cannot be changed at runtime. The first IfModule is
- # for Apache 1.3, the second for Apache 2.
- # php4 module under Apache 1.3
- <IfModule mod_php4.c>
- php_value magic_quotes_gpc 0
- php_value register_globals 0
- php_value session.auto_start 0
- php_value memory_limit 12M
- </IfModule>
- # php5 module under Apache 1.3
- <IfModule mod_php5.c>
- php_value magic_quotes_gpc 0
- php_value register_globals 0
- php_value session.auto_start 0
- php_value memory_limit 12M
- </IfModule>
-
- # php under Apache 2.x module
- <IfModule sapi_apache2.c>
- php_value magic_quotes_gpc 0
- php_value register_globals 0
- php_value session.auto_start 0
- php_value memory_limit 12M
- </IfModule>
-
- # Reduce the time dynamically generated pages are cache-able.
- <IfModule mod_expires.c>
- ExpiresByType text/html A1
- </IfModule>
-
- # Various rewrite rules.
- <IfModule mod_rewrite.c>
- RewriteEngine on
-
- # Modify the RewriteBase if you are using Drupal in a subdirectory and
- # the rewrite rules are not working properly.
- # Enable RewriteBase if you have drupal configured in virtualhost root.
- #RewriteBase /drupal
-
- # Rewrite old-style URLs of the form 'node.php?id=x'.
- #RewriteCond %{REQUEST_FILENAME} !-f
- #RewriteCond %{REQUEST_FILENAME} !-d
- #RewriteCond %{QUERY_STRING} ^id=([^&]+)$
- #RewriteRule node.php index.php?q=node/view/%1 [L]
-
- # Rewrite old-style URLs of the form 'module.php?mod=x'.
- #RewriteCond %{REQUEST_FILENAME} !-f
- #RewriteCond %{REQUEST_FILENAME} !-d
- #RewriteCond %{QUERY_STRING} ^mod=([^&]+)$
- #RewriteRule module.php index.php?q=%1 [L]
-
- # Rewrite current-style URLs of the form 'index.php?q=x'.
- RewriteCond %{REQUEST_FILENAME} !-f
- RewriteCond %{REQUEST_FILENAME} !-d
- RewriteRule ^(.*)$ index.php?q=$1 [L,QSA]
- </IfModule>
+ Options FollowSymLinks
+ AllowOverride None
+ <IfModule mod_access.c>
+ order allow,deny
+ allow from all
+ </IfModule>
+
+ # Set the default handler.
+ <IfModule mod_dir.c>
+ DirectoryIndex index.php
+ </IfModule>
+
+ # Override PHP settings. More exist in sites/default/settings.php, but
+ # the following cannot be changed at runtime. The first IfModule is
+ # for Apache 1.3, the second for Apache 2.
+ # php4 module under Apache 1.3
+ <IfModule mod_php4.c>
+ php_value magic_quotes_gpc 0
+ php_value register_globals 0
+ php_value session.auto_start 0
+ php_value memory_limit 12M
+ </IfModule>
+ # php5 module under Apache 1.3
+ <IfModule mod_php5.c>
+ php_value magic_quotes_gpc 0
+ php_value register_globals 0
+ php_value session.auto_start 0
+ php_value memory_limit 12M
+ </IfModule>
+
+ # php under Apache 2.x module
+ <IfModule sapi_apache2.c>
+ php_value magic_quotes_gpc 0
+ php_value register_globals 0
+ php_value session.auto_start 0
+ php_value memory_limit 12M
+ </IfModule>
+
+ # Reduce the time dynamically generated pages are cache-able.
+ <IfModule mod_expires.c>
+ ExpiresByType text/html A1
+ </IfModule>
+
+ # Various rewrite rules.
+ <IfModule mod_rewrite.c>
+ RewriteEngine on
+
+ # Modify the RewriteBase if you are using Drupal in a
subdirectory and
+ # the rewrite rules are not working properly.
+ # Enable RewriteBase if you have drupal configured in
virtualhost root.
+ #RewriteBase /drupal
+
+ # Rewrite old-style URLs of the form 'node.php?id=x'.
+ #RewriteCond %{REQUEST_FILENAME} !-f
+ #RewriteCond %{REQUEST_FILENAME} !-d
+ #RewriteCond %{QUERY_STRING} ^id=([^&]+)$
+ #RewriteRule node.php index.php?q=node/view/%1 [L]
+
+ # Rewrite old-style URLs of the form 'module.php?mod=x'.
+ #RewriteCond %{REQUEST_FILENAME} !-f
+ #RewriteCond %{REQUEST_FILENAME} !-d
+ #RewriteCond %{QUERY_STRING} ^mod=([^&]+)$
+ #RewriteRule module.php index.php?q=%1 [L]
+
+ # Rewrite current-style URLs of the form 'index.php?q=x'.
+ RewriteCond %{REQUEST_FILENAME} !-f
+ RewriteCond %{REQUEST_FILENAME} !-d
+ RewriteRule ^(.*)$ index.php?q=$1 [L,QSA]
+ </IfModule>
- # Customized error messages.
- ErrorDocument 404 /index.php
+ # Customized error messages.
+ ErrorDocument 404 /index.php
</Directory>
# If having drupal installed as /drupal
#<IfModule mod_alias.c>
-# Alias /drupal/files /var/lib/drupal
-# Alias /drupal /usr/share/drupal/htdocs
+# Alias /drupal/files /var/lib/drupal
+# Alias /drupal /usr/share/drupal/htdocs
#</IfModule>
#
#<Location /drupal>
-# # Customized error messages.
-# ErrorDocument 404 /drupal/index.php
+# # Customized error messages.
+# ErrorDocument 404 /drupal/index.php
#</Location>
<Directory /var/lib/drupal>
- allow from all
+ Allow from all
</Directory>
<VirtualHost *:80>
- ServerName drupal
- ServerAlias www.drupal
- DocumentRoot /usr/share/drupal/htdocs
-
- <IfModule mod_alias.c>
- Alias /files /var/lib/drupal
- </IfModule>
+ ServerName drupal
+ ServerAlias www.drupal
+ DocumentRoot /usr/share/drupal/htdocs
+
+ <IfModule mod_alias.c>
+ Alias /files /var/lib/drupal
+ </IfModule>
</VirtualHost>
-# vim: filetype=apache ts=4 sw=4 et
+# vim:ft=apache
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/drupal/drupal.conf?r1=1.16&r2=1.17&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
