commit 864f8de1126e536a79b68ceb733076ebb182c06d
Author: Jan Rękorajski <bagg...@pld-linux.org>
Date: Fri May 17 11:28:13 2013 +0200
- migrated to apache 2.4
httpd.conf | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
roundcubemail.spec | 10 +++++----
2 files changed, 72 insertions(+), 4 deletions(-)
---
diff --git a/roundcubemail.spec b/roundcubemail.spec
index 1cf0a3c..265ca93 100644
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -16,7 +16,7 @@ Summary: RoundCube Webmail
Summary(pl.UTF-8): RoundCube Webmail - poczta przez WWW
Name: roundcubemail
Version: 0.8.6
-Release: 1
+Release: 2
License: GPL v3+
Group: Applications/Mail
Source0:
http://downloads.sourceforge.net/roundcubemail/%{name}-%{version}-dep.tar.gz
@@ -27,6 +27,7 @@ Source3: lighttpd.conf
Source4:
http://nejc.skoberne.net/wp-content/uploads/2008/11/rcpfa-105.tgz
# Source4-md5: dc23bcd894f693db74fce53b09ab58d6
Source5: find-lang.sh
+Source6: httpd.conf
Patch0: %{name}-config.patch
Patch1: %{name}-spam.patch
Patch2: %{name}-postfixadmin-pl_locales.patch
@@ -78,6 +79,7 @@ Suggests: php-pear-Net_Socket
Suggests: php-xml
Obsoletes: roundcube-plugin-jqueryui
Obsoletes: roundcubemail-skin-default
+Conflicts: apache-base < 2.4.0-1
Conflicts: logrotate < 3.8.0
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -252,7 +254,7 @@ ln -sf %{_sysconfdir}/db.inc.php
$RPM_BUILD_ROOT%{_appdir}/config/db.inc.php
ln -sf %{_sysconfdir}/main.inc.php
$RPM_BUILD_ROOT%{_appdir}/config/main.inc.php
cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+cp -p %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
@@ -336,10 +338,10 @@ EOF
%triggerun -- apache1 < 1.3.37-3, apache1-base
%webapp_unregister apache %{_webapp}
-%triggerin -- apache < 2.2.0, apache-base
+%triggerin -- apache-base
%webapp_register httpd %{_webapp}
-%triggerun -- apache < 2.2.0, apache-base
+%triggerun -- apache-base
%webapp_unregister httpd %{_webapp}
%triggerin -- lighttpd
diff --git a/httpd.conf b/httpd.conf
new file mode 100644
index 0000000..b37a15f
--- /dev/null
+++ b/httpd.conf
@@ -0,0 +1,66 @@
+Alias /roundcube /usr/share/roundcube
+<Directory /usr/share/roundcube>
+ AddDefaultCharset UTF-8
+ php_admin_value open_basedir
"/usr/share/roundcube:/usr/share/pear:/usr/share/php:/usr/share/misc:/var/lib/roundcube:/var/log/roundcube:/etc/webapps/roundcube:/etc/mail:/tmp"
+
+ <FilesMatch "(\.inc|\~)$|^_">
+ Require all denied
+ </FilesMatch>
+
+ Require all granted
+
+ php_flag display_errors Off
+ php_flag log_errors On
+ # php_value error_log logs/errors
+
+ php_value upload_max_filesize 5M
+ php_value post_max_size 6M
+ php_value memory_limit 64M
+
+ php_flag zlib.output_compression Off
+ php_flag magic_quotes_gpc Off
+ php_flag magic_quotes_runtime Off
+ php_flag zend.ze1_compatibility_mode Off
+ php_flag suhosin.session.encrypt Off
+
+ #php_value session.cookie_path /
+ php_flag session.auto_start Off
+ php_value session.gc_maxlifetime 21600
+ php_value session.gc_divisor 500
+ php_value session.gc_probability 1
+
+ # http://bugs.php.net/bug.php?id=30766
+ php_value mbstring.func_overload 0
+
+ <IfModule mod_rewrite.c>
+ RewriteEngine On
+ RewriteRule ^favicon.ico$ skins/default/images/favicon.ico
+ # security rules
+ RewriteRule .svn/ - [F]
+ RewriteRule ^README|INSTALL|LICENSE|SQL|bin|CHANGELOG$ - [F]
+ </IfModule>
+
+ <IfModule mod_deflate.c>
+ SetOutputFilter DEFLATE
+ </IfModule>
+
+ <IfModule mod_headers.c>
+ # replace 'append' with 'merge' for Apache version 2.2.9 and later
+ #Header append Cache-Control public env=!NO_CACHE
+ </IfModule>
+
+ <IfModule mod_expires.c>
+ ExpiresActive On
+ ExpiresDefault "access plus 1 month"
+ </IfModule>
+
+ FileETag MTime Size
+
+ <IfModule mod_autoindex.c>
+ Options -Indexes
+ </ifModule>
+</Directory>
+
+<Directory /usr/share/roundcube/config>
+ Require all denied
+</Directory>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/roundcubemail.git/commitdiff/864f8de1126e536a79b68ceb733076ebb182c06d
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
