[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0f2c82ad7f6f3e55a67a9c09cb2cb4af15219c91

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0f2c82ad7f6f3e55a67a9c09cb2cb4af15219c91

[Michael Tremer]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  0f2c82ad7f6f3e55a67a9c09cb2cb4af15219c91 (commit)
       via  0ee09ef0b4b57d1adaf76442117a42d60746a628 (commit)
       via  aa989750327fd2ebad57b5ca20bfba01cf43c09b (commit)
       via  abd4d7508d9e095c3c2a7fa1be0bf93057eff067 (commit)
      from  8967b76c3fd3ac0fa29142355f14c73fe193f978 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0f2c82ad7f6f3e55a67a9c09cb2cb4af15219c91
Author: Peer Dietzmann <dietzmann@brecht-schule.hamburg>
Date:   Mon Jun 22 16:15:02 2026 +0200

    Redirect Apache status requests
    
    Redirect requests to Apache's status to it's backend, force local requests.
    This is required to allow Observium's agent to pull metrics from Apache.
    
    Best,
    Peer
    
    Signed-off-by: Peer Dietzmann <dietzmann@brecht-schule.hamburg>
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit 0ee09ef0b4b57d1adaf76442117a42d60746a628
Author: Peer Dietzmann <dietzmann@brecht-schule.hamburg>
Date:   Mon Jun 22 16:14:42 2026 +0200

    Enable Apache Status Module
    
    First of two patches to make Observium's Agent able to pull Apache's status.
    
    Best,
    Peer
    
    Signed-off-by: Peer Dietzmann <dietzmann@brecht-schule.hamburg>
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit aa989750327fd2ebad57b5ca20bfba01cf43c09b
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Wed Jul 8 10:29:04 2026 +0000

    observium-agent: Bump release
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit abd4d7508d9e095c3c2a7fa1be0bf93057eff067
Author: Matthias Fischer <matthias.fischer@ipfire.org>
Date:   Tue Jun 23 13:40:57 2026 +0200

    obeservium-agent 24.4: Redirect apache status requests
    
    This is the third patch of a patch series "to make Observium's
    Agent able to pull Apache's status".
    
    For details see:
    https://lists.ipfire.org/development/20260622141442.374831-1-dietzmann@brecht-schule.hamburg/T/#u
    
    https://lists.ipfire.org/development/32e4bd79-effd-4720-bb44-aa8eefda9a83@ipfire.org/T/#t
    
    Suggested-by: Peer Dietzmann <dietzmann@brecht-schule.hamburg>
    Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/httpd/httpd.conf                                       |  6 ++++++
 config/httpd/loadmodule.conf                                  |  2 +-
 lfs/observium-agent                                           |  4 ++--
 .../observium/redirect_apache_localhost_to_port_81.patch      | 11 +++++++++++
 4 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 src/patches/observium/redirect_apache_localhost_to_port_81.patch

Difference in files:
diff --git a/config/httpd/httpd.conf b/config/httpd/httpd.conf
index c694bffe2..09b10b50f 100644
--- a/config/httpd/httpd.conf
+++ b/config/httpd/httpd.conf
@@ -49,4 +49,10 @@ Include /etc/httpd/conf/default-server.conf
 # Virtual server configuration
 Include /etc/httpd/conf/vhosts.d/*.conf
 
+# Allow local clients to pull Apache's status
+<Location /server-status>
+    SetHandler server-status
+    Require local
+</Location>
+
 # EOF
diff --git a/config/httpd/loadmodule.conf b/config/httpd/loadmodule.conf
index 9babd8f5b..4947a8a21 100644
--- a/config/httpd/loadmodule.conf
+++ b/config/httpd/loadmodule.conf
@@ -35,7 +35,7 @@ LoadModule setenvif_module /usr/lib/apache/mod_setenvif.so
 #LoadModule version_module /usr/lib/apache/mod_version.so
 LoadModule mime_module /usr/lib/apache/mod_mime.so
 #LoadModule dav_module /usr/lib/apache/mod_dav.so
-#LoadModule status_module /usr/lib/apache/mod_status.so
+LoadModule status_module /usr/lib/apache/mod_status.so
 #LoadModule autoindex_module /usr/lib/apache/mod_autoindex.so
 #LoadModule asis_module /usr/lib/apache/mod_asis.so
 #LoadModule info_module /usr/lib/apache/mod_info.so
diff --git a/lfs/observium-agent b/lfs/observium-agent
index 86d7c5f47..be1fad812 100644
--- a/lfs/observium-agent
+++ b/lfs/observium-agent
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/observium
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = observium-agent
-PAK_VER    = 5
+PAK_VER    = 6
 
 DEPS       = xinetd perl-Encode-Locale
 
@@ -81,6 +81,7 @@ $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np2 < $(DIR_SRC)/src/patches/observium/redirect_apache_localhost_to_port_81.patch
 
 	# Install xinet.d configuration
 	mkdir -pv /etc/xinetd.d
@@ -102,4 +103,3 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
-
diff --git a/src/patches/observium/redirect_apache_localhost_to_port_81.patch b/src/patches/observium/redirect_apache_localhost_to_port_81.patch
new file mode 100644
index 000000000..f1a124054
--- /dev/null
+++ b/src/patches/observium/redirect_apache_localhost_to_port_81.patch
@@ -0,0 +1,11 @@
+--- a/observium/scripts/agent-local/apache	Sun Oct  4 07:21:06 2015
++++ b/observium/scripts/agent-local/apache	Mon Jun 22 16:36:40 2026
+@@ -26,7 +26,7 @@
+         close INFILE;
+ } else {
+         # grab the status URL (fresh data)
+-        @data = split /(\n)/, LWP::Simple::get( 'http://localhost/server-status?auto' )
++        @data = split /(\n)/, LWP::Simple::get( 'http://localhost:81/server-status?auto' )
+                 or die "Data fetch failure.\n";
+ 
+         # write file


hooks/post-receive
--
IPFire 2.x development tree