[pkg-bacula-commits] [bacula] 01/01: Merge branch 'migrate-files' into systemd-fixuser

[Sven Hartge]

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

hartge-guest pushed a commit to branch systemd-fixuser
in repository bacula.

commit a54eec5d8d53cc2f80b4949cda26f72e052179d4
Merge: bec2010 88289d2
Author: Sven Hartge <sven at svenhartge.de>
Date:   Mon Aug 29 13:21:12 2016 +0200

    Merge branch 'migrate-files' into systemd-fixuser

 debian/TODO                            | 28 ++++++++------
 debian/additions/common-functions.dpkg |  1 +
 debian/additions/common-functions.init | 18 +++++++--
 debian/additions/postinst-common       | 31 ---------------
 debian/bacula-common.manpages          |  1 -
 debian/bacula-common.postrm            |  2 +-
 debian/bacula-director-db.postinst.in  | 64 +++++++++++++++++--------------
 debian/bacula-director-db.postrm.in    | 19 +++++-----
 debian/bacula-director.init            |  5 +--
 debian/bacula-director.install         |  1 -
 debian/bacula-director.postinst        | 69 ++++++++++++++++++++++++++++++++++
 debian/bacula-director.postrm          | 16 ++++++++
 debian/bacula-fd.init                  |  4 +-
 debian/bacula-sd.init                  |  4 +-
 debian/changelog                       |  8 +++-
 debian/rules                           | 10 ++++-
 16 files changed, 183 insertions(+), 98 deletions(-)

diff --cc debian/bacula-fd.init
index 2f3771b,48f38af..36dfa7b
--- a/debian/bacula-fd.init
+++ b/debian/bacula-fd.init
@@@ -45,19 -42,12 +45,19 @@@ if [ -r /etc/default/$NAME ]; the
  	. /etc/default/$NAME
  fi
  
 +ENABLE_NONROOT="${ENABLE_NONROOT:-false}"
 +
 +if [ "$ENABLE_NONROOT" = "true" ]; then 
 +	BUSER="bacula"
 +	BGROUP="bacula"
 +	KEEPCAPS="-k"
 +fi
 +
  CONFIG="${CONFIG:-/etc/bacula/$NAME.conf}"
  
- create_var_run_dir
+ create_run_dir
  
- PIDFILE=/var/run/bacula/$NAME.$PORT.pid
 -
+ PIDFILE=/run/bacula/$NAME.$PORT.pid
  
  do_start()
  {
diff --cc debian/changelog
index 60610b8,6dad477..b2d9d6d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,5 +1,17 @@@
 +bacula (7.4.3+dfsg-4~fixuser1) UNRELEASED; urgency=medium
 +
 +  [ Sven Hartge ]
 +  * remove configuration option to change runtime user for director
 +    and storage daemon
 +  * add capability cap_dac_read_search to bacula-fd, making it possible
 +    to run as non-root in the future.
 +  * change bacula-fd init-script to make running as non-root configurable
 +    by the admin via /etc/default/bacula-fd
 +
 + -- Sven Hartge <sven at svenhartge.de>  Tue, 18 Jul 2016 23:59:59 +0200
 +
  bacula (7.4.3+dfsg-4) experimental; urgency=medium
  
-   * bacula-director-DBTYPE: let dbconfig create a sourceable shell script
-     with database information
    * Fix init scripts to make sure the daemons can be stopped before
      upgrades or when /etc/defaults/bacula-* were edited
      (merged from 7.4.3+dfsg-1+sid1)

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