Merge pull request #72 from jpleau/various_patches

various patches: manpage, remove external js, init scripts
This commit is contained in:
Andy 2015-05-02 01:11:05 +02:00
commit 8c916e2b74
5 changed files with 17 additions and 13 deletions

View File

@ -1,8 +1,8 @@
#!/bin/sh #!/bin/sh
### BEGIN INIT INFO ### BEGIN INIT INFO
# Provides: ympd # Provides: ympd
# Required-Start: $local_fs $mpd # Required-Start: $remote_fs mpd
# Required-Stop: $local_fs $mpd # Required-Stop: $remote_fs mpd
# Default-Start: 2 3 4 5 # Default-Start: 2 3 4 5
# Default-Stop: 0 1 6 # Default-Stop: 0 1 6
# Short-Description: Daemonized version of ympd. # Short-Description: Daemonized version of ympd.
@ -20,8 +20,11 @@ PIDFILE=/var/run/$NAME.pid
SCRIPTNAME=/etc/init.d/$NAME SCRIPTNAME=/etc/init.d/$NAME
LOG_OUT=/var/log/$NAME.out LOG_OUT=/var/log/$NAME.out
LOG_ERR=/var/log/$NAME.err LOG_ERR=/var/log/$NAME.err
YMPD_USER=mpd YMPD_USER=nobody
DAEMON_OPT="--user $YMPD_USER --webport 8080" MPD_HOST=localhost
MPD_PORT=6600
WEB_PORT=8080
# Exit if the package is not installed # Exit if the package is not installed
[ -x "$DAEMON" ] || exit 0 [ -x "$DAEMON" ] || exit 0
@ -32,6 +35,8 @@ DAEMON_OPT="--user $YMPD_USER --webport 8080"
# Load the VERBOSE setting and other rcS variables # Load the VERBOSE setting and other rcS variables
[ -f /etc/default/rcS ] && . /etc/default/rcS [ -f /etc/default/rcS ] && . /etc/default/rcS
DAEMON_OPT="--user $YMPD_USER --webport $MPD_WEBHOST --host $MPD_HOST --port $MPD_PORT"
do_start() do_start()
{ {
start-stop-daemon --start --background --quiet --pidfile $PIDFILE --make-pidfile \ start-stop-daemon --start --background --quiet --pidfile $PIDFILE --make-pidfile \

4
contrib/ympd.default Normal file
View File

@ -0,0 +1,4 @@
MPD_HOST=localhost
MPD_PORT=6600
WEB_PORT=8080
YMPD_USER=nobody

View File

@ -6,8 +6,9 @@ Requires=network.target local-fs.target
Environment=MPD_HOST=localhost Environment=MPD_HOST=localhost
Environment=MPD_PORT=6600 Environment=MPD_PORT=6600
Environment=WEB_PORT=8080 Environment=WEB_PORT=8080
EnvironmentFile=-/etc/conf.d/ympd Environment=YMPD_USER=nobody
ExecStart=/usr/bin/ympd -h $MPD_HOST -p $MPD_PORT -w $WEB_PORT EnvironmentFile=/etc/default/ympd
ExecStart=/usr/bin/ympd --user $YMPD_USER --webport $MPD_WEBHOST --host $MPD_HOST --port $MPD_PORT
Type=simple Type=simple
[Install] [Install]

View File

@ -16,12 +16,6 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="css/mpd.min.css" rel="stylesheet"> <link href="css/mpd.min.css" rel="stylesheet">
<link href="assets/favicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon"> <link href="assets/favicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon">
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
<script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
<![endif]-->
</head> </head>
<body> <body>

2
ympd.1
View File

@ -1,6 +1,6 @@
.\" Manpage for ympd. .\" Manpage for ympd.
.\" Contact andy@ympd.org to correct errors or typos. .\" Contact andy@ympd.org to correct errors or typos.
.TH man 8 "18 Mar 2014" "1.2" "ympd man page" .TH man 1 "19 Oct 2014" "1.2.3" "ympd man page"
.SH NAME .SH NAME
ympd \- Standalone MPD Web GUI written in C, utilizing Websockets and Bootstrap/JS ympd \- Standalone MPD Web GUI written in C, utilizing Websockets and Bootstrap/JS
.SH SYNOPSIS .SH SYNOPSIS