From 9c27eca8e4b7b722fd86add8b6659633ac7c63bc Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 1 Jun 2011 23:46:42 +0200 Subject: [PATCH 1/1] client175: update to 0.7. --- config/client175/site.conf | 12 +++++------- config/rootfiles/packages/client175 | 3 +++ lfs/client175 | 10 ++++++---- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/config/client175/site.conf b/config/client175/site.conf index f98d8e8dd8..9abe832a18 100644 --- a/config/client175/site.conf +++ b/config/client175/site.conf @@ -1,7 +1,4 @@ # 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. @@ -12,6 +9,7 @@ # from this server via the music_directory option configured below. mpd_host: "localhost" mpd_port: 6600 +;server_root: "/client175" # 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. @@ -21,17 +19,17 @@ music_directory: "/var/mp3" # 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 +# 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. Default is port 8080. server.socket_port: 8800 # 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 +# 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 +# Setting environment to production removes the verbose console output # and disables auto-reload on file changes. environment: "production" @@ -41,7 +39,7 @@ environment: "production" 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 +# these locations for covers before using web services. The following # variables are available fo substitution: # {folder} Folder a given file is in # {artist} Artist name diff --git a/config/rootfiles/packages/client175 b/config/rootfiles/packages/client175 index e6596235b1..6e366c23a5 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/httpd.conf.example srv/client175/lyricwiki.py #srv/client175/metadata srv/client175/metadata/COPYING @@ -99,6 +100,7 @@ srv/client175/site.conf srv/client175/static/COPYING.txt srv/client175/static/Thumbs.db srv/client175/static/covers +srv/client175/static/covers/album_blank.png #srv/client175/static/ext srv/client175/static/ext/ext-all-debug.js srv/client175/static/ext/ext-all.js @@ -2844,6 +2846,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/gear.png srv/client175/static/icons/fugue/globe--plus.png srv/client175/static/icons/fugue/home.png srv/client175/static/icons/fugue/information-frame.png diff --git a/lfs/client175 b/lfs/client175 index 7f39508fa6..ef2b487fba 100644 --- a/lfs/client175 +++ b/lfs/client175 @@ -24,7 +24,7 @@ include Config -VER = 0.5a +VER = 0.7 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 = 2 +PAK_VER = 3 DEPS = "mpfire" @@ -44,7 +44,8 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 578ad4ba1743f3b0801a806659f550c8 +$(DL_FILE)_MD5 = 975b69de79dc2649d8acba294cc0c5eb + install : $(TARGET) check : $(patsubst %,$(DIR_CHK)/%,$(objects)) @@ -76,11 +77,12 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxvf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE) @rm -rf /srv/client175 mkdir -pv /srv/client175 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 \ -- 2.39.2