From: Elan Ruusamäe <glen@pld-linux.org>
Date: Tue, 4 May 2010 15:26:07 +0000 (+0000)
Subject: - merge drupal-apache1.conf back to main apache config, i don't see what is that... 
X-Git-Tag: DRUPAL_5_7
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fdrupal.git;a=commitdiff_plain;h=refs%2Ftags%2FDRUPAL_5_7

- merge drupal-apache1.conf back to main apache config, i don't see what is that different that needs extra file

Changed files:
    drupal-apache1.conf -> 1.3
    drupal.conf -> 1.20
    drupal.spec -> 1.81
---

diff --git a/drupal-apache1.conf b/drupal-apache1.conf
deleted file mode 100644
index 7a16704..0000000
--- a/drupal-apache1.conf
+++ /dev/null
@@ -1,106 +0,0 @@
-#
-# Apache/PHP/Drupal settings.
-
-# Default setup is for running drupal in vhost.
-# You can setup drupal as alias /drupal, but you need to comment/uncomment few things.
-#
-# 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 in sites/default/settings.php
-    # but the following cannot be changed at runtime.
-
-    # PHP 4, Apache 1.
-    <IfModule mod_php4.c>
-	php_value magic_quotes_gpc                0
-	php_value register_globals                0
-	php_value session.auto_start              0
-	php_value mbstring.http_input             pass
-	php_value mbstring.http_output            pass
-	php_value mbstring.encoding_translation   0
-    </IfModule>
-
-    # PHP 5, Apache 1 and 2.
-    <IfModule mod_php5.c>
-	php_value magic_quotes_gpc                0
-	php_value register_globals                0
-	php_value session.auto_start              0
-	php_value mbstring.http_input             pass
-	php_value mbstring.http_output            pass
-	php_value mbstring.encoding_translation   0
-    </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
-</Directory>
-
-# If having drupal installed as /drupal
-#<IfModule mod_alias.c>
-#    Alias /drupal/files /var/lib/drupal
-#    Alias /drupal /usr/share/drupal/htdocs
-#</IfModule>
-#
-#<Location /drupal>
-#    # Customized error messages.
-#    ErrorDocument 404 /drupal/index.php
-#</Location>
-
-<Directory /var/lib/drupal>
-    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>
-</VirtualHost>
-
-# vim: filetype=apache ts=4 sw=4 et
diff --git a/drupal.conf b/drupal.conf
index 7023d42..4384e61 100644
--- a/drupal.conf
+++ b/drupal.conf
@@ -27,6 +27,9 @@
 		php_value magic_quotes_gpc                  0
 		php_value register_globals                  0
 		php_value session.auto_start                0
+		php_value mbstring.http_input               pass
+		php_value mbstring.http_output              pass
+		php_value mbstring.encoding_translation     0
 		php_value memory_limit                      12M
 	</IfModule>
 	# php5 module under Apache 1.3
@@ -34,6 +37,9 @@
 		php_value magic_quotes_gpc                  0
 		php_value register_globals                  0
 		php_value session.auto_start                0
+		php_value mbstring.http_input               pass
+		php_value mbstring.http_output              pass
+		php_value mbstring.encoding_translation     0
 		php_value memory_limit                      12M
 	</IfModule>
 
@@ -42,6 +48,9 @@
 		php_value magic_quotes_gpc                  0
 		php_value register_globals                  0
 		php_value session.auto_start                0
+		php_value mbstring.http_input               pass
+		php_value mbstring.http_output              pass
+		php_value mbstring.encoding_translation     0
 		php_value memory_limit                      12M
 	</IfModule>
 
diff --git a/drupal.spec b/drupal.spec
index ed3ed43..153ca2d 100644
--- a/drupal.spec
+++ b/drupal.spec
@@ -12,7 +12,6 @@ Source0:	http://ftp.osuosl.org/pub/drupal/files/projects/%{name}-%{version}.tar.
 Source1:	%{name}.conf
 Source2:	%{name}.cron
 Source3:	%{name}.PLD
-Source4:	%{name}-apache1.conf
 Patch0:		%{name}-cron.patch
 Patch1:		%{name}-sitesdir.patch
 Patch2:		%{name}-topdir.patch
@@ -202,7 +201,7 @@ chmod -x $RPM_BUILD_ROOT%{_appdir}/scripts/*
 
 ln -s /var/lib/%{name} $RPM_BUILD_ROOT%{_appdir}/files
 
-install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.d/%{name}