[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 ab3117c68d51dfe4f82c3e44d357d5f673c881e9
Merge: 2c96941 98996d5
Author: Sven Hartge <sven at svenhartge.de>
Date:   Tue Sep 6 14:31:13 2016 +0200

    Merge branch 'migrate-files' into systemd-fixuser

 debian/README.Debian                               | 74 ++++++++-----------
 debian/TODO                                        |  8 ++-
 debian/additions/common-functions.dpkg             | 83 +++-------------------
 .../additions/sqlite3/delete_catalog_backup.md5sum |  1 -
 debian/bacula-common.preinst                       |  2 -
 debian/bacula-director-db.postinst.in              | 71 +-----------------
 debian/bacula-director-db.templates.in             | 18 -----
 debian/bacula-director-sqlite3.install             |  1 -
 debian/bacula-director.postinst                    | 62 +++++++++++-----
 debian/bacula-fd.postinst                          |  4 +-
 debian/bacula-sd.postinst                          |  2 +-
 debian/changelog                                   |  5 +-
 debian/po/POTFILES.in                              |  1 -
 debian/po/cs.po                                    | 45 ------------
 debian/po/da.po                                    | 45 ------------
 debian/po/de.po                                    | 46 ------------
 debian/po/es.po                                    | 73 -------------------
 debian/po/fr.po                                    | 46 ------------
 debian/po/gl.po                                    | 48 -------------
 debian/po/it.po                                    | 47 ------------
 debian/po/ja.po                                    | 45 ------------
 debian/po/nl.po                                    | 46 ------------
 debian/po/pl.po                                    | 48 -------------
 debian/po/pt.po                                    | 46 ------------
 debian/po/pt_BR.po                                 | 46 ------------
 debian/po/ru.po                                    | 47 ------------
 debian/po/sv.po                                    | 47 ------------
 debian/po/templates.pot                            | 41 -----------
 debian/po/tr.po                                    | 47 ------------
 29 files changed, 97 insertions(+), 998 deletions(-)

diff --cc debian/bacula-fd.postinst
index 113f411,3edfc64..786de18
--- a/debian/bacula-fd.postinst
+++ b/debian/bacula-fd.postinst
@@@ -20,17 -20,7 +20,17 @@@ case "$1" i
  		-e s~XXX_MONFDPASSWORD_XXX~$FDMPASSWD~ \
  		-i $TARGET
  	fi
 +	
 +	# If we have setcap installed, try setting cap_dac_read_search+ep,
 +	# which allows running bacula-fd as non-root.
 +	if command -v setcap > /dev/null; then
 +	    if ! setcap cap_dac_read_search+ep /usr/sbin/bacula-fd; then
 +	        echo "setcap failed on /usr/sbin/bacula-fd, running bacula-fd as non-root not possible" >&2
 +	    fi
 +	else
 +	    echo "setcap is not installed, running bacula-fd as non-root not possible" >&2
 +	fi  
-     ;; 
+     ;;
  esac
  
  # dh_installdeb will replace this with shell code automatically

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