This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch quake in repository game-data-packager.
commit 840cece1d7fb7b4ebc609c1bd60fa4fcf3d2c3a4 Author: Simon McVittie <s...@debian.org> Date: Thu Jan 22 09:59:44 2015 +0000 Partially sync server configuration from openjk and iortcw - deprecate START_DAEMON - make /etc/quake*-server available as etc/quake*-server in the game engine's search path so it's more obvious what is being exec'd (leave the debian_server.cfg symlink in for compatibility) --- debian/changelog | 5 +++++ debian/quake-server.README.Debian | 38 +++++++++++++++++++++----------------- debian/quake-server.default | 6 ++++-- debian/quake-server.init | 5 +++++ debian/quake-server.links | 3 ++- debian/quake2-server.README.Debian | 38 ++++++++++++++++---------------------- debian/quake2-server.default | 3 ++- debian/quake2-server.links | 5 ++++- debian/quake3-server.README.Debian | 27 ++++++++++++++++----------- debian/quake3-server.default | 8 ++------ debian/quake3-server.init | 5 +++++ debian/quake3-server.links | 3 ++- 12 files changed, 84 insertions(+), 62 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7f1d80c..03a54f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,11 @@ quake (9) UNRELEASED; urgency=medium game-data-packager 39) * Add desktop file for Quake III: Team Arena (requires quake3-team-arena from game-data-packager 39) and install its icon + * Partially sync server configuration from openjk and iortcw: + - deprecate START_DAEMON + - make /etc/quake*-server available as etc/quake*-server in the game + engine's search path so it's more obvious what is being exec'd (leave + the debian_server.cfg symlink in for compatibility) -- Simon McVittie <s...@debian.org> Tue, 20 Jan 2015 08:57:12 +0000 diff --git a/debian/quake-server.README.Debian b/debian/quake-server.README.Debian index ea858df..1f31c28 100644 --- a/debian/quake-server.README.Debian +++ b/debian/quake-server.README.Debian @@ -1,8 +1,8 @@ Quake dedicated server for Debian ================================= -Running the server via sysvinit -------------------------------- +Running the server via the init script +-------------------------------------- By default, quake-server adds a user under which to run the dedicated server (quake-server) and sets it up to be run by an init script in the conventional @@ -13,27 +13,31 @@ The quake-server user's home directory is /var/games/quake-server, so you can find Quake files in /var/games/quake-server/.quakespasm, /var/games/quake-server/.darkplaces or whatever. -By default, the init script will use -/usr/share/games/quake/id1/debian_server.cfg, which is a symlink to -/etc/quake-server/server.cfg. You can edit this file, or put an alternative -configuration in /var/games/quake-server/.quakespasm/id1 (or whatever is the -appropriate directory for your selected engine) and change -/etc/default/quake-server to exec that. +The /etc/quake-server directory is symlinked into the game engine's +search path as etc/quake-server, so you can place files there and execute +them with commands like "exec etc/quake-server/ctf.cfg". +By default, the init script will use etc/quake-server/server.cfg. -There are various alternative ways you can run the server if this doesn't -meet your requirements. +For compatibility with older versions of the quake-server package, +debian_server.cfg in the engine's search path is also a symlink to +etc/quake-server/server.cfg. -Disabling the init script -------------------------- +The server can be managed in the usual way, e.g. via service(8) +and update-rc.d(8) commands like -To stop the server: + service quake-server stop + service quake-server start + update-rc.d quake-server disable + update-rc.d quake-server enable - /etc/init.d/quake-server stop +which should work for all of Debian's supported init systems. -To prevent it from running again, either edit /etc/default/quake-server -and set START_DAEMON to 0, or use update-rc.d: +Disabling the init script +------------------------- - update-rc.d quake-server disable +To disable the init script, use update-rc.d as described above. +Changing the value of the START_DAEMON variable in +/etc/default/quake-server is deprecated and should not be used. Running the server with cron and screen --------------------------------------- diff --git a/debian/quake-server.default b/debian/quake-server.default index ab2ce2d..04e0485 100644 --- a/debian/quake-server.default +++ b/debian/quake-server.default @@ -2,8 +2,10 @@ # sourced by /etc/init.d/quake-server # installed at /etc/default/quake-server by the maintainer scripts -# set to 1 to enable +# Setting this to any value other than 1 is deprecated. If you want to +# disable the server, please use "update-rc.d quake-server disable" instead. START_DAEMON=1 # Additional options that are passed to the daemon. -DAEMON_OPTS="+exec debian_server.cfg" +# For most options it's better to edit server.cfg instead. +DAEMON_OPTS="+exec etc/quake-server/server.cfg" diff --git a/debian/quake-server.init b/debian/quake-server.init index 0b064ae..d616ed3 100644 --- a/debian/quake-server.init +++ b/debian/quake-server.init @@ -26,6 +26,11 @@ if [ -f /etc/default/$NAME ] ; then . /etc/default/$NAME fi +if [ "x$START_DAEMON" != x1 ]; then + echo "Disabling $NAME via START_DAEMON in /etc/default/$NAME is deprecated." >&2 + echo "Please use \"update-rc.d $NAME disable\" instead" >&2 +fi + do_start() { if [ -f $PIDFILE ]; then return 2 diff --git a/debian/quake-server.links b/debian/quake-server.links index c42451a..e736890 100644 --- a/debian/quake-server.links +++ b/debian/quake-server.links @@ -1 +1,2 @@ -etc/quake-server/server.cfg usr/share/games/quake/id1/debian_server.cfg +etc/quake-server usr/share/games/quake/id1/etc/quake-server +etc/quake-server/server.cfg usr/share/games/quake/id1/debian_server.cfg diff --git a/debian/quake2-server.README.Debian b/debian/quake2-server.README.Debian index 2d28d22..4dbd35f 100644 --- a/debian/quake2-server.README.Debian +++ b/debian/quake2-server.README.Debian @@ -1,8 +1,8 @@ Quake II dedicated server for Debian ==================================== -Running the server via sysvinit -------------------------------- +Running the server via the init script +-------------------------------------- By default, quake2-server adds a user under which to run the dedicated server (quake2-server) and sets it up to be run by an init script in the conventional @@ -12,30 +12,24 @@ machine; by default it will run a deathmatch game. The quake2-server user's home directory is /var/games/quake2-server, so you can find Quake files in /var/games/quake2-server/.yq2 or similar. -By default, if you have the full Quake II data, the init script will use -/usr/share/games/quake2/baseq2/debian_server.cfg, which is a symlink to -/etc/quake2-server/debian_server.cfg. You can edit this file, or put an -alternative configuration in /var/games/quake2-server/.yq2/baseq2 (or -whatever is the appropriate directory for your selected engine) and change -/etc/default/quake2-server to exec that. +The /etc/quake2-server directory is symlinked into the game engine's +search path as etc/quake2-server, so you can place files there and execute +them with commands like "exec etc/quake2-server/ctf.cfg". +By default, the init script will use etc/quake2-server/server.cfg. -If you only have the demo data, the init script will use -/usr/share/games/quake2-demo/baseq2/debian_server.cfg, -which is a similar symlink to /etc/quake2-server/demo/debian_server.cfg. +For compatibility with older versions of the quake-server package, +debian_server.cfg in the engine's search path is also a symlink to +etc/quake2-server/server.cfg. -There are various alternative ways you can run the server if this doesn't -meet your requirements. - -Disabling the init script -------------------------- - -To stop the server: - - /etc/init.d/quake2-server stop - -To prevent it from running again, use update-rc.d: +The server can be managed in the usual way, e.g. via service(8) +and update-rc.d(8) commands like + service quake2-server stop + service quake2-server start update-rc.d quake2-server disable + update-rc.d quake2-server enable + +which should work for all of Debian's supported init systems. Running the server with cron and screen --------------------------------------- diff --git a/debian/quake2-server.default b/debian/quake2-server.default index cf0182e..3b21382 100644 --- a/debian/quake2-server.default +++ b/debian/quake2-server.default @@ -3,4 +3,5 @@ # installed at /etc/default/quake2-server by the maintainer scripts # Additional options that are passed to the daemon. -DAEMON_OPTS="+exec debian_server.cfg" +# For most options it's better to edit server.cfg instead. +DAEMON_OPTS="+exec etc/quake2-server/server.cfg" diff --git a/debian/quake2-server.links b/debian/quake2-server.links index d500b44..c8fe0d8 100644 --- a/debian/quake2-server.links +++ b/debian/quake2-server.links @@ -1,2 +1,5 @@ -etc/quake2-server/debian_server.cfg usr/share/games/quake2/baseq2/debian_server.cfg +etc/quake2-server usr/share/games/quake2/baseq2/etc/quake2-server +etc/quake2-server/debian_server.cfg usr/share/games/quake2/baseq2/debian_server.cfg + +etc/quake2-server usr/share/games/quake2-demo/baseq2/etc/quake2-server etc/quake2-server/demo/debian_server.cfg usr/share/games/quake2-demo/baseq2/debian_server.cfg diff --git a/debian/quake3-server.README.Debian b/debian/quake3-server.README.Debian index e0e8ddb..3de22a5 100644 --- a/debian/quake3-server.README.Debian +++ b/debian/quake3-server.README.Debian @@ -12,24 +12,29 @@ Quake III Arena deathmatch maps. The Debian-quake3 user's home directory is /var/games/quake3-server, so you can find Quake III files in the /var/games/quake3-server/.q3a directory. -By default, the init script will use -/usr/share/games/quake3/baseq3/debian_server.cfg, which is a symlink to -/etc/quake3-server/server.cfg. You can edit this file, or put an alternative -configuration in /var/games/quake3-server/.q3a/baseq3 and change -/etc/default/quake3-server to exec that. +The /etc/quake3-server directory is symlinked into the game engine's +search path as etc/quake3-server, so you can place files there and execute +them with commands like "exec etc/quake3-server/ctf.cfg". +By default, the init script will use etc/quake3-server/server.cfg. -Disabling the init script -------------------------- +For compatibility with older versions of the quake-server package, +debian_server.cfg in the engine's search path is also a symlink to +etc/quake3-server/server.cfg. -To disable the init script, use the facilities provided by your init system. -For instance, under sysvinit, use +The server can be managed in the usual way, e.g. via service(8) +and update-rc.d(8) commands like + service quake3-server stop + service quake3-server start update-rc.d quake3-server disable + update-rc.d quake3-server enable -or under systemd, use +which should work for all of Debian's supported init systems. - ln -s /dev/null /etc/systemd/system/quake3-server.service +Disabling the init script +------------------------- +To disable the init script, use update-rc.d as described above. Changing the value of the START_DAEMON variable in /etc/default/quake3-server is deprecated. Please leave it set to "unless-disabled-by-upgrade". diff --git a/debian/quake3-server.default b/debian/quake3-server.default index 3f27f37..8d725f4 100644 --- a/debian/quake3-server.default +++ b/debian/quake3-server.default @@ -8,9 +8,5 @@ START_DAEMON=unless-disabled-by-upgrade # Additional options that are passed to the daemon. -# Add "+set dedicated 2" here, or "set dedicated 2" in server.cfg, if you want -# your server advertised on the public server list. -# -# debian_server.cfg is a symlink to /etc/quake3-server/server.cfg, so you can -# use that file for system-wide configuration. -DAEMON_OPTS="+exec debian_server.cfg" +# For most options it's better to edit server.cfg instead. +DAEMON_OPTS="+exec etc/quake3-server/server.cfg" diff --git a/debian/quake3-server.init b/debian/quake3-server.init index c6cff31..8b767a4 100644 --- a/debian/quake3-server.init +++ b/debian/quake3-server.init @@ -27,6 +27,11 @@ if [ -f /etc/default/$NAME ] ; then . /etc/default/$NAME fi +if [ "x$START_DAEMON" != xunless-disabled-by-upgrade ] && [ "x$START_DAEMON" != x1 ]; then + echo "Disabling $NAME via START_DAEMON in /etc/default/$NAME is deprecated." >&2 + echo "Please use \"update-rc.d $NAME disable\" instead" >&2 +fi + q3_start() { if [ "$START_DAEMON" = "unless-disabled-by-upgrade" ]; then if [ -e /var/games/quake3-server/init-script-disabled-by-upgrade ]; then diff --git a/debian/quake3-server.links b/debian/quake3-server.links index 82ba523..64fc61f 100644 --- a/debian/quake3-server.links +++ b/debian/quake3-server.links @@ -1 +1,2 @@ -etc/quake3-server/server.cfg usr/share/games/quake3/baseq3/debian_server.cfg +etc/quake3-server usr/share/games/quake3/baseq3/etc/quake3-server +etc/quake3-server/server.cfg usr/share/games/quake3/baseq3/debian_server.cfg -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits