- added https://httpd.apache.org/server-status like server status
(configured by APACHE_EXTENDED_STATUS="lua") - modified sources % apache2-mod_status.conf % apache2-start_apache2 % sysconfig.apache2 OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=635
This commit is contained in:
parent
59be197be7
commit
50bc75ffe3
@ -5,16 +5,28 @@
|
|||||||
# see https://httpd.apache.org/docs/2.4/mod/mod_status.html
|
# see https://httpd.apache.org/docs/2.4/mod/mod_status.html
|
||||||
#
|
#
|
||||||
<IfModule mod_status.c>
|
<IfModule mod_status.c>
|
||||||
<Location /server-status>
|
<IfModule mod_lua.c>
|
||||||
SetHandler server-status
|
<IfDefine LUA_STATUS>
|
||||||
<IfModule !mod_access_compat.c>
|
AddHandler lua-script .lua
|
||||||
Require local
|
LuaMapHandler ^/server-status/?$ /usr/share/apache2/lua-server-status/server-status.lua
|
||||||
</IfModule>
|
</IfDefine>
|
||||||
<IfModule mod_access_compat.c>
|
</IfModule>
|
||||||
Order deny,allow
|
<IfDefine !LUA_STATUS>
|
||||||
Deny from all
|
<IfDefine EXTENDED_STATUS>
|
||||||
Allow from localhost
|
ExtendedStatus on
|
||||||
</IfModule>
|
</IfDefine>
|
||||||
</Location>
|
<Location /server-status>
|
||||||
|
SetHandler server-status
|
||||||
|
</Location>
|
||||||
|
</IfDefine>
|
||||||
|
<Location /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>
|
</IfModule>
|
||||||
|
|
||||||
|
@ -143,7 +143,11 @@ if [ -n "$APACHE_SERVERTOKENS" ]; then
|
|||||||
fi
|
fi
|
||||||
# APACHE_EXTENDED_STATUS -> global.conf
|
# APACHE_EXTENDED_STATUS -> global.conf
|
||||||
if [ -n "$APACHE_EXTENDED_STATUS" ]; then
|
if [ -n "$APACHE_EXTENDED_STATUS" ]; then
|
||||||
echo "ExtendedStatus $APACHE_EXTENDED_STATUS" >> ${sysconfd_dir}/global.conf
|
if [ "$APACHE_EXTENDED_STATUS" == "lua" ]; then
|
||||||
|
server_flags="$server_flags -DLUA_STATUS"
|
||||||
|
elif [ "$APACHE_EXTENDED_STATUS" == "on" ]; then
|
||||||
|
server_flags="$server_flags -DEXTENDED_STATUS"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
# APACHE_MODULES -> loadmodule.conf
|
# APACHE_MODULES -> loadmodule.conf
|
||||||
get_module_list
|
get_module_list
|
||||||
|
@ -1,3 +1,13 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Dec 11 20:01:03 UTC 2020 - pgajdos@suse.com
|
||||||
|
|
||||||
|
- added https://httpd.apache.org/server-status like server status
|
||||||
|
(configured by APACHE_EXTENDED_STATUS="lua")
|
||||||
|
- modified sources
|
||||||
|
% apache2-mod_status.conf
|
||||||
|
% apache2-start_apache2
|
||||||
|
% sysconfig.apache2
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Dec 10 16:45:36 UTC 2020 - pgajdos@suse.com
|
Thu Dec 10 16:45:36 UTC 2020 - pgajdos@suse.com
|
||||||
|
|
||||||
|
@ -593,6 +593,8 @@ make DESTDIR=%{buildroot} install-icons
|
|||||||
make DESTDIR=%{buildroot} install-error
|
make DESTDIR=%{buildroot} install-error
|
||||||
make DESTDIR=%{buildroot} sysconfdir=%{_docdir}/apache2/conf install-conf
|
make DESTDIR=%{buildroot} sysconfdir=%{_docdir}/apache2/conf install-conf
|
||||||
|
|
||||||
|
cp -r docs/server-status %{buildroot}%{_datadir}/apache2/lua-server-status
|
||||||
|
|
||||||
mkdir -p %{buildroot}%{_mandir}/man8/
|
mkdir -p %{buildroot}%{_mandir}/man8/
|
||||||
install -D -m 644 docs/man/suexec.8 %{buildroot}%{_mandir}/man8/
|
install -D -m 644 docs/man/suexec.8 %{buildroot}%{_mandir}/man8/
|
||||||
install -D -m 644 docs/man/httpd.8 %{buildroot}%{_mandir}/man8/
|
install -D -m 644 docs/man/httpd.8 %{buildroot}%{_mandir}/man8/
|
||||||
|
@ -96,7 +96,6 @@ APACHE_MODULES="actions alias auth_basic authn_core authn_file authz_host authz_
|
|||||||
# something temporarily.
|
# something temporarily.
|
||||||
#
|
#
|
||||||
# Notably, to enable ssl support, 'SSL' needs to be added here.
|
# Notably, to enable ssl support, 'SSL' needs to be added here.
|
||||||
# To enable the server-status, 'STATUS' needs to be added here.
|
|
||||||
#
|
#
|
||||||
# It does not matter if you write flag1, -D flag1 or -Dflag1.
|
# It does not matter if you write flag1, -D flag1 or -Dflag1.
|
||||||
# Multiple flags can be given as "-D flag1 -D flag2" or simply "flag1 flag2".
|
# Multiple flags can be given as "-D flag1 -D flag2" or simply "flag1 flag2".
|
||||||
@ -105,7 +104,7 @@ APACHE_MODULES="actions alias auth_basic authn_core authn_file authz_host authz_
|
|||||||
# (e.g. via rcapache2 start -DReverseProxy)
|
# (e.g. via rcapache2 start -DReverseProxy)
|
||||||
#
|
#
|
||||||
# Example:
|
# Example:
|
||||||
# "SSL HTTP2 STATUS AWSTATS SVN_VIEWCVS no_subversion_today"
|
# "SSL HTTP2 AWSTATS SVN_VIEWCVS no_subversion_today"
|
||||||
#
|
#
|
||||||
APACHE_SERVER_FLAGS=""
|
APACHE_SERVER_FLAGS=""
|
||||||
|
|
||||||
@ -242,7 +241,7 @@ APACHE_USE_CANONICAL_NAME="off"
|
|||||||
#
|
#
|
||||||
APACHE_SERVERTOKENS="ProductOnly"
|
APACHE_SERVERTOKENS="ProductOnly"
|
||||||
|
|
||||||
## Type: list(on,off)
|
## Type: list(on,off,lua)
|
||||||
## Default: "off"
|
## Default: "off"
|
||||||
## ServiceReload: apache2
|
## ServiceReload: apache2
|
||||||
#
|
#
|
||||||
@ -250,6 +249,9 @@ APACHE_SERVERTOKENS="ProductOnly"
|
|||||||
# CPU usage, in the status report. It is a server-wide setting, and it can cost
|
# CPU usage, in the status report. It is a server-wide setting, and it can cost
|
||||||
# some performance!
|
# some performance!
|
||||||
#
|
#
|
||||||
|
# Server status GUI written in lua (see https://www.apache.org/server-status
|
||||||
|
# for an example) requires both mod_status and mod_lua to be loaded.
|
||||||
|
#
|
||||||
APACHE_EXTENDED_STATUS="off"
|
APACHE_EXTENDED_STATUS="off"
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user