Hello community, here is the log from the commit of package apache2 for openSUSE:Factory checked in at 2020-12-12 20:28:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apache2 (Old) and /work/SRC/openSUSE:Factory/.apache2.new.2328 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache2" Sat Dec 12 20:28:17 2020 rev:177 rq:854976 version:2.4.46 Changes: -------- --- /work/SRC/openSUSE:Factory/apache2/apache2.changes 2020-12-09 09:01:36.493730133 +0100 +++ /work/SRC/openSUSE:Factory/.apache2.new.2328/apache2.changes 2020-12-12 20:30:25.545730681 +0100 @@ -1,0 +2,23 @@ +Fri Dec 11 20:01:03 UTC 2020 - [email protected] + +- 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 - [email protected] + +- actually install suse provided READMEs +- install upstream configuration example +- added sources + + apache2-README-configuration.txt + +------------------------------------------------------------------- +Wed Dec 9 19:36:02 UTC 2020 - [email protected] + +- apxs -q PREFIX now returns /srv/www again + +------------------------------------------------------------------- New: ---- apache2-README-configuration.txt ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache2.spec ++++++ --- /var/tmp/diff_new_pack.6vQ0k1/_old 2020-12-12 20:30:27.657732884 +0100 +++ /var/tmp/diff_new_pack.6vQ0k1/_new 2020-12-12 20:30:27.661732889 +0100 @@ -178,6 +178,7 @@ # READMEs and other documentation Source200: apache2-README-access_compat.txt Source201: apache2-README-instances.txt +Source202: apache2-README-configuration.txt # layout of system dirs configuration, may be upstreamed Patch0: apache2-system-dirs-layout.patch # apachectl is frontend for start_apache2, suse specific @@ -369,6 +370,7 @@ # there does not exist as configure switches), so # override them back %configure \ + --prefix=%{datadir} \ --libexecdir=%{libexecdir} \ --includedir=%{includedir} \ --sysconfdir=%{sysconfdir} \ @@ -506,7 +508,7 @@ # save MODULE_MAGIC_NUMBER mkdir -p %{buildroot}/%{_libexecdir} -cat > %{buildroot}/%{_libexecdir}/%{name}_MMN <<-EOF +cat > %{buildroot}/%{_libexecdir}/apache2_MMN <<-EOF #!/bin/sh echo %{apache_mmn} EOF @@ -589,10 +591,17 @@ 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/ + +cp %{SOURCE200} README-access_compat.txt +cp %{SOURCE201} README-instances.txt +cp %{SOURCE202} README-configuration.txt %endif # utils install @@ -826,7 +835,7 @@ %attr(750,%{httpduser},root) %dir %{localstatedir} %dir %{libexecdir} %dir %{_libexecdir} -%attr(755,root,root) %{_libexecdir}/%{name}_MMN +%attr(755,root,root) %{_libexecdir}/apache2_MMN %dir %{sysconfdir} %config %{sysconfdir}/magic %config %{sysconfdir}/mime.types @@ -869,6 +878,7 @@ %{_mandir}/man8/httpd.8.* %{_mandir}/man8/suexec.8.* %doc support/SHA1 +%{_docdir}/apache2/conf %endif # utils files ++++++ apache2-README-configuration.txt ++++++ httpd configuration @ SUSE ========================== `httpd` command can stand for `httpd-prefork`, `httpd-worker` and `httpd-event`, depending on which httpd mpm rpm package is installed. In case more such mpm packages are installed, `httpd` points to one with higher priority defined in update alternatives. There are several levels of configuration possible: 1. systemctl start apache2 When httpd is run trough systemctl service, /etc/apache2/httpd.conf is used as a base and sysconfig varibables translated into /etc/apache2/sysconfig.d/ used. 2. httpd -f /etc/apache2/httpd.conf /etc/apache2/httpd.conf can be used directly, without systemd assistance. /etc/apache2/sysconfig.d is not included in that case. 3. httpd -f /usr/share/doc/package/apache2/conf/httpd.conf It is possible to experiment with upstream example configuration. Do not forgot For more configuration tips, install documentation package apache-rex. ++++++ apache2-mod_status.conf ++++++ --- /var/tmp/diff_new_pack.6vQ0k1/_old 2020-12-12 20:30:28.181733431 +0100 +++ /var/tmp/diff_new_pack.6vQ0k1/_new 2020-12-12 20:30:28.181733431 +0100 @@ -5,16 +5,28 @@ # see https://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> + <IfModule mod_lua.c> + <IfDefine LUA_STATUS> + AddHandler lua-script .lua + LuaMapHandler ^/server-status/?$ /usr/share/apache2/lua-server-status/server-status.lua + </IfDefine> + </IfModule> + <IfDefine !LUA_STATUS> + <IfDefine EXTENDED_STATUS> + ExtendedStatus on + </IfDefine> + <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> - ++++++ apache2-start_apache2 ++++++ --- /var/tmp/diff_new_pack.6vQ0k1/_old 2020-12-12 20:30:28.317733573 +0100 +++ /var/tmp/diff_new_pack.6vQ0k1/_new 2020-12-12 20:30:28.317733573 +0100 @@ -143,7 +143,11 @@ 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 ++++++ sysconfig.apache2 ++++++ --- /var/tmp/diff_new_pack.6vQ0k1/_old 2020-12-12 20:30:28.593733861 +0100 +++ /var/tmp/diff_new_pack.6vQ0k1/_new 2020-12-12 20:30:28.597733865 +0100 @@ -96,7 +96,6 @@ # 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 @@ # (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_SERVERTOKENS="ProductOnly" -## Type: list(on,off) +## Type: list(on,off,lua) ## Default: "off" ## ServiceReload: apache2 # @@ -250,6 +249,9 @@ # 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" _______________________________________________ openSUSE Commits mailing list -- [email protected] To unsubscribe, email [email protected] List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/[email protected]
