Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'bareos-16.2'
  • Loading branch information
Marco van Wieringen committed Aug 29, 2016
2 parents cae6abe + 1a8ba8f commit 2fb23cb
Show file tree
Hide file tree
Showing 59 changed files with 810 additions and 763 deletions.
4 changes: 0 additions & 4 deletions autoconf/configure.in
Expand Up @@ -4241,13 +4241,9 @@ debian|ubuntu|univention)
debian/bareos-filedaemon.postinst \
debian/bareos-filedaemon.preinst \
debian/bareos-storage-ceph.install \
debian/bareos-storage-ceph.postinst \
debian/bareos-storage-glusterfs.install \
debian/bareos-storage-glusterfs.postinst \
debian/bareos-storage-fifo.postinst \
debian/bareos-storage-fifo.install \
debian/bareos-storage-python-plugin.install \
debian/bareos-storage-tape.postinst \
debian/bareos-storage-tape.install \
debian/bareos-storage.bareos-sd.init \
debian/bareos-storage.install \
Expand Down
4 changes: 0 additions & 4 deletions configure
Expand Up @@ -33435,13 +33435,9 @@ debian|ubuntu|univention)
debian/bareos-filedaemon.postinst \
debian/bareos-filedaemon.preinst \
debian/bareos-storage-ceph.install \
debian/bareos-storage-ceph.postinst \
debian/bareos-storage-glusterfs.install \
debian/bareos-storage-glusterfs.postinst \
debian/bareos-storage-fifo.postinst \
debian/bareos-storage-fifo.install \
debian/bareos-storage-python-plugin.install \
debian/bareos-storage-tape.postinst \
debian/bareos-storage-tape.install \
debian/bareos-storage.bareos-sd.init \
debian/bareos-storage.install \
Expand Down
1 change: 1 addition & 0 deletions debian/bareos-director.dirs
Expand Up @@ -13,4 +13,5 @@
/etc/bareos/bareos-dir.d/schedule
/etc/bareos/bareos-dir.d/storage
/etc/bareos/bareos-dir-export/
/etc/bareos/bareos-dir-export/client
/usr/lib/bareos
3 changes: 2 additions & 1 deletion debian/bareos-director.install.in
Expand Up @@ -22,10 +22,11 @@
@confdir@/bareos-dir.d/pool/Full.conf @configtemplatedir@/bareos-dir.d/pool/
@confdir@/bareos-dir.d/pool/Incremental.conf @configtemplatedir@/bareos-dir.d/pool/
@confdir@/bareos-dir.d/pool/Scratch.conf @configtemplatedir@/bareos-dir.d/pool/
@confdir@/bareos-dir.d/profile/operator.conf @configtemplatedir@/bareos-dir.d/profile/
@confdir@/bareos-dir.d/schedule/WeeklyCycleAfterBackup.conf @configtemplatedir@/bareos-dir.d/schedule/
@confdir@/bareos-dir.d/schedule/WeeklyCycle.conf @configtemplatedir@/bareos-dir.d/schedule/
@confdir@/bareos-dir.d/storage/File.conf @configtemplatedir@/bareos-dir.d/storage/
@confdir@/tray-monitor.d/director/Director-local*.conf
@confdir@/tray-monitor.d/director/Director-local*.conf @configtemplatedir@/tray-monitor.d/director/
/usr/sbin/bareos-dir
/usr/share/man/man8/bareos-dir.8.gz
/usr/share/man/man8/bareos.8.gz
11 changes: 3 additions & 8 deletions debian/bareos-director.postinst.in
Expand Up @@ -25,18 +25,13 @@ CONFIGDIR="/etc/bareos/bareos-dir.d/"

permissions()
{
for dir in ${CONFIGDIR} /etc/bareos/bareos-dir-export/; do
chown ${daemon_user}:${daemon_group} ${dir}
chmod 750 ${dir}
done
chown ${daemon_user}:${daemon_group} /etc/bareos/bareos-dir-export/
chmod 750 /etc/bareos/bareos-dir-export/
}

case "$1" in
configure)
if ! /usr/lib/bareos/scripts/bareos-config has_config "bareos-dir"; then
/usr/lib/bareos/scripts/bareos-config deploy_config "$DEFCONFIGDIR" "$CONFIGDIR"
/usr/lib/bareos/scripts/bareos-config initialize_local_hostname
/usr/lib/bareos/scripts/bareos-config initialize_passwords
if /usr/lib/bareos/scripts/bareos-config deploy_config "$DEFCONFIGDIR" "$CONFIGDIR"; then
/usr/lib/bareos/scripts/bareos-config initialize_database_driver
/usr/lib/bareos/scripts/bareos-config apply_dbconfig_settings
fi
Expand Down
2 changes: 1 addition & 1 deletion debian/bareos-filedaemon.install.in
Expand Up @@ -2,7 +2,7 @@
@confdir@/bareos-fd.d/director/bareos-dir.conf @configtemplatedir@/bareos-fd.d/director/
@confdir@/bareos-fd.d/director/bareos-mon.conf @configtemplatedir@/bareos-fd.d/director/
@confdir@/bareos-fd.d/messages/Standard.conf @configtemplatedir@/bareos-fd.d/messages/
@confdir@/tray-monitor.d/client/FileDaemon-local*.conf
@confdir@/tray-monitor.d/client/FileDaemon-local*.conf @configtemplatedir@/tray-monitor.d/client/
/usr/sbin/bareos-fd
@plugindir@/bpipe-fd.so
/usr/share/man/man8/bareos-fd.8.gz
23 changes: 1 addition & 22 deletions debian/bareos-filedaemon.postinst.in
Expand Up @@ -17,33 +17,12 @@ set -e
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package

daemon_user=bareos
daemon_group=bareos

#director_daemon_user=$daemon_user
#storage_daemon_user=$daemon_user
file_daemon_user=root
#storage_daemon_group=$daemon_group

DEFCONFIGDIR="@configtemplatedir@/bareos-fd.d/"
CONFIGDIR="/etc/bareos/bareos-fd.d/"



permissions()
{
chown ${file_daemon_user}:${daemon_group} ${CONFIGDIR}
chmod 750 ${CONFIGDIR}
}

case "$1" in
configure)
if ! /usr/lib/bareos/scripts/bareos-config has_config "bareos-fd"; then
/usr/lib/bareos/scripts/bareos-config deploy_config "$DEFCONFIGDIR" "$CONFIGDIR"
/usr/lib/bareos/scripts/bareos-config initialize_local_hostname
/usr/lib/bareos/scripts/bareos-config initialize_passwords
fi
permissions
/usr/lib/bareos/scripts/bareos-config deploy_config "$DEFCONFIGDIR" "$CONFIGDIR" || true
# on Univention distributions the ucr command allows to open the firewall
if [ -x "/etc/init.d/univention-firewall" ] && which ucr >/dev/null 2>&1; then
ucr set \
Expand Down
1 change: 1 addition & 0 deletions debian/bareos-storage-ceph.install.in
@@ -1,4 +1,5 @@
@backenddir@/libbareossd-rados*.so
@backenddir@/libbareossd-cephfs*.so
@confdir@/bareos-dir.d/storage/Rados.conf.example
@confdir@/bareos-sd.d/device/RadosStorage.conf.example

45 changes: 0 additions & 45 deletions debian/bareos-storage-ceph.postinst.in

This file was deleted.

1 change: 1 addition & 0 deletions debian/bareos-storage-fifo.install.in
@@ -1,2 +1,3 @@
@backenddir@/libbareossd-fifo*.so
@confdir@/bareos-dir.d/storage/NULL.conf.example
@confdir@/bareos-sd.d/device/NULL.conf.example
45 changes: 0 additions & 45 deletions debian/bareos-storage-fifo.postinst.in

This file was deleted.

1 change: 1 addition & 0 deletions debian/bareos-storage-glusterfs.install.in
@@ -1,2 +1,3 @@
@backenddir@/libbareossd-gfapi*.so
@confdir@/bareos-dir.d/storage/Gluster.conf.example
@confdir@/bareos-sd.d/device/GlusterStorage.conf.example
45 changes: 0 additions & 45 deletions debian/bareos-storage-glusterfs.postinst.in

This file was deleted.

3 changes: 2 additions & 1 deletion debian/bareos-storage-tape.install.in
@@ -1,5 +1,6 @@
/etc/bareos/mtx-changer.conf
@confdir@/bareos-sd.d/device/autochanger-0.conf.example
@confdir@/bareos-dir.d/storage/Tape.conf.example
@confdir@/bareos-sd.d/autochanger/autochanger-0.conf.example
@confdir@/bareos-sd.d/device/tapedrive-0.conf.example
@backenddir@/libbareossd-gentape*.so
@backenddir@/libbareossd-tape*.so
Expand Down
45 changes: 0 additions & 45 deletions debian/bareos-storage-tape.postinst.in

This file was deleted.

2 changes: 1 addition & 1 deletion debian/bareos-storage.install.in
Expand Up @@ -5,6 +5,6 @@
@confdir@/bareos-sd.d/director/bareos-mon.conf @configtemplatedir@/bareos-sd.d/director/
@confdir@/bareos-sd.d/messages/Standard.conf @configtemplatedir@/bareos-sd.d/messages/
@confdir@/bareos-sd.d/storage/bareos-sd.conf @configtemplatedir@/bareos-sd.d/storage/
@confdir@/tray-monitor.d/storage/StorageDaemon-local*.conf
@confdir@/tray-monitor.d/storage/StorageDaemon-local*.conf @configtemplatedir@/tray-monitor.d/storage/
/usr/sbin/bareos-sd
/usr/share/man/man8/bareos-sd.8.gz
8 changes: 1 addition & 7 deletions debian/bareos-storage.postinst.in
Expand Up @@ -32,19 +32,13 @@ CONFIGDIR="/etc/bareos/bareos-sd.d/"

permissions()
{
chown ${storage_daemon_user}:${daemon_group} ${CONFIGDIR}
chmod 750 ${CONFIGDIR}
chown ${storage_daemon_user}:${daemon_group} /var/lib/bareos/storage/
chmod 750 /var/lib/bareos/storage/
}

case "$1" in
configure)
if ! /usr/lib/bareos/scripts/bareos-config has_config "bareos-sd"; then
/usr/lib/bareos/scripts/bareos-config deploy_config "$DEFCONFIGDIR" "$CONFIGDIR"
/usr/lib/bareos/scripts/bareos-config initialize_local_hostname
/usr/lib/bareos/scripts/bareos-config initialize_passwords
fi
/usr/lib/bareos/scripts/bareos-config deploy_config "$DEFCONFIGDIR" "$CONFIGDIR" || true
permissions
/usr/lib/bareos/scripts/bareos-config setup_sd_user
# on Univention distributions the ucr command allows to open the firewall
Expand Down
10 changes: 3 additions & 7 deletions debian/bareos-traymonitor.postinst.in
Expand Up @@ -25,17 +25,13 @@ CONFIGDIR="/etc/bareos/tray-monitor.d/"

permissions()
{
chown root:${daemon_group} ${CONFIGDIR}
chmod 755 ${CONFIGDIR}
chown -R root:${daemon_group} ${CONFIGDIR}
chmod -R 755 ${CONFIGDIR}
}

case "$1" in
configure)
if ! /usr/lib/bareos/scripts/bareos-config has_config "tray-monitor"; then
/usr/lib/bareos/scripts/bareos-config deploy_config "$DEFCONFIGDIR" "$CONFIGDIR"
/usr/lib/bareos/scripts/bareos-config initialize_local_hostname
/usr/lib/bareos/scripts/bareos-config initialize_passwords
fi
/usr/lib/bareos/scripts/bareos-config deploy_config "$DEFCONFIGDIR" "$CONFIGDIR" || true
permissions
;;
abort-upgrade|abort-remove|abort-deconfigure)
Expand Down

0 comments on commit 2fb23cb

Please sign in to comment.