Merge remote-tracking branch 'origin/next' into next

This commit is contained in:
Michael Tremer
2024-02-14 19:07:30 +00:00
10 changed files with 74 additions and 4 deletions

View File

@@ -0,0 +1,5 @@
$subipfire->{'41.mympd'} = {'caption' => myMPD,
'uri' => '/cgi-bin/mympd.cgi',
'title' => myMPD,
'enabled' => 1,
};

View File

@@ -0,0 +1,5 @@
$subipfire->{'42.transmission'} = {'caption' => TransmissionBT,
'uri' => '/cgi-bin/transmission.cgi',
'title' => TransmissionBT,
'enabled' => 1,
};

View File

@@ -120,8 +120,10 @@ var/ipfire/menu.d/70-log.menu
#var/ipfire/menu.d/EX-apcupsd.menu
#var/ipfire/menu.d/EX-guardian.menu
#var/ipfire/menu.d/EX-mpfire.menu
#var/ipfire/menu.d/EX-mympd.menu
#var/ipfire/menu.d/EX-samba.menu
#var/ipfire/menu.d/EX-tor.menu
#var/ipfire/menu.d/EX-transmission.menu
#var/ipfire/menu.d/EX-vdr.menu
#var/ipfire/menu.d/EX-wio.menu
#var/ipfire/menu.d/EX-wlanap.menu

View File

@@ -57,6 +57,7 @@ srv/web/ipfire/cgi-bin/memory.cgi
srv/web/ipfire/cgi-bin/modem-status.cgi
srv/web/ipfire/cgi-bin/modem.cgi
#srv/web/ipfire/cgi-bin/mpfire.cgi
#srv/web/ipfire/cgi-bin/mympd.cgi
srv/web/ipfire/cgi-bin/netexternal.cgi
srv/web/ipfire/cgi-bin/netinternal.cgi
srv/web/ipfire/cgi-bin/netother.cgi
@@ -78,6 +79,7 @@ srv/web/ipfire/cgi-bin/system.cgi
srv/web/ipfire/cgi-bin/time.cgi
#srv/web/ipfire/cgi-bin/tor.cgi
srv/web/ipfire/cgi-bin/traffic.cgi
#srv/web/ipfire/cgi-bin/transmission.cgi
srv/web/ipfire/cgi-bin/updatexlrator.cgi
srv/web/ipfire/cgi-bin/urlfilter.cgi
#srv/web/ipfire/cgi-bin/vdr.cgi

View File

@@ -1,5 +1,6 @@
etc/rc.d/init.d/mympd
usr/bin/mympd
usr/bin/mympd-config
usr/bin/mympd-script
#usr/lib/systemd/system/mympd.service
#usr/share/doc/mympd
@@ -7,6 +8,7 @@ usr/bin/mympd-script
#usr/share/doc/mympd/LICENSE.md
#usr/share/doc/mympd/README.md
#usr/share/doc/mympd/SECURITY.md
#usr/share/man/man1/mympd-config.1.gz
#usr/share/man/man1/mympd-script.1.gz
#usr/share/man/man1/mympd.1.gz
var/ipfire/backup/addons/includes/mympd
@@ -16,3 +18,5 @@ var/lib/mympd
#var/lib/mympd/config/ssl_port
#var/lib/mympd/state
#var/lib/mympd/state/music_directory
srv/web/ipfire/cgi-bin/mympd.cgi
var/ipfire/menu.d/EX-mympd.menu

View File

@@ -17,3 +17,5 @@ usr/share/transmission
#usr/share/transmission/public_html/transmission-app.js
#usr/share/transmission/public_html/transmission-app.js.LEGAL.txt
var/ipfire/backup/addons/includes/transmission
srv/web/ipfire/cgi-bin/transmission.cgi
var/ipfire/menu.d/EX-transmission.menu

25
html/cgi-bin/mympd.cgi Normal file
View File

@@ -0,0 +1,25 @@
#!/usr/bin/perl
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2024 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation, either version 3 of the License, or #
# (at your option) any later version. #
# #
# This program is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with this program. If not, see <http://www.gnu.org/licenses/>. #
# #
###############################################################################
print "Status: 302 Moved Temporarily\n";
print "Location: https://$ENV{SERVER_ADDR}:8800\n\n";
exit (0);

View File

@@ -0,0 +1,25 @@
#!/usr/bin/perl
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2024 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation, either version 3 of the License, or #
# (at your option) any later version. #
# #
# This program is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with this program. If not, see <http://www.gnu.org/licenses/>. #
# #
###############################################################################
print "Status: 302 Moved Temporarily\n";
print "Location: http://$ENV{SERVER_ADDR}:9091\n\n";
exit (0);

View File

@@ -26,7 +26,7 @@ include Config
SUMMARY = Webfrontend for Music Player Daemon
VER = 13.0.6
VER = 14.0.1
THISAPP = myMPD-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = mympd
PAK_VER = 1
PAK_VER = 2
# TODO move mpd initskript and config to mpd package to run without mpfire
DEPS = mpd libmpdclient mpfire
@@ -49,7 +49,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_BLAKE2 = 2ecd8d42b9398e85fc6c149c9e55f760f2039434039d558ac1914b447858a59676ed9300bc89b2a25757b8d9828dec5934376d4587f6b84026d07adbfd2e4a33
$(DL_FILE)_BLAKE2 = adc78e430f6afa88e35712119ce7a1545a962204b62f44a895fac17527ee696060f2e71a9313792d7c89d47905e27c4b4b72c3d13471fab27b16421eb2d992a5
install : $(TARGET)

View File

@@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = transmission
PAK_VER = 21
PAK_VER = 22
DEPS =