webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-05-06 13:06:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

Browse Source
This commit is contained in:
Ronald Wiesinger
2009-02-18 14:17:50 +01:00
parent 6ac519a70c ca5912d367
commit d81db9d3a2
8 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config/mpfire/mpd.db
View File

@@ -1,6 +0,0 @@
info_begin
mpd_version: MPD_VERSION
fs_charset: UTF-8
info_end
songList begin
songList end

1
config/rootfiles/cdrom_corever
View File

@@ -1 +0,0 @@
25

4
config/rootfiles/packages/mpfire
View File

@@ -27,8 +27,8 @@ var/ipfire/menu.d/EX-mpfire.menu
var/ipfire/mpfire var/ipfire/mpfire
var/ipfire/mpfire/bin var/ipfire/mpfire/bin
var/ipfire/mpfire/bin/mpfire.pl var/ipfire/mpfire/bin/mpfire.pl
var/ipfire/mpfire/db #var/ipfire/mpfire/db
var/ipfire/mpfire/db/mpd.db var/ipfire/mpfire/db/info
var/ipfire/mpfire/mpd.conf var/ipfire/mpfire/mpd.conf
var/ipfire/mpfire/playlist.m3u var/ipfire/mpfire/playlist.m3u
var/ipfire/mpfire/settings var/ipfire/mpfire/settings

2
html/cgi-bin/mpfire.cgi
View File

@@ -317,7 +317,7 @@ if ( $mpfiresettings{'ACTION'} eq "scan" ){
############################################################################################################################ ############################################################################################################################
################################### Aufbau der HTML Seite fr globale Sambaeinstellungen #################################### ################################### Aufbau der HTML Seite fr globale Sambaeinstellungen ####################################
$mpfiresettings{'MUSICDIR'} = "/"; $mpfiresettings{'MUSICDIR'} = "/var/mp3";
&General::readhash("${General::swroot}/mpfire/settings", \%mpfiresettings); &General::readhash("${General::swroot}/mpfire/settings", \%mpfiresettings);
############################################################################################################################ ############################################################################################################################

1
html/cgi-bin/proxy.cgi
View File

@@ -1,4 +1,3 @@
#!/usr/bin/perl #!/usr/bin/perl
############################################################################### ###############################################################################
# # # #

3
lfs/mpd
View File

@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/${THISAPP} DIR_APP = $(DIR_SRC)/${THISAPP}
TARGET = $(DIR_INFO)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP)
PROG = mpd PROG = mpd
PAK_VER = 6 PAK_VER = 7
DEPS = "alsa ffmpeg libshout libogg libmad libid3tag libvorbis" DEPS = "alsa ffmpeg libshout libogg libmad libid3tag libvorbis"
@@ -83,5 +83,4 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP) @rm -rf $(DIR_APP)
touch /var/log/mpd.error.log touch /var/log/mpd.error.log
touch /var/log/mpd.log touch /var/log/mpd.log
sed -i 's/MPD_VERSION/$(VER)/' /var/ipfire/mpfire/db/mpd.db
@$(POSTBUILD) @$(POSTBUILD)

3
lfs/mpfire
View File

@@ -62,10 +62,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
install -v -m 755 $(DIR_SRC)/config/mpfire/mpfire.pl /var/ipfire/mpfire/bin install -v -m 755 $(DIR_SRC)/config/mpfire/mpfire.pl /var/ipfire/mpfire/bin
install -v -m 664 $(DIR_SRC)/config/mpfire/mpd.conf /var/ipfire/mpfire/ install -v -m 664 $(DIR_SRC)/config/mpfire/mpd.conf /var/ipfire/mpfire/
install -v -m 644 $(DIR_SRC)/config/mpfire/webradio /var/ipfire/mpfire/ install -v -m 644 $(DIR_SRC)/config/mpfire/webradio /var/ipfire/mpfire/
install -v -m 644 $(DIR_SRC)/config/mpfire/mpd.db /var/ipfire/mpfire/db/mpd.db echo "Folder for mpd database" > /var/ipfire/mpfire/db/info
chown root.nobody /var/ipfire/mpfire/{mpd.conf,playlist.m3u} chown root.nobody /var/ipfire/mpfire/{mpd.conf,playlist.m3u}
chown nobody.nobody /var/ipfire/mpfire/{settings,webradio} chown nobody.nobody /var/ipfire/mpfire/{settings,webradio}
chown root.nobody /var/ipfire/mpfire/db/mpd.db
chmod 664 /var/ipfire/mpfire/playlist.m3u chmod 664 /var/ipfire/mpfire/playlist.m3u
chmod 755 /srv/web/ipfire/html/images/mpfire chmod 755 /srv/web/ipfire/html/images/mpfire
install -v -m 644 $(DIR_SRC)/config/backup/includes/mpfire /var/ipfire/backup/addons/includes/mpfire install -v -m 644 $(DIR_SRC)/config/backup/includes/mpfire /var/ipfire/backup/addons/includes/mpfire

1
src/initscripts/init.d/mpd
View File

@@ -12,6 +12,7 @@
case "$1" in case "$1" in
start) start)
boot_mesg "Starting MPD..." boot_mesg "Starting MPD..."
chown -R root.nobody /var/ipfire/mpfire/db
/bin/nice --5 /usr/bin/mpd /bin/nice --5 /usr/bin/mpd
evaluate_retval evaluate_retval
;; ;;