- Replace mixed indentation with predominant style.
OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=492
This commit is contained in:
Git OBS Bridge
parent
ba9ffadce9
commit
259521aeb2
@ -28,7 +28,7 @@ DocumentRoot "/srv/www/htdocs"
|
||||
AllowOverride None
|
||||
# Controls who can get stuff from this server.
|
||||
<IfModule !mod_access_compat.c>
|
||||
Require all granted
|
||||
Require all granted
|
||||
</IfModule>
|
||||
<IfModule mod_access_compat.c>
|
||||
Order allow,deny
|
||||
|
||||
@ -20,13 +20,13 @@ Listen 80
|
||||
|
||||
|
||||
<IfDefine SSL>
|
||||
<IfDefine !NOSSL>
|
||||
<IfDefine !NOSSL>
|
||||
<IfModule mod_ssl.c>
|
||||
|
||||
Listen 443
|
||||
Listen 443
|
||||
|
||||
</IfModule>
|
||||
</IfDefine>
|
||||
</IfDefine>
|
||||
</IfDefine>
|
||||
|
||||
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
# see http://httpd.apache.org/docs/2.4/mod/mod_info.html
|
||||
#
|
||||
<IfModule mod_info.c>
|
||||
<Location /server-info>
|
||||
SetHandler server-info
|
||||
<IfModule !mod_access_compat.c>
|
||||
Require local
|
||||
</IfModule>
|
||||
<IfModule mod_access_compat.c>
|
||||
Order deny,allow
|
||||
Deny from all
|
||||
Allow from localhost
|
||||
</IfModule>
|
||||
</Location>
|
||||
<Location /server-info>
|
||||
SetHandler server-info
|
||||
<IfModule !mod_access_compat.c>
|
||||
Require local
|
||||
</IfModule>
|
||||
<IfModule mod_access_compat.c>
|
||||
Order deny,allow
|
||||
Deny from all
|
||||
Allow from localhost
|
||||
</IfModule>
|
||||
</Location>
|
||||
</IfModule>
|
||||
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
# see http://httpd.apache.org/docs/2.4/mod/mod_status.html
|
||||
#
|
||||
<IfModule mod_status.c>
|
||||
<Location /server-status>
|
||||
SetHandler server-status
|
||||
<IfModule !mod_access_compat.c>
|
||||
Require local
|
||||
</IfModule>
|
||||
<IfModule mod_access_compat.c>
|
||||
Order deny,allow
|
||||
Deny from all
|
||||
Allow from localhost
|
||||
</IfModule>
|
||||
</Location>
|
||||
<Location /server-status>
|
||||
SetHandler server-status
|
||||
<IfModule !mod_access_compat.c>
|
||||
Require local
|
||||
</IfModule>
|
||||
<IfModule mod_access_compat.c>
|
||||
Order deny,allow
|
||||
Deny from all
|
||||
Allow from localhost
|
||||
</IfModule>
|
||||
</Location>
|
||||
</IfModule>
|
||||
|
||||
|
||||
@ -58,15 +58,15 @@
|
||||
# CGI directory exists, if you have one, and where ScriptAlias points to.
|
||||
#
|
||||
<Directory "/srv/www/vhosts/dummy-host.example.com/cgi-bin">
|
||||
AllowOverride None
|
||||
Options +ExecCGI -Includes
|
||||
AllowOverride None
|
||||
Options +ExecCGI -Includes
|
||||
<IfModule !mod_access_compat.c>
|
||||
Require all granted
|
||||
Require all granted
|
||||
</IfModule>
|
||||
<IfModule mod_access_compat.c>
|
||||
Order allow,deny
|
||||
Allow from all
|
||||
</IfModule>
|
||||
Order allow,deny
|
||||
Allow from all
|
||||
</IfModule>
|
||||
</Directory>
|
||||
|
||||
|
||||
@ -77,18 +77,18 @@
|
||||
# in /etc/sysconfig/apache2.
|
||||
#
|
||||
<IfModule mod_userdir.c>
|
||||
# Note that the name of the user directory ("public_html") cannot simply be
|
||||
# changed here, since it is a compile time setting. The apache package
|
||||
# would have to be rebuilt. You could work around by deleting
|
||||
# /usr/sbin/suexec, but then all scripts from the directories would be
|
||||
# executed with the UID of the webserver.
|
||||
UserDir public_html
|
||||
# The actual configuration of the directory is in
|
||||
# /etc/apache2/mod_userdir.conf.
|
||||
Include /etc/apache2/mod_userdir.conf
|
||||
# You can, however, change the ~ if you find it awkward, by mapping e.g.
|
||||
# http://www.example.com/users/karl-heinz/ --> /home/karl-heinz/public_html/
|
||||
#AliasMatch ^/users/([a-zA-Z0-9-_.]*)/?(.*) /home/$1/public_html/$2
|
||||
# Note that the name of the user directory ("public_html") cannot simply be
|
||||
# changed here, since it is a compile time setting. The apache package
|
||||
# would have to be rebuilt. You could work around by deleting
|
||||
# /usr/sbin/suexec, but then all scripts from the directories would be
|
||||
# executed with the UID of the webserver.
|
||||
UserDir public_html
|
||||
# The actual configuration of the directory is in
|
||||
# /etc/apache2/mod_userdir.conf.
|
||||
Include /etc/apache2/mod_userdir.conf
|
||||
# You can, however, change the ~ if you find it awkward, by mapping e.g.
|
||||
# http://www.example.com/users/karl-heinz/ --> /home/karl-heinz/public_html/
|
||||
#AliasMatch ^/users/([a-zA-Z0-9-_.]*)/?(.*) /home/$1/public_html/$2
|
||||
</IfModule>
|
||||
|
||||
|
||||
@ -96,39 +96,39 @@
|
||||
# This should be changed to whatever you set DocumentRoot to.
|
||||
#
|
||||
<Directory "/srv/www/vhosts/dummy-host.example.com">
|
||||
|
||||
#
|
||||
# Possible values for the Options directive are "None", "All",
|
||||
# or any combination of:
|
||||
# Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews
|
||||
#
|
||||
# Note that "MultiViews" must be named *explicitly* --- "Options All"
|
||||
# doesn't give it to you.
|
||||
#
|
||||
# The Options directive is both complicated and important. Please see
|
||||
# http://httpd.apache.org/docs/2.4/mod/core.html#options
|
||||
# for more information.
|
||||
#
|
||||
Options Indexes FollowSymLinks
|
||||
|
||||
#
|
||||
# AllowOverride controls what directives may be placed in .htaccess files.
|
||||
# It can be "All", "None", or any combination of the keywords:
|
||||
# Options FileInfo AuthConfig Limit
|
||||
#
|
||||
AllowOverride None
|
||||
|
||||
#
|
||||
# Controls who can get stuff from this server.
|
||||
#
|
||||
<IfModule !mod_access_compat.c>
|
||||
Require all granted
|
||||
</IfModule>
|
||||
<IfModule mod_access_compat.c>
|
||||
Order allow,deny
|
||||
Allow from all
|
||||
</IfModule>
|
||||
|
||||
|
||||
#
|
||||
# Possible values for the Options directive are "None", "All",
|
||||
# or any combination of:
|
||||
# Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews
|
||||
#
|
||||
# Note that "MultiViews" must be named *explicitly* --- "Options All"
|
||||
# doesn't give it to you.
|
||||
#
|
||||
# The Options directive is both complicated and important. Please see
|
||||
# http://httpd.apache.org/docs/2.4/mod/core.html#options
|
||||
# for more information.
|
||||
#
|
||||
Options Indexes FollowSymLinks
|
||||
|
||||
#
|
||||
# AllowOverride controls what directives may be placed in .htaccess files.
|
||||
# It can be "All", "None", or any combination of the keywords:
|
||||
# Options FileInfo AuthConfig Limit
|
||||
#
|
||||
AllowOverride None
|
||||
|
||||
#
|
||||
# Controls who can get stuff from this server.
|
||||
#
|
||||
<IfModule !mod_access_compat.c>
|
||||
Require all granted
|
||||
</IfModule>
|
||||
<IfModule mod_access_compat.c>
|
||||
Order allow,deny
|
||||
Allow from all
|
||||
</IfModule>
|
||||
|
||||
</Directory>
|
||||
|
||||
</VirtualHost>
|
||||
|
||||
@ -4,6 +4,11 @@ Fri Dec 9 12:21:27 UTC 2016 - pgajdos@suse.com
|
||||
- fix build with new systemd
|
||||
+ amended httpd-2.4.3-mod_systemd.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Dec 2 20:53:50 UTC 2016 - jimmy@boombatower.com
|
||||
|
||||
- Replace mixed indentation with predominant style.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 13 06:39:50 UTC 2016 - pgajdos@suse.com
|
||||
|
||||
|
||||
@ -323,8 +323,8 @@ case "$action" in
|
||||
## give out the argument which is required for a reload.
|
||||
|
||||
for i in $httpd_conf \
|
||||
$APACHE_CONF_INCLUDE_FILES \
|
||||
$APACHE_CONF_INCLUDE_DIRS
|
||||
$APACHE_CONF_INCLUDE_FILES \
|
||||
$APACHE_CONF_INCLUDE_DIRS
|
||||
do
|
||||
if [ $i -nt $pidfile ]; then
|
||||
echo reload
|
||||
@ -344,8 +344,8 @@ case "$action" in
|
||||
cmdline=$(echo $apache_bin -f $httpd_conf $server_flags "$@")
|
||||
out=$(su - nobody -c "$cmdline" 2>&1)
|
||||
case $out in
|
||||
*make_sock:\ could\ not\ bind\ to\ address*) echo Syntax: OK; rc_failed=0;;
|
||||
*) echo Syntax: NOT OK:; echo $out; rc_failed=1;;
|
||||
*make_sock:\ could\ not\ bind\ to\ address*) echo Syntax: OK; rc_failed=0;;
|
||||
*) echo Syntax: NOT OK:; echo $out; rc_failed=1;;
|
||||
esac
|
||||
rc_exit
|
||||
;;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user