Accepting request 340971 from server:php:applications

1

OBS-URL: https://build.opensuse.org/request/show/340971
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/roundcubemail?expand=0&rev=34
This commit is contained in:
Dominique Leuenberger 2015-10-28 16:30:25 +00:00 committed by Git OBS Bridge
commit c70d9d5c4f
3 changed files with 223 additions and 176 deletions

View File

@ -1,15 +1,15 @@
# You might want to set up a virtual host for the server, but it is
# not a requirement. You can as well reach the server under its
# common name under http://your.server.name/roundcube
# common name under https://yourroundcubeserver.example.com/
#
# NameVirtualHost *
# <VirtualHost *>
# ServerName your.server.name
# DocumentRoot /srv/www/roundcubemail
# ServerName yourroundcubeserver.example.com
# DocumentRoot __ROUNDCUBEPATH__
<IfModule mod_alias.c>
Alias /roundcube __ROUNDCUBEPATH__
#Alias /roundcube __ROUNDCUBEPATH__
Alias /roundcubemail __ROUNDCUBEPATH__
</IfModule>
@ -17,28 +17,32 @@
AddType text/x-component .htc
<Directory __ROUNDCUBEPATH__>
<IfModule mod_version.c>
<IfVersion < 2.4>
Order allow,deny
Allow from all
</IfVersion>
<IfVersion >= 2.4>
<IfModule !mod_access_compat.c>
<IfModule mod_authz_core.c>
Require all granted
</IfModule>
<IfModule mod_access_compat.c>
Order allow,deny
#Allow from 127.0.0.1
Allow from all
</IfModule>
</IfVersion>
<IfVersion < 2.4>
</IfModule>
<IfModule !mod_version.c>
Order allow,deny
#Allow from 127.0.0.1
Allow from all
</IfVersion>
</IfModule>
Options -Indexes +FollowSymLinks
<IfModule mod_php5.c>
php_flag display_errors Off
php_flag log_errors On
# php_value error_log logs/errors
#php_value error_log logs/errors
php_value upload_max_filesize 5M
php_value post_max_size 6M
@ -74,8 +78,7 @@ AddType text/x-component .htc
</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
#Header merge Cache-Control public env=!NO_CACHE
</IfModule>
<IfModule mod_expires.c>
@ -84,146 +87,183 @@ AddType text/x-component .htc
</IfModule>
FileETag MTime Size
</Directory>
# Special directories
#
# Special directories
#
<Directory __ROUNDCUBEPATH__/bin>
<IfVersion >= 2.4>
<IfModule !mod_access_compat.c>
Require all granted
</IfModule>
<IfModule mod_access_compat.c>
Order allow,deny
#Allow from 127.0.0.1
Allow from all
</IfModule>
</IfVersion>
<Directory __ROUNDCUBEPATH__/bin>
<IfModule mod_version.c>
<IfVersion < 2.4>
Order allow,deny
Order deny,allow
Deny from all
</IfVersion>
</Directory>
<IfVersion >= 2.4>
<IfModule mod_authz_core.c>
Require all denied
</IfModule>
<IfModule mod_access_compat.c>
Order deny,allow
Deny from all
</IfModule>
</IfVersion>
</IfModule>
<IfModule !mod_version.c>
Order deny,allow
Deny from all
</IfModule>
</Directory>
<Directory __ROUNDCUBEPATH__/config>
<Directory __ROUNDCUBEPATH__/config>
Options -FollowSymLinks
AllowOverride None
<IfVersion >= 2.4>
<IfModule !mod_access_compat.c>
Require all granted
</IfModule>
<IfModule mod_access_compat.c>
Order allow,deny
#Allow from 127.0.0.1
Allow from all
</IfModule>
</IfVersion>
<IfModule mod_version.c>
<IfVersion < 2.4>
Order allow,deny
Order deny,allow
Deny from all
</IfVersion>
</Directory>
<IfVersion >= 2.4>
<IfModule mod_authz_core.c>
Require all denied
</IfModule>
<IfModule mod_access_compat.c>
Order deny,allow
Deny from all
</IfModule>
</IfVersion>
</IfModule>
<IfModule !mod_version.c>
Order deny,allow
Deny from all
</IfModule>
</Directory>
<Directory __ROUNDCUBEPATH__/logs>
<Directory __ROUNDCUBEPATH__/logs>
Options -FollowSymLinks
AllowOverride None
<IfVersion >= 2.4>
<IfModule !mod_access_compat.c>
Require all granted
</IfModule>
<IfModule mod_access_compat.c>
Order allow,deny
#Allow from 127.0.0.1
Allow from all
</IfModule>
</IfVersion>
<IfModule mod_version.c>
<IfVersion < 2.4>
Order allow,deny
Order deny,allow
Deny from all
</IfVersion>
</Directory>
<IfVersion >= 2.4>
<IfModule mod_authz_core.c>
Require all denied
</IfModule>
<IfModule mod_access_compat.c>
Order deny,allow
Deny from all
</IfModule>
</IfVersion>
</IfModule>
<IfModule !mod_version.c>
Order deny,allow
Deny from all
</IfModule>
</Directory>
<Directory __ROUNDCUBEPATH__/migration>
<Directory __ROUNDCUBEPATH__/migration>
Options -FollowSymLinks
AllowOverride None
<IfVersion >= 2.4>
<IfModule !mod_access_compat.c>
Require all granted
</IfModule>
<IfModule mod_access_compat.c>
Order allow,deny
#Allow from 127.0.0.1
Allow from all
</IfModule>
</IfVersion>
<IfModule mod_version.c>
<IfVersion < 2.4>
Order allow,deny
Order deny,allow
Deny from all
</IfVersion>
</Directory>
<IfVersion >= 2.4>
<IfModule mod_authz_core.c>
Require all denied
</IfModule>
<IfModule mod_access_compat.c>
Order deny,allow
Deny from all
</IfModule>
</IfVersion>
</IfModule>
<IfModule !mod_version.c>
Order deny,allow
Deny from all
</IfModule>
</Directory>
<Directory __ROUNDCUBEPATH__/migrated>
<Directory __ROUNDCUBEPATH__/migrated>
Options -FollowSymLinks
AllowOverride None
<IfVersion >= 2.4>
<IfModule !mod_access_compat.c>
Require all granted
</IfModule>
<IfModule mod_access_compat.c>
Order allow,deny
#Allow from 127.0.0.1
Allow from all
</IfModule>
</IfVersion>
<IfModule mod_version.c>
<IfVersion < 2.4>
Order allow,deny
Order deny,allow
Deny from all
</IfVersion>
</Directory>
<Directory __ROUNDCUBEPATH__/plugins/enigma/home>
<IfVersion >= 2.4>
<IfModule !mod_access_compat.c>
Require all granted
<IfModule mod_authz_core.c>
Require all denied
</IfModule>
<IfModule mod_access_compat.c>
Order allow,deny
#Allow from 127.0.0.1
Allow from all
Order deny,allow
Deny from all
</IfModule>
</IfVersion>
</IfModule>
<IfModule !mod_version.c>
Order deny,allow
Deny from all
</IfModule>
</Directory>
<Directory __ROUNDCUBEPATH__/plugins/enigma/home>
<IfModule mod_version.c>
<IfVersion < 2.4>
Order allow,deny
Order deny,allow
Deny from all
</IfVersion>
</Directory>
<IfVersion >= 2.4>
<IfModule mod_authz_core.c>
Require all denied
</IfModule>
<IfModule mod_access_compat.c>
Order deny,allow
Deny from all
</IfModule>
</IfVersion>
</IfModule>
<IfModule !mod_version.c>
Order deny,allow
Deny from all
</IfModule>
</Directory>
<Directory __ROUNDCUBEPATH__/program>
<Directory __ROUNDCUBEPATH__/program>
<IfModule mod_rewrite.c>
RewriteEngine On
RewriteRule !^js|.*\.gif$ - [F]
</IfModule>
</Directory>
</Directory>
<Directory __ROUNDCUBEPATH__/temp>
<Directory __ROUNDCUBEPATH__/temp>
Options -FollowSymLinks
AllowOverride None
<IfVersion >= 2.4>
<IfModule !mod_access_compat.c>
Require all granted
</IfModule>
<IfModule mod_access_compat.c>
Order allow,deny
#Allow from 127.0.0.1
Allow from all
</IfModule>
</IfVersion>
<IfModule mod_version.c>
<IfVersion < 2.4>
Order allow,deny
Order deny,allow
Deny from all
</IfVersion>
</Directory>
<IfVersion >= 2.4>
<IfModule mod_authz_core.c>
Require all denied
</IfModule>
<IfModule mod_access_compat.c>
Order deny,allow
Deny from all
</IfModule>
</IfVersion>
</IfModule>
<IfModule !mod_version.c>
Order deny,allow
Deny from all
</IfModule>
</Directory>
#
# </VirtualHost>

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Oct 23 11:55:15 UTC 2015 - aj@ajaissle.de
- Changed roundcubemail-httpd.conf
- Enable mod_version.c per default [boo#938840]
-------------------------------------------------------------------
Tue Sep 15 10:27:10 UTC 2015 - aj@ajaissle.de

View File

@ -200,6 +200,7 @@ sed -i "s/rcmail-\!24ByteDESkey\*Str/`makedesstr`/" %{roundcubeconfigpath}/defau
if [ -x /usr/sbin/a2enmod ]; then
a2enmod -q alias || a2enmod alias
a2enmod -q rewrite || a2enmod rewrite
a2enmod -q version || a2enmod version
fi
# restore backed up logs, temp and config