Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

various patches: manpage, remove external js, init scripts #72

Merged
merged 3 commits into from
May 1, 2015
+17 −13
Merged

various patches: manpage, remove external js, init scripts #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1035264
manpage: set section to 1 and update version
jpleau May 1, 2015
3ef53f3
webpage: remove respond.js
jpleau May 1, 2015
5abfdfd
update init script and systemd service file
jpleau May 1, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions contrib/init.debian
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/bin/sh
### BEGIN INIT INFO
# Provides: ympd
# Required-Start: $local_fs $mpd
# Required-Stop: $local_fs $mpd
# Required-Start: $remote_fs mpd
# Required-Stop: $remote_fs mpd
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: Daemonized version of ympd.
Expand All @@ -20,8 +20,11 @@ PIDFILE=/var/run/$NAME.pid
SCRIPTNAME=/etc/init.d/$NAME
LOG_OUT=/var/log/$NAME.out
LOG_ERR=/var/log/$NAME.err
YMPD_USER=mpd
DAEMON_OPT="--user $YMPD_USER --webport 8080"
YMPD_USER=nobody
MPD_HOST=localhost
MPD_PORT=6600
WEB_PORT=8080


# Exit if the package is not installed
[ -x "$DAEMON" ] || exit 0
Expand All @@ -32,6 +35,8 @@ DAEMON_OPT="--user $YMPD_USER --webport 8080"
# Load the VERBOSE setting and other rcS variables
[ -f /etc/default/rcS ] && . /etc/default/rcS

DAEMON_OPT="--user $YMPD_USER --webport $MPD_WEBHOST --host $MPD_HOST --port $MPD_PORT"

do_start()
{
start-stop-daemon --start --background --quiet --pidfile $PIDFILE --make-pidfile \
Expand Down
4 changes: 4 additions & 0 deletions contrib/ympd.default
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
MPD_HOST=localhost
MPD_PORT=6600
WEB_PORT=8080
YMPD_USER=nobody
5 changes: 3 additions & 2 deletions contrib/ympd.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ Requires=network.target local-fs.target
Environment=MPD_HOST=localhost
Environment=MPD_PORT=6600
Environment=WEB_PORT=8080
EnvironmentFile=-/etc/conf.d/ympd
ExecStart=/usr/bin/ympd -h $MPD_HOST -p $MPD_PORT -w $WEB_PORT
Environment=YMPD_USER=nobody
EnvironmentFile=/etc/default/ympd
ExecStart=/usr/bin/ympd --user $YMPD_USER --webport $MPD_WEBHOST --host $MPD_HOST --port $MPD_PORT
Type=simple

[Install]
Expand Down
6 changes: 0 additions & 6 deletions htdocs/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,6 @@
<!-- Custom styles for this template -->
<link href="css/mpd.min.css" rel="stylesheet">
<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>
<body>

Expand Down
2 changes: 1 addition & 1 deletion ympd.1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.\" Manpage for ympd.
.\" 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
ympd \- Standalone MPD Web GUI written in C, utilizing Websockets and Bootstrap/JS
.SH SYNOPSIS
Expand Down