[SCM] mpd-sima/master: Moved some configuration out of init script
kaliko-guest at users.alioth.debian.org
kaliko-guest at users.alioth.debian.org
Sun Sep 28 11:34:26 UTC 2014
The following commit has been merged in the master branch:
commit f9020aeac58456428a525d89566275392955ad2a
Author: Geoffroy Youri Berret <efrim at azylum.org>
Date: Mon Jun 16 01:13:38 2014 +0200
Moved some configuration out of init script
Git-Dch: Ignore
diff --git a/debian/mpd-sima.cfg b/debian/mpd-sima.cfg
index 7eb0f24..1654105 100644
--- a/debian/mpd-sima.cfg
+++ b/debian/mpd-sima.cfg
@@ -1,200 +1,34 @@
-########################################################################
-#
-# If you need special settings, rename this file as sima.cfg within
-# your $XDG_CONFIG_HOME (default is $HOME/.config/sima/)
-# You can also call it with --config option.
-#
-# Pay Attention:
-# * Inline comment are not possible
-#
-# WRONG:
-# host = localhost # My host
-#
-# OK:
-# # My host
-# host = localhost
-#
-########################################################################
+# For exhaustive options lits see manual: man 5 mpd_sima.cfg
+# or /usr/share/doc/mpd-sima/examples/
-########################## MPD SECTION ################################
-#
[MPD]
-## HOST
-# type: string (IP or FQDN)
-# description: MPD host
-# default: localhost
-host = localhost
-
-## PORT
-# type: integer
-# description: MPD host port
-# default: 6600
-port = 6600
-
-## PASSWORD
-# type: string
-# default: unset, not using authentication
-# description: MPD host password, comment if you don't use
+#host = localhost
+#port = 6600
#password = s3cr3t
-#
-#######################################################################
-
-######################## LOGGING FACILITY #############################
-#
[log]
-## LOGFILE
-# type: string (file path)
-# description: file to log to. Usually used in daemon mode.
-# default: unset, logging to stdin/stdout
-#logfile =
-##
-
-## VERBOSITY
-# type: string
-# description: log verbosity
-# default: info
-# Possible values:
-# * debug, PAY ATTENTION: *DEBUG LEVEL MIGHT PRINT OUT YOUR PASSWORD*
-# * info, default
-# * warning
-# * error
+logfile = /var/log/mpd-sima/mpd-sima.log
+# Possible values: debug, info, warning, error
+# PAY ATTENTION: *DEBUG LEVEL MIGHT PRINT OUT YOUR PASSWORD*
verbosity = info
-##
-
-#
-#######################################################################
+[daemon]
+daemon = true
+pidfile = /run/mpd-sima/pid
-######################## SIMA CORE ####################################
-#
# These settings deal with MPD_sima core behaviour.
[sima]
-## PLUGINS
-# type: comma separated string list
-# for ex.:
-# contrib = Scrobble, AwesomePlugin,
-# ExperimentalTest, AnotherTest
-# default:
-# description: Plugins list declaration.
-# Optional plugin's configuration must be in its own section.
-# For instance a "AwesomePlugin" declared here
-# gets its configuration from an "[AwesomePlugin]"
-# or "[awesomeplugin]" section (case insensitive).
-#
-# Two plugins sources are available, internal and contrib
-#
-internal = Crop, Lastfm, RandomFallBack
-#contrib = PlaceHolder
-
-## HISTORY_DURATION
-# type: integer (in hours)
-# default: 8
-# description: How far to look back in history to avoid to play twice the same
-# track/title
-#
+#internal = Crop, Lastfm, RandomFallBack
+#contrib =
+## HISTORY_DURATION (in hours)
history_duration = 8
-##
-
-## USER_DB # NOT IMPLEMENTED #
-# type: boolean
-# description: Load user database to find similar artists
-# User DB is loaded from $XDG_CONFIG_HOME/sima/sima.db
-# Use simadb_cli to edit/add entries.
-user_db = false
-##
-
-#####################################################################
-# You do not need to set up options below.
-# But well, you got bored of the way sima is behaving, then go ahead
-# play with it :)
-
-## QUEUE_LENGTH
-# type: integer
-# default: 1
-# description: Queue length triggering tracks addition
-queue_length = 1
-##
-
-######################### PLUGINS #####################################
-#
-[placeholder]
-key = Value
-
-[crop]
-# type: integer
-# default: unset, not cropping playlist
-# description: How many played tracks to keep in the playlist.
-# Allow to maintain a fixed length playlist.
-# Leave commented to keep all tracks
-#consume = 10
-
-[RandomFallback]
-# type: string
-# default: sensible
-# description: When no similar tracks are found, falling back to random
-# queuing. Different mode, aka random flavour, are available.
-# random flavour :
-# * pure: complete random choice among all tracks available in the
-# player media library
-# * sensible: use play history to filter chosen tracks
-# * genre: chose among the same genre as current track (using genre
-# tag). If no genre tag is available "sensible" flavour
-# is used instead
-#flavour=sensible
[lastfm]
-## QUEUE_MODE # NOT COMPLETED #
-# type: string
-# description: The default is to queue random tracks from similar artists.
-# Possible values:
-# track : Will queue tracks from similar artists (default).
-# top : Will queue top tracks from similar artists. # NOT IMPLEMENTED #
-# album : Will queue whole album from similar artists.
+## QUEUE_MODE
+# Possible values: track, top, album
queue_mode = track
-
-## SIMILARITY
-# type: integer in [0 100]
-# description: Similarity as a percentage of similarity between artists
-# (this is a last.fm metric)
-similarity = 15
-
-## DYNAMIC
-# type: integer
-# description: Number of similar artist to retrieve from local media library.
-# When set to something superior to zero, MPD_sima tries to get as much similar
-# artists from media library provided artists similarity is superior to
-# similarity value.
-dynamic = 10
-
-## DEPTH
-# type: integer in [1, +∞]
-# default: 1
-# description: TBD
-depth = 1
-
-## SINGLE_ALBUM
-# type: boolean
-# scope: "track" and "top" queue modes
-# description: Prevent from queueing a track from the same album (for instance with OST).
-single_album = false
-
-## TRACK_TO_ADD
-# type: integer
-# scope: "track" and "top" queue modes
-# description: how many tracks the plugin will try to get
track_to_add = 1
-
-## ALBUM_TO_ADD
-# type: integer
-# scope: "album" queue mode
-# description: how many albums the plugin will try to get
album_to_add = 1
-
-#
-#######################################################################
-
-#
-####################### END OF CONFIGURATION ##########################
+cache = True
# vim: syntax=cfg fileencoding=utf-8
diff --git a/debian/mpd-sima.init b/debian/mpd-sima.init
index 1a7471c..9d4c854 100755
--- a/debian/mpd-sima.init
+++ b/debian/mpd-sima.init
@@ -18,14 +18,10 @@ DESC="MPD_sima autoqueue utility"
NAME=mpd-sima
USER=$NAME
DAEMON="/usr/bin/$NAME"
-PIDFILE="/run/$NAME/pid"
-LOGFILE="/var/log/mpd-sima/mpd-sima.log"
VARDIR="/var/lib/mpd-sima/"
CONF="/etc/mpd-sima.cfg"
-DAEMON_ARGS="--daemon --var_dir=$VARDIR \
- --pid=$PIDFILE \
- --config=$CONF \
- --log=$LOGFILE"
+DAEMON_ARGS="--var_dir=$VARDIR \
+ --config=$CONF"
# Exit if the package is not installed
[ -x "$DAEMON" ] || exit 0
--
mpd-sima packaging
More information about the pkg-multimedia-commits
mailing list