diff --git a/apache2-mod_status.conf b/apache2-mod_status.conf index 7d11e64..e09657b 100644 --- a/apache2-mod_status.conf +++ b/apache2-mod_status.conf @@ -5,16 +5,28 @@ # see https://httpd.apache.org/docs/2.4/mod/mod_status.html # - - SetHandler server-status - - Require local - - - Order deny,allow - Deny from all - Allow from localhost - - + + + AddHandler lua-script .lua + LuaMapHandler ^/server-status/?$ /usr/share/apache2/lua-server-status/server-status.lua + + + + + ExtendedStatus on + + + SetHandler server-status + + + + + Require local + + + Order deny,allow + Deny from all + Allow from localhost + + - diff --git a/apache2-start_apache2 b/apache2-start_apache2 index 60a9bd9..e302fce 100644 --- a/apache2-start_apache2 +++ b/apache2-start_apache2 @@ -143,7 +143,11 @@ if [ -n "$APACHE_SERVERTOKENS" ]; then fi # APACHE_EXTENDED_STATUS -> global.conf 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 # APACHE_MODULES -> loadmodule.conf get_module_list diff --git a/apache2.changes b/apache2.changes index ac5e7d9..193482f 100644 --- a/apache2.changes +++ b/apache2.changes @@ -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 diff --git a/apache2.spec b/apache2.spec index 2b825d3..6bf7360 100644 --- a/apache2.spec +++ b/apache2.spec @@ -593,6 +593,8 @@ make DESTDIR=%{buildroot} install-icons make DESTDIR=%{buildroot} install-error 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/ install -D -m 644 docs/man/suexec.8 %{buildroot}%{_mandir}/man8/ install -D -m 644 docs/man/httpd.8 %{buildroot}%{_mandir}/man8/ diff --git a/sysconfig.apache2 b/sysconfig.apache2 index fb7b4d8..13eb14f 100644 --- a/sysconfig.apache2 +++ b/sysconfig.apache2 @@ -96,7 +96,6 @@ APACHE_MODULES="actions alias auth_basic authn_core authn_file authz_host authz_ # something temporarily. # # 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. # 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) # # Example: -# "SSL HTTP2 STATUS AWSTATS SVN_VIEWCVS no_subversion_today" +# "SSL HTTP2 AWSTATS SVN_VIEWCVS no_subversion_today" # APACHE_SERVER_FLAGS="" @@ -242,7 +241,7 @@ APACHE_USE_CANONICAL_NAME="off" # APACHE_SERVERTOKENS="ProductOnly" -## Type: list(on,off) +## Type: list(on,off,lua) ## Default: "off" ## 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 # 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"