- In the services WUI page any addon that has a WUI menu page defined, such as Samba, Guardian etc, has the addon name shown in underlined red which is a link to the addon cgi page. This works for the other addons as the addon cgi name is the same as the addon name. I have identified that this is not the case for apcupsd, because the cgi page is called upsstats.cgi - This patch adjusts the cgi name to allow apcupsd to also be shown in underlined red. - The lfs file copies the upsstats.cgi file to one named apcupsd.cgi - The apcupsd menu file has the cgi name changed from upsstats.cgi to apcupsd.cgi - The rootfile is updated to also include the apcupsd.cgi file with the others. - Tested in my vm testbed by making the above changes in the code and the apcupsd addon was then shown in underlined red, which acted as a link to the apcupsd status WUI page.

Tested-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- config/menu/EX-apcupsd.menu | 2 +- config/rootfiles/packages/apcupsd | 1 + lfs/apcupsd | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/config/menu/EX-apcupsd.menu b/config/menu/EX-apcupsd.menu index 5f01dce33..ae462db18 100644 --- a/config/menu/EX-apcupsd.menu +++ b/config/menu/EX-apcupsd.menu @@ -1,5 +1,5 @@ $subipfire->{'35.apcupsd'} = {'caption' => $Lang::tr{'apcupsd'}, - 'uri' => '/cgi-bin/upsstats.cgi', + 'uri' => '/cgi-bin/apcupsd.cgi', 'title' => $Lang::tr{'apcupsd'}, 'enabled' => 1, }; diff --git a/config/rootfiles/packages/apcupsd b/config/rootfiles/packages/apcupsd index a28c961eb..f85ba3557 100644 --- a/config/rootfiles/packages/apcupsd +++ b/config/rootfiles/packages/apcupsd @@ -21,6 +21,7 @@ srv/web/ipfire/cgi-bin/multimon.cgi srv/web/ipfire/cgi-bin/upsfstats.cgi srv/web/ipfire/cgi-bin/upsimage.cgi srv/web/ipfire/cgi-bin/upsstats.cgi +srv/web/ipfire/cgi-bin/apcupsd.cgi #usr/share/hal #usr/share/hal/fdi #usr/share/hal/fdi/policy diff --git a/lfs/apcupsd b/lfs/apcupsd index f7c0b245f..8ed9bbd8c 100644 --- a/lfs/apcupsd +++ b/lfs/apcupsd @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = apcupsd -PAK_VER = 10 +PAK_VER = 11

DEPS =

@@ -95,5 +95,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) ln -sf ../init.d/apcupsd /etc/rc.d/rc6.d/K35apcupsd install -v -m 644 ${DIR_SRC}/config/backup/includes/apcupsd \ /var/ipfire/backup/addons/includes/apcupsd + cp /srv/web/ipfire/cgi-bin/upsstats.cgi /srv/web/ipfire/cgi-bin/apcupsd.cgi @rm -rf $(DIR_APP) @$(POSTBUILD)