From 75db3817a73f5d34b0737b6f6949c5bb4c5ba51c Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 5 Jan 2011 16:35:07 +0100 Subject: [PATCH] Updated client175 to 0.5a. --- config/backup/includes/client175 | 2 ++ config/client175/site.conf | 28 +++++++++++++++++++++------- config/rootfiles/packages/client175 | 6 ++++++ lfs/client175 | 9 ++++++--- 4 files changed, 35 insertions(+), 10 deletions(-) create mode 100644 config/backup/includes/client175 diff --git a/config/backup/includes/client175 b/config/backup/includes/client175 new file mode 100644 index 0000000000..6cde8e8ca6 --- /dev/null +++ b/config/backup/includes/client175 @@ -0,0 +1,2 @@ +/src/client175/site.conf +/var/ipfire/mpfire/*.m3u diff --git a/config/client175/site.conf b/config/client175/site.conf index 7a2035d67c..f98d8e8dd8 100644 --- a/config/client175/site.conf +++ b/config/client175/site.conf @@ -1,4 +1,7 @@ # Edit this file as needed and save it as: site.conf +# # and ; at the begining of lines indicate comments. Remove the ; to +# activate a setting. +# # The application will work without it but tag editing will not work # without saving this file as site.conf with the correct music_directory # set. @@ -10,21 +13,32 @@ mpd_host: "localhost" mpd_port: 6600 -# Setting environment to production removes the verbose console output -# and disables auto-reload on file changes. -environment: "production" +# Location of the music directory, required for editing tags. This variable +# is also used to identify the folder for a given file in local cover lookups. +music_directory: "/var/mp3" # Only change socket_host if you have multiple network interfaces and want # to limit which one it listens on. "0.0.0.0" listens on all interfaces. server.socket_host: "0.0.0.0" # Don't run this as root in order to use port 80! This app was not built -# to be secure, it must be run with limited access. +# to be secure, it must be run with limited access. Default is port 8080. server.socket_port: 8800 -# Location of the music directory, required for editing tags. This variable -# is also used to identify the folder for a given file in local cover lookups. -music_directory: "/var/mp3" +# Setting the 'run_as' variable will allow you to start the process as root +# and drop the privelages to a restricted user account during server startup. +# This feature is useful when starting client175 during the init process +# and/or when starting as root to run on port 80. +;run_as: "user" + +# Setting environment to production removes the verbose console output +# and disables auto-reload on file changes. +environment: "production" + +# Setting include_playlist_counts to True will cause the server to count the +# number of songs and total playtime when listing saved playlists. If you have +# large playlists this will cause a delay whenever a stored playlist is changed. +include_playlist_counts: True # List of local locations to search for cover art. The server will check # these locations for covers before using web services. The following diff --git a/config/rootfiles/packages/client175 b/config/rootfiles/packages/client175 index 71c15562d5..e6596235b1 100644 --- a/config/rootfiles/packages/client175 +++ b/config/rootfiles/packages/client175 @@ -46,6 +46,7 @@ srv/client175/cherrypy/process/wspbus.py #srv/client175/cherrypy/wsgiserver srv/client175/cherrypy/wsgiserver/__init__.py srv/client175/covers.py +srv/client175/lyricwiki.py #srv/client175/metadata srv/client175/metadata/COPYING srv/client175/metadata/__init__.py @@ -2843,6 +2844,7 @@ srv/client175/static/icons/fugue/folder-horizontal.png srv/client175/static/icons/fugue/folder-microphone.png srv/client175/static/icons/fugue/folder-open-document-music.png srv/client175/static/icons/fugue/folder-open.png +srv/client175/static/icons/fugue/globe--plus.png srv/client175/static/icons/fugue/home.png srv/client175/static/icons/fugue/information-frame.png srv/client175/static/icons/fugue/information.png @@ -2850,9 +2852,12 @@ srv/client175/static/icons/fugue/layout-select-sidebar-right.png srv/client175/static/icons/fugue/magnifier.png srv/client175/static/icons/fugue/microphone.png srv/client175/static/icons/fugue/music.png +srv/client175/static/icons/fugue/output-off.png +srv/client175/static/icons/fugue/output-on.png srv/client175/static/icons/fugue/pencil.png srv/client175/static/icons/fugue/plus-octagon.png srv/client175/static/icons/fugue/plus.png +srv/client175/static/icons/fugue/speaker.png srv/client175/static/icons/fugue/tag--pencil.png srv/client175/static/icons/fugue/tag.png srv/client175/static/icons/fugue/ui-tab--plus.png @@ -2878,6 +2883,7 @@ srv/client175/static/mutagen/COPYING.txt srv/client175/static/rgbcolor.js srv/client175/static/style.css srv/client175/static/tb_btn_fix.css +var/ipfire/backup/addons/includes/client175 etc/rc.d/rc0.d/K34client175 etc/rc.d/rc6.d/K34client175 etc/rc.d/rc3.d/S66client175 diff --git a/lfs/client175 b/lfs/client175 index 203ec601cd..7f39508fa6 100644 --- a/lfs/client175 +++ b/lfs/client175 @@ -24,7 +24,7 @@ include Config -VER = 0.3 +VER = 0.5a THISAPP = client175_$(VER) DL_FILE = $(THISAPP).tar.xz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = client175 -PAK_VER = 1 +PAK_VER = 2 DEPS = "mpfire" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 4de3a175077fea8793b9c666029e9632 +$(DL_FILE)_MD5 = 578ad4ba1743f3b0801a806659f550c8 install : $(TARGET) check : $(patsubst %,$(DIR_CHK)/%,$(objects)) @@ -83,6 +83,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && mv -vf * /srv/client175 cp -vf $(DIR_SRC)/config/client175/site.conf /srv/client175/ + install -v -m 644 $(DIR_SRC)/config/backup/includes/client175 \ + /var/ipfire/backup/addons/includes/client175 + chown -R nobody:nobody /srv/client175 @rm -rf $(DIR_APP) @$(POSTBUILD) -- 2.39.2