Merge branch 'bareos-15.2'

autoconf/configure.in

@@ -4188,7 +4188,6 @@ debian|ubuntu|univention)
    TAPEDRIVE="/dev/nst0"
    PSCMD="ps -e -o pid,command"
    DEBIAN_CONTROL_UNIVENTION_BAREOS=/dev/null
-   DEBIAN_CONTROL_UNIVENTION_BAREOS_SCHEMA=/dev/null
    PFILES="${PFILES} ${DEBIAN_CONTROL} \
       debian/bareos-bat.install \
       debian/bareos-bat.postinst \
@@ -4243,10 +4242,7 @@ debian|ubuntu|univention)
          ;;
       univention)
          DEBIAN_CONTROL_UNIVENTION_BAREOS=./debian/control.univention-bareos
-         DEBIAN_CONTROL_UNIVENTION_BAREOS_SCHEMA=./debian/control.univention-bareos-schema
          PFILES="${PFILES} \
-            debian/univention-bareos-schema.install \
-            debian/univention-bareos-schema.postinst \
             debian/univention-bareos.install \
             debian/univention-bareos.postinst \
             platforms/univention/Makefile \
@@ -4255,7 +4251,6 @@ debian|ubuntu|univention)
          ;;
    esac
    AC_SUBST_FILE(DEBIAN_CONTROL_UNIVENTION_BAREOS)
-   AC_SUBST_FILE(DEBIAN_CONTROL_UNIVENTION_BAREOS_SCHEMA)
   ;;
 freebsd)
    VER=`echo $DISTVER | cut -c 1`
@@ -4484,23 +4479,26 @@ DEBIAN_CONTROL_FILEDAEMON_PYTHON_PLUGIN=/dev/null
 DEBIAN_CONTROL_STORAGE_PYTHON_PLUGIN=/dev/null
 DEBIAN_CONTROL_DIRECTOR_PYTHON_PLUGIN=/dev/null
 
-if test X"$support_python" = "Xyes" ; then
-   BUILD_FD_PLUGINS="${BUILD_FD_PLUGINS} python-fd.la"
-   BUILD_SD_PLUGINS="${BUILD_SD_PLUGINS} python-sd.la"
-   BUILD_DIR_PLUGINS="${BUILD_DIR_PLUGINS} python-dir.la"
-   DEBIAN_CONTROL_FILEDAEMON_PYTHON_PLUGIN=./debian/control.bareos-filedaemon-python-plugin
-   DEBIAN_CONTROL_STORAGE_PYTHON_PLUGIN=./debian/control.bareos-storage-python-plugin
-   DEBIAN_CONTROL_DIRECTOR_PYTHON_PLUGIN=./debian/control.bareos-director-python-plugin
-fi
+dnl build a list of plugins we need to build.
+if test x$use_libtool != xno; then
+   if test X"$support_python" = "Xyes" ; then
+      BUILD_FD_PLUGINS="${BUILD_FD_PLUGINS} python-fd.la"
+      BUILD_SD_PLUGINS="${BUILD_SD_PLUGINS} python-sd.la"
+      BUILD_DIR_PLUGINS="${BUILD_DIR_PLUGINS} python-dir.la"
+      DEBIAN_CONTROL_FILEDAEMON_PYTHON_PLUGIN=./debian/control.bareos-filedaemon-python-plugin
+      DEBIAN_CONTROL_STORAGE_PYTHON_PLUGIN=./debian/control.bareos-storage-python-plugin
+      DEBIAN_CONTROL_DIRECTOR_PYTHON_PLUGIN=./debian/control.bareos-director-python-plugin
+   fi
 
-if test X"$have_scsi_crypto" = "Xyes" ; then
-   BUILD_SD_PLUGINS="${BUILD_SD_PLUGINS} scsicrypto-sd.la scsitapealert-sd.la"
-fi
+   if test X"$have_scsi_crypto" = "Xyes" ; then
+      BUILD_SD_PLUGINS="${BUILD_SD_PLUGINS} scsicrypto-sd.la scsitapealert-sd.la"
+   fi
 
-if test X"$have_zlib" = "Xyes" -o \
-        X"$have_lzo" = "Xyes" -o \
-        X"$have_fastlz" = "Xyes" ; then
-   BUILD_SD_PLUGINS="${BUILD_SD_PLUGINS} autoxflate-sd.la"
+   if test X"$have_zlib" = "Xyes" -o \
+           X"$have_lzo" = "Xyes" -o \
+           X"$have_fastlz" = "Xyes" ; then
+      BUILD_SD_PLUGINS="${BUILD_SD_PLUGINS} autoxflate-sd.la"
+   fi
 fi
 
 if test X"$have_ceph_rados" = "Xyes" ; then
@@ -4522,7 +4520,7 @@ AC_SUBST_FILE(DEBIAN_CONTROL_FILEDAEMON_PYTHON_PLUGIN)
 AC_SUBST_FILE(DEBIAN_CONTROL_STORAGE_PYTHON_PLUGIN)
 AC_SUBST_FILE(DEBIAN_CONTROL_DIRECTOR_PYTHON_PLUGIN)
 
-dnl build a list of storage backend  we need to build.
+dnl build a list of storage backends we need to build.
 if test x$use_libtool != xno; then
    BUILD_SD_BACKENDS="libbareossd-fifo.la libbareossd-gentape.la libbareossd-tape.la"
 

configure

@@ -988,7 +988,6 @@ DEBIAN_CONTROL_STORAGE_GLUSTERFS
 DEBIAN_CONTROL_FILEDAEMON_CEPH_PLUGIN
 DEBIAN_CONTROL_STORAGE_CEPH
 DEBIAN_CONTROL_UNIVENTION_BAREOS
-DEBIAN_CONTROL_UNIVENTION_BAREOS_SCHEMA
 MCOMMON
 DEBIAN_CONTROL_FILEDAEMON_PYTHON_PLUGIN
 DEBIAN_CONTROL_STORAGE_PYTHON_PLUGIN
@@ -32693,7 +32692,6 @@ debian|ubuntu|univention)
    TAPEDRIVE="/dev/nst0"
    PSCMD="ps -e -o pid,command"
    DEBIAN_CONTROL_UNIVENTION_BAREOS=/dev/null
-   DEBIAN_CONTROL_UNIVENTION_BAREOS_SCHEMA=/dev/null
    PFILES="${PFILES} ${DEBIAN_CONTROL} \
       debian/bareos-bat.install \
       debian/bareos-bat.postinst \
@@ -32748,10 +32746,7 @@ debian|ubuntu|univention)
          ;;
       univention)
          DEBIAN_CONTROL_UNIVENTION_BAREOS=./debian/control.univention-bareos
-         DEBIAN_CONTROL_UNIVENTION_BAREOS_SCHEMA=./debian/control.univention-bareos-schema
          PFILES="${PFILES} \
-            debian/univention-bareos-schema.install \
-            debian/univention-bareos-schema.postinst \
             debian/univention-bareos.install \
             debian/univention-bareos.postinst \
             platforms/univention/Makefile \
@@ -32760,7 +32755,6 @@ debian|ubuntu|univention)
          ;;
    esac
 
-
   ;;
 freebsd)
    VER=`echo $DISTVER | cut -c 1`
@@ -33051,23 +33045,25 @@ DEBIAN_CONTROL_FILEDAEMON_PYTHON_PLUGIN=/dev/null
 DEBIAN_CONTROL_STORAGE_PYTHON_PLUGIN=/dev/null
 DEBIAN_CONTROL_DIRECTOR_PYTHON_PLUGIN=/dev/null
 
-if test X"$support_python" = "Xyes" ; then
-   BUILD_FD_PLUGINS="${BUILD_FD_PLUGINS} python-fd.la"
-   BUILD_SD_PLUGINS="${BUILD_SD_PLUGINS} python-sd.la"
-   BUILD_DIR_PLUGINS="${BUILD_DIR_PLUGINS} python-dir.la"
-   DEBIAN_CONTROL_FILEDAEMON_PYTHON_PLUGIN=./debian/control.bareos-filedaemon-python-plugin
-   DEBIAN_CONTROL_STORAGE_PYTHON_PLUGIN=./debian/control.bareos-storage-python-plugin
-   DEBIAN_CONTROL_DIRECTOR_PYTHON_PLUGIN=./debian/control.bareos-director-python-plugin
-fi
+if test x$use_libtool != xno; then
+   if test X"$support_python" = "Xyes" ; then
+      BUILD_FD_PLUGINS="${BUILD_FD_PLUGINS} python-fd.la"
+      BUILD_SD_PLUGINS="${BUILD_SD_PLUGINS} python-sd.la"
+      BUILD_DIR_PLUGINS="${BUILD_DIR_PLUGINS} python-dir.la"
+      DEBIAN_CONTROL_FILEDAEMON_PYTHON_PLUGIN=./debian/control.bareos-filedaemon-python-plugin
+      DEBIAN_CONTROL_STORAGE_PYTHON_PLUGIN=./debian/control.bareos-storage-python-plugin
+      DEBIAN_CONTROL_DIRECTOR_PYTHON_PLUGIN=./debian/control.bareos-director-python-plugin
+   fi
 
-if test X"$have_scsi_crypto" = "Xyes" ; then
-   BUILD_SD_PLUGINS="${BUILD_SD_PLUGINS} scsicrypto-sd.la scsitapealert-sd.la"
-fi
+   if test X"$have_scsi_crypto" = "Xyes" ; then
+      BUILD_SD_PLUGINS="${BUILD_SD_PLUGINS} scsicrypto-sd.la scsitapealert-sd.la"
+   fi
 
-if test X"$have_zlib" = "Xyes" -o \
-        X"$have_lzo" = "Xyes" -o \
-        X"$have_fastlz" = "Xyes" ; then
-   BUILD_SD_PLUGINS="${BUILD_SD_PLUGINS} autoxflate-sd.la"
+   if test X"$have_zlib" = "Xyes" -o \
+           X"$have_lzo" = "Xyes" -o \
+           X"$have_fastlz" = "Xyes" ; then
+      BUILD_SD_PLUGINS="${BUILD_SD_PLUGINS} autoxflate-sd.la"
+   fi
 fi
 
 if test X"$have_ceph_rados" = "Xyes" ; then

debian/control.in

@@ -315,5 +315,3 @@ Description: Backup Archiving Recovery Open Sourced - common tools
 @DEBIAN_CONTROL_TRAYMONITOR@
 
 @DEBIAN_CONTROL_UNIVENTION_BAREOS@
-
-@DEBIAN_CONTROL_UNIVENTION_BAREOS_SCHEMA@

debian/control.univention-bareos

@@ -1,13 +1,18 @@
 Package: univention-bareos
 Architecture: all
+# univention-postgresql is required to be configured before bareos-database-common (bareos-database-postgresql)
+Pre-Depends: univention-postgresql
 Depends: bareos (= ${binary:Version}),
  bareos-database-postgresql,
  bareos-webui,
- univention-bareos-schema (= ${binary:Version}),
  univention-config,
  univention-join (>> 5.0.20-1.436),
  univention-postgresql,
- shell-univention-lib (>> 2.0.17-1.125),
+ shell-univention-lib (>> 2.0.17-1.125)
+# Older versions do require the package univention-bareos-schema,
+# which does no longer exist.
+Provides:  univention-bareos-schema
+Replaces:  univention-bareos-schema
 Description: Backup Archiving Recovery Open Sourced - UCS integration
  This package integrates the Bareos backup solution into
  UCS. The package provides automatic configuration of the

debian/univention-bareos.install.in

@@ -8,3 +8,5 @@
 /usr/lib/univention-install/62univention-bareos.inst
 /usr/lib/univention-uninstall/63univention-bareos.uinst
 /usr/share/univention-bareos/restart_director
+/usr/share/univention-bareos/univention-bareos.schema
+

debian/univention-bareos.postinst.in

@@ -25,7 +25,7 @@ if [ "$1" = "configure" ]; then
             bareos/max_incr_volume_bytes?1 \
             bareos/max_incr_volumes?1 \
             bareos/backup_myself?no \
-            bareos/webui/console/user1/username?admin \
+            bareos/webui/console/user1/username?Administrator \
             bareos/webui/console/user1/password?
 
     # commit defaults
@@ -53,34 +53,6 @@ if [ "$1" = "configure" ]; then
     # reload apache
     invoke-rc.d apache2 reload
 
-    # Setting link to the web interface in ucs-overview administration
-    export P="ucs/web/overview/entries/admin"
-    export APP="bareos-webui"
-    export APPICON="../bareos-webui/img/bareos-logo.png"
-
-    ucr set \
-         "$P/$APP"/description/de="Bareos Backup Monitoring und Management" \
-         "$P/$APP"/description="Bareos Backup monitoring and management" \
-         "$P/$APP"/label/de="Bareos Backup - Web User Interface" \
-         "$P/$APP"/label="Bareos Backup - Web User Interface" \
-         "$P/$APP"/link="../bareos-webui/" \
-         "$P/$APP"/icon="$APPICON"
-         #"$P/$APP"/priority=xx-digits-for-sorting-or-just-dont-set
-
-    # Setting link to univention configuration registry in in ucs-overview administration
-    export P="ucs/web/overview/entries/admin"
-    export APP="bareos-core"
-    export APPICON="../bareos-webui/img/bareos-logo.png"
-
-    ucr set \
-         "$P/$APP"/description/de="Grundlegende Bareos Konfiguration mittels UCR Variablen bareos/*" \
-         "$P/$APP"/description="Basic configuration of Bareos by UCR variables bareos/*" \
-         "$P/$APP"/label/de="Bareos Backup - Konfiguration" \
-         "$P/$APP"/label="Bareos Backup - Configuration" \
-         "$P/$APP"/link="../univention-management-console/#module=ucr::0:" \
-         "$P/$APP"/icon="$APPICON"
-         #"$P/$APP"/priority=xx-digits-for-sorting-or-just-dont-set
-
     call_joinscript 62univention-bareos.inst
 fi
 

platforms/packaging/bareos-Univention_4.0.dsc

@@ -1,6 +1,6 @@
 Format: 1.0
 Source: bareos
-Binary: bareos, bareos-bat, bareos-bconsole, bareos-client, bareos-common, bareos-database-common, bareos-database-postgresql, bareos-database-mysql, bareos-database-sqlite3, bareos-database-tools, bareos-devel, bareos-director, bareos-director-python-plugin, bareos-filedaemon, bareos-filedaemon-python-plugin, bareos-storage, bareos-storage-fifo, bareos-storage-tape, bareos-storage-python-plugin, bareos-tools, bareos-traymonitor, univention-bareos, univention-bareos-schema
+Binary: bareos, bareos-bat, bareos-bconsole, bareos-client, bareos-common, bareos-database-common, bareos-database-postgresql, bareos-database-mysql, bareos-database-sqlite3, bareos-database-tools, bareos-devel, bareos-director, bareos-director-python-plugin, bareos-filedaemon, bareos-filedaemon-python-plugin, bareos-storage, bareos-storage-fifo, bareos-storage-tape, bareos-storage-python-plugin, bareos-tools, bareos-traymonitor, univention-bareos
 Architecture: any
 Version: 16.1.0
 Maintainer: Joerg Steffens <joerg.steffens@bareos.com>

platforms/univention/62univention-bareos.inst

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-VERSION=1
+VERSION=2
 
 . /usr/share/univention-lib/base.sh
 . /usr/share/univention-lib/ldap.sh
@@ -11,8 +11,11 @@ eval "$(univention-config-registry shell)"
 
 ucs_addServiceToLocalhost "Bareos Backup" "$@"
 
+ucs_registerLDAPExtension "$@" --schema /usr/share/univention-bareos/univention-bareos.schema
+
 # keep "cn=custom attributes,cn=univention,$ldap_base" clean
-univention-directory-manager container/cn create "$@" --ignore_exists \
+univention-directory-manager container/cn create "$@" \
+        --ignore_exists \
 		--position "cn=custom attributes,cn=univention,$ldap_base" \
 		--set name="bareos" || die
 
@@ -40,3 +43,4 @@ univention-directory-manager settings/extended_attribute create "$@" \
 joinscript_save_current_version
 
 exit 0
+

platforms/univention/AppCenter/README

@@ -0,0 +1,30 @@
+<p>
+After installation, the Bareos Director is ready for backup jobs.
+Before you continue, you should review the UCR variables
+<ul>
+  <li><b>bareos/filestorage</b> (default: /var/lib/bareos/storage)</li>
+  <li><b>bareos/backup_myself</b> (default: no)</li>
+  <li><b>bareos/max_*_volume*</b></li>
+</ul>
+to limit the local disk space it uses.
+</p>
+
+<p>
+In addition to that, you should set the login credentials for the Bareos WebUI with the following UCR variables:
+<ul>
+  <li><b>bareos/webui/console/user1/username</b> (default: Administrator)</li>
+  <li><b>bareos/webui/console/user1/password</b> (no default, must be set)</li>
+</ul>
+</p>
+
+<p>
+<a href="javascript:void(0)" onclick='require("umc/app").openModule("ucr", null, {})'>Univention Configuration Registry Module</a> to manage the bareos/* UCR variables on this system.
+</p>
+
+<p>
+For more details, see the <a href="http://doc.bareos.org/master/html/bareos-manual-main-reference.html#sec:UniventionCorporateServer" target="_blank">Bareos documentation</a>.
+</p>
+
+<p>
+<a href="/bareos-webui" target="_blank">Bareos Web User Interface</a> to monitor and manage Bareos.
+</p>

platforms/univention/AppCenter/README_DE

@@ -0,0 +1,30 @@
+<p>
+Nach der Installation ist der Bareos Director einsatzbereit.
+Es sollten jedoch noch die folgenden UCR Variablen
+<ul>
+  <li><b>bareos/filestorage</b> (Standardwert: /var/lib/bareos/storage)</li>
+  <li><b>bareos/backup_myself</b> (Standardwert: no)</li>
+  <li><b>bareos/max_*_volume*</b></li>
+</ul>
+geprüft werden, um den maximal verfügbaren Festplattenspeicher zu begrenzen.
+</p>
+
+<p>
+Zusätzlich sollten Sie die Anmelden-Informationen für das Bareos WebUI mit den folgenden UCR Variablen setzen:
+<ul>
+  <li><b>bareos/webui/console/user1/username</b> (Standardwert: Administrator)</li>
+  <li><b>bareos/webui/console/user1/password</b> (ohne Standardwert)</li>
+</ul>
+</p>
+
+<p>
+<a href="javascript:void(0)" onclick='require("umc/app").openModule("ucr", null, {})'>Univention Configuration Registry Module</a> ermöglicht die Konfiguration der <tt>bareos/*</tt> UCR Variablen auf diesem System.
+</p>
+
+<p>
+Für genauere Informationen lesen sie bitte die entsprechenden Abschnitte der <a href="http://doc.bareos.org/master/html/bareos-manual-main-reference.html#sec:UniventionCorporateServer" target="_blank">Bareos Dokumentation</a>.
+</p>
+
+<p>
+<a href="/bareos-webui" target="_blank">Bareos Web User Interface</a> ermöglicht das Monitoring und Management von Bareos.
+</p>