rpm/apache2
SHA256
1
0
Fork 0
forked from pool/apache2
Code Pull Requests Activity

- Replace mixed indentation with predominant style.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=492
This commit is contained in:
Petr Gajdos 2016-12-12 10:46:13 +00:00 committed by Git OBS Bridge
parent ba9ffadce9
commit 259521aeb2
7 changed files with 86 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apache2-default-server.conf
View File

@ -28,7 +28,7 @@ DocumentRoot "/srv/www/htdocs"
AllowOverride None AllowOverride None
# Controls who can get stuff from this server. # Controls who can get stuff from this server.
<IfModule !mod_access_compat.c> <IfModule !mod_access_compat.c>
Require all granted Require all granted
</IfModule> </IfModule>
<IfModule mod_access_compat.c> <IfModule mod_access_compat.c>
Order allow,deny Order allow,deny

6
apache2-listen.conf
View File

@ -20,13 +20,13 @@ Listen 80
<IfDefine SSL> <IfDefine SSL>
<IfDefine !NOSSL> <IfDefine !NOSSL>
<IfModule mod_ssl.c> <IfModule mod_ssl.c>
Listen 443 Listen 443
</IfModule> </IfModule>
</IfDefine> </IfDefine>
</IfDefine> </IfDefine>

22
apache2-mod_info.conf
View File

@ -5,16 +5,16 @@
# see http://httpd.apache.org/docs/2.4/mod/mod_info.html # see http://httpd.apache.org/docs/2.4/mod/mod_info.html
# #
<IfModule mod_info.c> <IfModule mod_info.c>
<Location /server-info> <Location /server-info>
SetHandler server-info SetHandler server-info
<IfModule !mod_access_compat.c> <IfModule !mod_access_compat.c>
Require local Require local
</IfModule> </IfModule>
<IfModule mod_access_compat.c> <IfModule mod_access_compat.c>
Order deny,allow Order deny,allow
Deny from all Deny from all
Allow from localhost Allow from localhost
</IfModule> </IfModule>
</Location> </Location>
</IfModule> </IfModule>

22
apache2-mod_status.conf
View File

@ -5,16 +5,16 @@
# see http://httpd.apache.org/docs/2.4/mod/mod_status.html # see http://httpd.apache.org/docs/2.4/mod/mod_status.html
# #
<IfModule mod_status.c> <IfModule mod_status.c>
<Location /server-status> <Location /server-status>
SetHandler server-status SetHandler server-status
<IfModule !mod_access_compat.c> <IfModule !mod_access_compat.c>
Require local Require local
</IfModule> </IfModule>
<IfModule mod_access_compat.c> <IfModule mod_access_compat.c>
Order deny,allow Order deny,allow
Deny from all Deny from all
Allow from localhost Allow from localhost
</IfModule> </IfModule>
</Location> </Location>
</IfModule> </IfModule>

102
apache2-vhost.template
View File

@ -58,15 +58,15 @@
# CGI directory exists, if you have one, and where ScriptAlias points to. # CGI directory exists, if you have one, and where ScriptAlias points to.
# #
<Directory "/srv/www/vhosts/dummy-host.example.com/cgi-bin"> <Directory "/srv/www/vhosts/dummy-host.example.com/cgi-bin">
AllowOverride None AllowOverride None
Options +ExecCGI -Includes Options +ExecCGI -Includes
<IfModule !mod_access_compat.c> <IfModule !mod_access_compat.c>
Require all granted Require all granted
</IfModule> </IfModule>
<IfModule mod_access_compat.c> <IfModule mod_access_compat.c>
Order allow,deny Order allow,deny
Allow from all Allow from all
</IfModule> </IfModule>
</Directory> </Directory>
@ -77,18 +77,18 @@
# in /etc/sysconfig/apache2. # in /etc/sysconfig/apache2.
# #
<IfModule mod_userdir.c> <IfModule mod_userdir.c>
# Note that the name of the user directory ("public_html") cannot simply be # 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 # changed here, since it is a compile time setting. The apache package
# would have to be rebuilt. You could work around by deleting # would have to be rebuilt. You could work around by deleting
# /usr/sbin/suexec, but then all scripts from the directories would be # /usr/sbin/suexec, but then all scripts from the directories would be
# executed with the UID of the webserver. # executed with the UID of the webserver.
UserDir public_html UserDir public_html
# The actual configuration of the directory is in # The actual configuration of the directory is in
# /etc/apache2/mod_userdir.conf. # /etc/apache2/mod_userdir.conf.
Include /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. # 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/ # http://www.example.com/users/karl-heinz/ --> /home/karl-heinz/public_html/
#AliasMatch ^/users/([a-zA-Z0-9-_.]*)/?(.*) /home/$1/public_html/$2 #AliasMatch ^/users/([a-zA-Z0-9-_.]*)/?(.*) /home/$1/public_html/$2
</IfModule> </IfModule>
@ -96,39 +96,39 @@
# This should be changed to whatever you set DocumentRoot to. # This should be changed to whatever you set DocumentRoot to.
# #
<Directory "/srv/www/vhosts/dummy-host.example.com"> <Directory "/srv/www/vhosts/dummy-host.example.com">
# #
# Possible values for the Options directive are "None", "All", # Possible values for the Options directive are "None", "All",
# or any combination of: # or any combination of:
# Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews # Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews
# #
# Note that "MultiViews" must be named *explicitly* --- "Options All" # Note that "MultiViews" must be named *explicitly* --- "Options All"
# doesn't give it to you. # doesn't give it to you.
# #
# The Options directive is both complicated and important. Please see # The Options directive is both complicated and important. Please see
# http://httpd.apache.org/docs/2.4/mod/core.html#options # http://httpd.apache.org/docs/2.4/mod/core.html#options
# for more information. # for more information.
# #
Options Indexes FollowSymLinks Options Indexes FollowSymLinks
# #
# AllowOverride controls what directives may be placed in .htaccess files. # AllowOverride controls what directives may be placed in .htaccess files.
# It can be "All", "None", or any combination of the keywords: # It can be "All", "None", or any combination of the keywords:
# Options FileInfo AuthConfig Limit # Options FileInfo AuthConfig Limit
# #
AllowOverride None AllowOverride None
# #
# Controls who can get stuff from this server. # Controls who can get stuff from this server.
# #
<IfModule !mod_access_compat.c> <IfModule !mod_access_compat.c>
Require all granted Require all granted
</IfModule> </IfModule>
<IfModule mod_access_compat.c> <IfModule mod_access_compat.c>
Order allow,deny Order allow,deny
Allow from all Allow from all
</IfModule> </IfModule>
</Directory> </Directory>
</VirtualHost> </VirtualHost>

5
apache2.changes
View File

@ -4,6 +4,11 @@ Fri Dec 9 12:21:27 UTC 2016 - pgajdos@suse.com
- fix build with new systemd - fix build with new systemd
+ amended httpd-2.4.3-mod_systemd.patch + 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 Tue Sep 13 06:39:50 UTC 2016 - pgajdos@suse.com

8
rc.apache2
View File

@ -323,8 +323,8 @@ case "$action" in
## give out the argument which is required for a reload. ## give out the argument which is required for a reload.
for i in $httpd_conf \ for i in $httpd_conf \
$APACHE_CONF_INCLUDE_FILES \ $APACHE_CONF_INCLUDE_FILES \
$APACHE_CONF_INCLUDE_DIRS $APACHE_CONF_INCLUDE_DIRS
do do
if [ $i -nt $pidfile ]; then if [ $i -nt $pidfile ]; then
echo reload echo reload
@ -344,8 +344,8 @@ case "$action" in
cmdline=$(echo $apache_bin -f $httpd_conf $server_flags "$@") cmdline=$(echo $apache_bin -f $httpd_conf $server_flags "$@")
out=$(su - nobody -c "$cmdline" 2>&1) out=$(su - nobody -c "$cmdline" 2>&1)
case $out in case $out in
*make_sock:\ could\ not\ bind\ to\ address*) echo Syntax: OK; rc_failed=0;; *make_sock:\ could\ not\ bind\ to\ address*) echo Syntax: OK; rc_failed=0;;
*) echo Syntax: NOT OK:; echo $out; rc_failed=1;; *) echo Syntax: NOT OK:; echo $out; rc_failed=1;;
esac esac
rc_exit rc_exit
;; ;;