[openarena] 08/15: Symlink all of /etc/openarena-server into the OpenArena search path as etc/openarena-server, so "exec etc/openarena-server/server.cfg" now works

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch master
in repository openarena.

commit a7fe136677d54214e2c542b332d79f0caa129b60
Author: Simon McVittie <smcv at debian.org>
Date:   Mon Aug 18 15:29:42 2014 +0100

    Symlink all of /etc/openarena-server into the OpenArena search path as etc/openarena-server, so "exec etc/openarena-server/server.cfg" now works
---
 debian/changelog                      |  3 +++
 debian/openarena-server.README.Debian | 20 ++++++++++++--------
 debian/openarena-server.default       |  4 ++--
 debian/openarena-server.links         |  2 ++
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d6e5de7..563e3e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,9 @@ openarena (0.8.8-10) UNRELEASED; urgency=low
   * Use LDFLAGS on non-Linux too
   * Standards-Version: 3.9.5 (no changes needed)
   * Canonicalize Vcs-Git, Vcs-Browser
+  * Symlink all of /etc/openarena-server into the OpenArena search path
+    as etc/openarena-server, so "exec etc/openarena-server/server.cfg"
+    now works
 
  -- Simon McVittie <smcv at debian.org>  Sat, 18 May 2013 22:03:16 +0100
 
diff --git a/debian/openarena-server.README.Debian b/debian/openarena-server.README.Debian
index 82926f2..b771d5f 100644
--- a/debian/openarena-server.README.Debian
+++ b/debian/openarena-server.README.Debian
@@ -12,10 +12,10 @@ The Debian-openarena user's home directory is /var/games/openarena-server,
 so you can find OA files in the /var/games/openarena-server/.openarena
 directory.
 
-By default, the init script will use
-/usr/lib/openarena-server/baseoa/debian_server.cfg, which is a symlink to
-/etc/openarena-server/server.cfg. You can edit this file, or put an alternative
-configuration in /var/games/openarena-server/.openarena/baseoa and change
+By default, the init script will use etc/openarena-server/server.cfg,
+which is a symlink to /etc/openarena-server/server.cfg. You can edit
+this file, or put an alternative configuration in
+/var/games/openarena-server/.openarena/baseoa and change
 /etc/default/openarena-server to exec that.
 
 The server can be managed in the usual way, e.g. via the recommended
@@ -24,6 +24,10 @@ service(8) command:
     service openarena-server stop
     service openarena-server start
 
+The whole /etc/openarena-server directory is symlinked into the engine's
+search path as etc/openarena-server, so you can place files there and
+exec them with commands like "/exec etc/openarena-server/ctf.cfg".
+
 Disabling the init script
 -------------------------
 
@@ -51,13 +55,13 @@ don't overwrite each other's configuration files.
 To do this, you could put something like this in the Debian-openarena user's
 crontab (don't break the long lines!):
 
-    @reboot screen -d -m -S ffa /usr/games/openarena-server +set fs_homepath /var/games/openarena-server/ffa +exec ffa.cfg
-    @reboot screen -d -m -S ctf /usr/games/openarena-server +set fs_homepath /var/games/openarena-server/ctf +set net_port 54321 +exec ctf.cfg
+    @reboot screen -d -m -S ffa /usr/games/openarena-server +set fs_homepath /var/games/openarena-server/ffa +exec etc/openarena-server/ffa.cfg
+    @reboot screen -d -m -S ctf /usr/games/openarena-server +set fs_homepath /var/games/openarena-server/ctf +set net_port 54321 +exec etc/openarena-server/ctf.cfg
 
 or in /etc/crontab or a file in /etc/cron.d:
 
-    @reboot Debian-openarena screen -d -m -S ffa /usr/games/openarena-server +set fs_homepath /var/games/openarena-server/ffa +exec ffa.cfg
-    @reboot Debian-openarena screen -d -m -S ctf /usr/games/openarena-server +set fs_homepath /var/games/openarena-server/ctf +set net_port 54321 +exec ctf.cfg
+    @reboot Debian-openarena screen -d -m -S ffa /usr/games/openarena-server +set fs_homepath /var/games/openarena-server/ffa +exec etc/openarena-server/ffa.cfg
+    @reboot Debian-openarena screen -d -m -S ctf /usr/games/openarena-server +set fs_homepath /var/games/openarena-server/ctf +set net_port 54321 +exec etc/openarena-server/ctf.cfg
 
 If you do that, you can access the servers' consoles by attaching a screen
 session to them:
diff --git a/debian/openarena-server.default b/debian/openarena-server.default
index b32e21b..6ebf7b1 100644
--- a/debian/openarena-server.default
+++ b/debian/openarena-server.default
@@ -11,6 +11,6 @@ START_DAEMON=unless-disabled-by-upgrade
 # 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/openarena-server/server.cfg, so you
+# server.cfg is a symlink to /etc/openarena-server/server.cfg, so you
 # can use that file for system-wide configuration.
-DAEMON_OPTS="+exec debian_server.cfg"
+DAEMON_OPTS="+exec etc/openarena-server/server.cfg"
diff --git a/debian/openarena-server.links b/debian/openarena-server.links
index b24a4f2..87c216e 100644
--- a/debian/openarena-server.links
+++ b/debian/openarena-server.links
@@ -1,3 +1,5 @@
+etc/openarena-server usr/lib/openarena-server/baseoa/etc/openarena-server
+# backwards compat with older openarena-server
 etc/openarena-server/server.cfg usr/lib/openarena-server/baseoa/debian_server.cfg
 usr/share/doc/openarena-data/changelog.gz usr/share/doc/openarena-server/changelog.gz
 usr/share/doc/openarena-088-data/CREDITS-0.8.8 usr/share/doc/openarena-server/CREDITS

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openarena.git