diff --git a/CMakeLists.txt b/CMakeLists.txt index ea24956..c68deed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,10 +52,8 @@ endif() install(TARGETS ympd DESTINATION bin) +install(FILES ympd.1 DESTINATION man) install(DIRECTORY htdocs DESTINATION share/${PROJECT_NAME}) install(FILES contrib/init.debian DESTINATION /etc/init.d PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE RENAME ${PROJECT_NAME}) -install(FILES contrib/default.debian DESTINATION /etc/default/${PROJECT_NAME} - RENAME ${PROJECT_NAME}) - diff --git a/contrib/default.debian b/contrib/default.debian deleted file mode 100644 index be9940b..0000000 --- a/contrib/default.debian +++ /dev/null @@ -1,6 +0,0 @@ -# Set this to the user and group the ympd should get after socket opening. -YMPD_USER=ympd -YMPD_GROUP=ympd - -# See ympd --help for more options -DAEMON_OPT="--uid $YMPD_USER --gid $YMPD_GROUP" diff --git a/contrib/init.debian b/contrib/init.debian index a3e33fe..483d7af 100755 --- a/contrib/init.debian +++ b/contrib/init.debian @@ -20,9 +20,9 @@ PIDFILE=/var/run/$NAME.pid SCRIPTNAME=/etcinit.d/$NAME LOG_OUT=/var/log/$NAME.out LOG_ERR=/var/log/$NAME.err -YMPD_USER=ympd -YMPD_GROUP=ympd -DAEMON_OPT="--uid $YMPD_USER --gid $YMPD_GROUP" +YMPD_USER=mpd +YMPD_GROUP=mpd +DAEMON_OPT="--uid $YMPD_USER --gid $YMPD_GROUP --webport 80" # Exit if the package is not installed [ -x "$DAEMON" ] || exit 0