[bzflag] 01/04: Remove Environment and EnvironmentFile from service file.

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository bzflag.

commit 0ab8a65720215dfc1ecc8adbc416c2aae563c9f8
Author: Markus Koschany <apo at debian.org>
Date:   Mon Dec 14 19:19:32 2015 +0100

    Remove Environment and EnvironmentFile from service file.
    
    The server is enabled by default it will not advertise itself. This behavior
    can be overridden by creating a custom service file in /etc/systemd/system.
    Document these changes in bzflag-server.README.Debian
    
    Restart the server on failure.
    
    Closes: #807911
---
 debian/bzflag-server.README.Debian  | 14 ++++++++++++--
 debian/bzflag-server.bzflag.service |  5 ++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/debian/bzflag-server.README.Debian b/debian/bzflag-server.README.Debian
index d4d772c..5cb595e 100644
--- a/debian/bzflag-server.README.Debian
+++ b/debian/bzflag-server.README.Debian
@@ -1,11 +1,21 @@
 bzflag-server for Debian
 ----------------------
 
+The server is enabled by default. It is a private server that will not
+advertise itself (-advertise NONE, see also man bzfs). You can override this
+behavior by creating a custom bzflag.service file in /etc/systemd/system. For
+all available command line options, please consult the manual page of bzfs. If
+you want to disable the server on startup, please run
+
+    systemctl disable bzflag.service
+
+
+The following information are only valid for the old sysV init system
+=====================================================================
+
 Since the bzflag server, bzfs, can be started from the bzflag client, it is not
 started by default on Debian systems. To have init(8) start bzflag by default,
 please change the value of the 'RUN_AT_STARTUP' flag in /etc/default/bzflag to
 'yes'. You can customise this server by modifying the 'OPTIONS' flag in
 /etc/default/bzflag. By default, we start a free-for-all server which does not
 advertise itself on the bzflag server list.
-
- -- Ryan Kavanagh <rak at debian.org>, Tue, 24 Jul 2012 09:05:14 -0400
diff --git a/debian/bzflag-server.bzflag.service b/debian/bzflag-server.bzflag.service
index f3b87bd..4fe61aa 100644
--- a/debian/bzflag-server.bzflag.service
+++ b/debian/bzflag-server.bzflag.service
@@ -4,11 +4,10 @@ Documentation=man:bzfs(6)
 After=network.target
 
 [Service]
-Environment="OPTIONS=-advertise NONE"
-EnvironmentFile=-/etc/default/bzflag
+Restart=on-failure
 User=games
 Group=games
-ExecStart=/usr/games/bzfs $OPTIONS
+ExecStart=/usr/games/bzfs -advertise NONE
 
 [Install]
 WantedBy=multi-user.target

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