Merge branch 'joergs/bareos-15.2' into joergs/master-merge

Conflicts: debian/control.bareos-filedaemon-ceph-plugin
bareos · Dec 14, 2015 · 8cc31a4 · 8cc31a4
2 parents b088441 + 43ff659
commit 8cc31a4
Show file tree

Hide file tree

Showing 23 changed files with 123 additions and 38 deletions.
diff --git a/LICENSE b/LICENSE
@@ -241,8 +241,8 @@ to the fastlzlib and its components:
     OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
     You can contact the author at :
-    - LZ4 homepage : http://fastcompression.blogspot.com/p/lz4.html
-    - LZ4 source repository : http://code.google.com/p/lz4/
+    - LZ4 homepage : http://www.lz4.org
+    - LZ4 source repository : https://github.com/Cyan4973/lz4
 
 ===========================================
 

diff --git a/README.scsicrypto b/README.scsicrypto
@@ -188,6 +188,10 @@ The initial setup of SCSI crypto looks something like this:
        additional capabilities:
           CAP_SYS_RAWIO (See capabilities(7))
 
+       If bareos-sd does not have the appropriate capabilities, all
+       other tape operations may still work correctly, but you will
+       get "Unable to perform SG_IO ioctl" errors.
+
        On older kernels it can be you need CAP_SYS_ADMIN try
        CAP_SYS_RAWIO first and if that doesn't work try CAP_SYS_ADMIN
 

diff --git a/debian/bareos-storage-tape.install.in b/debian/bareos-storage-tape.install.in
@@ -7,4 +7,5 @@
 @scriptdir@/mtx-changer
 /usr/share/man/man8/bscrypto.8.gz
 /usr/share/man/man8/btape.8.gz
+/usr/sbin/bscrypto
 /usr/sbin/btape
diff --git a/debian/bareos-storage.install.in b/debian/bareos-storage.install.in
@@ -1,4 +1,3 @@
-/usr/sbin/bscrypto
 @plugindir@/autoxflate-sd.so
 @scriptdir@/disk-changer
 @confdir@/bareos-sd.conf     @configtemplatedir@

diff --git a/debian/control.bareos-director-python-plugin b/debian/control.bareos-director-python-plugin
@@ -3,7 +3,7 @@ Architecture:   any
 Section:        python
 Pre-Depends:    debconf (>= 1.4.30) | debconf-2.0
 Depends:        bareos-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: Backup Archiving Recovery Open Sourced - director-python-plugin
+Description: Backup Archiving Recovery Open Sourced - director Python plugin
  Bareos is a set of programs to manage backup, recovery and verification of
  data across a network of computers of different kinds.
  .

diff --git a/debian/control.bareos-filedaemon-ceph-plugin b/debian/control.bareos-filedaemon-ceph-plugin
@@ -2,7 +2,7 @@ Package:        bareos-filedaemon-ceph-plugin
 Architecture:   any
 Pre-Depends:    debconf (>= 1.4.30) | debconf-2.0
 Depends:        bareos-filedaemon (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: Backup Archiving Recovery Open Sourced - filedaemon-ceph-plugin
+Description: Backup Archiving Recovery Open Sourced - file daemon CEPH plugin
  Bareos is a set of programs to manage backup, recovery and verification of
  data across a network of computers of different kinds.
  .

diff --git a/debian/control.bareos-filedaemon-glusterfs-plugin b/debian/control.bareos-filedaemon-glusterfs-plugin
@@ -2,8 +2,8 @@ Package:        bareos-filedaemon-glusterfs-plugin
 Architecture:   any
 Pre-Depends:    debconf (>= 1.4.30) | debconf-2.0
 Depends:        bareos-filedaemon (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: Backup Archiving Recovery Open Sourced - filedaemon-glusterfs-plugin
+Description: Backup Archiving Recovery Open Sourced - file daemon GlusterFS plugin
  Bareos is a set of programs to manage backup, recovery and verification of
  data across a network of computers of different kinds.
  .
- This package provides the glusterfs plugin for the file daemon.
+ This package provides the GlusterFS plugin for the file daemon.
diff --git a/debian/control.bareos-filedaemon-python-plugin b/debian/control.bareos-filedaemon-python-plugin
@@ -3,7 +3,7 @@ Architecture:   any
 Section:        python
 Pre-Depends:    debconf (>= 1.4.30) | debconf-2.0
 Depends:        bareos-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: Backup Archiving Recovery Open Sourced - filedaemon-python-plugin
+Description: Backup Archiving Recovery Open Sourced - file daemon Python plugin
  Bareos is a set of programs to manage backup, recovery and verification of
  data across a network of computers of different kinds.
  .
@@ -14,7 +14,7 @@ Architecture:   any
 Section:        python
 Pre-Depends:    debconf (>= 1.4.30) | debconf-2.0
 Depends:        bareos-common (= ${binary:Version}), bareos-filedaemon-python-plugin (= ${binary:Version}), python-ldap, ${shlibs:Depends}, ${misc:Depends}
-Description: Backup Archiving Recovery Open Sourced - filedaemon-python-plugin-ldap
+Description: Backup Archiving Recovery Open Sourced - file daemon LDAP plugin
  Bareos is a set of programs to manage backup, recovery and verification of
  data across a network of computers of different kinds.
  .

diff --git a/debian/control.bareos-storage-glusterfs b/debian/control.bareos-storage-glusterfs
@@ -2,8 +2,8 @@ Package:        bareos-storage-glusterfs
 Architecture:   any
 Pre-Depends:    debconf (>= 1.4.30) | debconf-2.0
 Depends:        bareos-storage (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: Backup Archiving Recovery Open Sourced - storage-glusterfs-plugin
+Description: Backup Archiving Recovery Open Sourced - storage daemon GlusterFS backend
  Bareos is a set of programs to manage backup, recovery and verification of
  data across a network of computers of different kinds.
  .
- This package provides the glusterfs backend for the storage daemon.
+ This package provides the GlusterFS backend for the storage daemon.
diff --git a/debian/control.bareos-storage-python-plugin b/debian/control.bareos-storage-python-plugin
@@ -3,7 +3,7 @@ Architecture:   any
 Section:        python
 Pre-Depends:    debconf (>= 1.4.30) | debconf-2.0
 Depends:        bareos-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: Backup Archiving Recovery Open Sourced - storage-python-plugin
+Description: Backup Archiving Recovery Open Sourced - storage daemon Python plugin
  Bareos is a set of programs to manage backup, recovery and verification of
  data across a network of computers of different kinds.
  .

diff --git a/debian/control.univention-bareos b/debian/control.univention-bareos
@@ -2,6 +2,7 @@ Package: univention-bareos
 Architecture: all
 Depends: bareos (= ${binary:Version}),
  bareos-database-postgresql,
+ bareos-webui,
  univention-bareos-schema (= ${binary:Version}),
  univention-config,
  univention-join (>> 5.0.20-1.436),

diff --git a/debian/copyright b/debian/copyright
@@ -263,8 +263,8 @@ License: AGPL-3.0 with Bacula and other exceptions
     OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     .
     You can contact the author at :
-    - LZ4 homepage : http://fastcompression.blogspot.com/p/lz4.html
-    - LZ4 source repository : http://code.google.com/p/lz4/
+    - LZ4 homepage : http://www.lz4.org
+    - LZ4 source repository : https://github.com/Cyan4973/lz4
     .
     ===========================================
     .

diff --git a/debian/univention-bareos.install.in b/debian/univention-bareos.install.in
@@ -3,6 +3,7 @@
 /etc/bareos/autogenerated/fd-configs/generic.template
 /etc/bareos/autogenerated/fd-configs/windows.template
 /etc/cron.d/univention-bareos
+/etc/univention/templates/scripts/etc/bareos/bareos-dir.conf
 /usr/lib/univention-directory-listener/system/univention-bareos.py
 /usr/lib/univention-install/62univention-bareos.inst
 /usr/lib/univention-uninstall/63univention-bareos.uinst

diff --git a/debian/univention-bareos.postinst.in b/debian/univention-bareos.postinst.in
@@ -15,7 +15,7 @@ if [ "$1" = "configure" ]; then
         ucr set bareos/backup_myself=yes
     fi
 
-    # defaults
+    # set defaults
     ucr set \
             bareos/filestorage?/var/lib/bareos/storage \
             bareos/max_full_volume_bytes?20 \
@@ -24,10 +24,16 @@ if [ "$1" = "configure" ]; then
             bareos/max_diff_volumes?1 \
             bareos/max_incr_volume_bytes?1 \
             bareos/max_incr_volumes?1 \
-            bareos/backup_myself?no
+            bareos/backup_myself?no \
+            bareos/webui/console/user1/username?admin \
+            bareos/webui/console/user1/password?
 
-    ucr commit /etc/bareos/bareos-dir.conf /etc/bareos/bareos-sd.conf \
-        /etc/bareos/bareos-fd.conf /etc/bareos/bconsole.conf
+    # commit defaults
+    ucr commit \
+            /etc/bareos/bareos-dir.conf \
+            /etc/bareos/bareos-sd.conf \
+            /etc/bareos/bareos-fd.conf \
+            /etc/bareos/bconsole.conf
 
     touch /etc/bareos/autogenerated/clients.include
 
@@ -44,6 +50,37 @@ if [ "$1" = "configure" ]; then
 
     [ -x "/etc/init.d/univention-firewall" ] && invoke-rc.d univention-firewall restart
 
+    # 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
 

diff --git a/debian/univention-bareos.univention-config-registry b/debian/univention-bareos.univention-config-registry
@@ -9,6 +9,8 @@ Variables: bareos/max_full_volume_bytes
 Variables: bareos/max_full_volumes
 Variables: hostname
 Variables: domainname
+Variables: bareos/webui/console/user1/username
+Variables: bareos/webui/console/user1/password
 
 Type: file
 File: etc/bareos/bareos-sd.conf

diff --git a/debian/univention-bareos.univention-config-registry-variables b/debian/univention-bareos.univention-config-registry-variables
@@ -45,3 +45,15 @@ Description[de]=Maximale Anzahl der Volumes im Pool für Full-Backups
 Description[en]=Maximum number of volumes for the full backup pool
 Type=int
 Categories=backup
+
+[bareos/webui/console/user1/username]
+Description[de]=Benutzername
+Description[en]=Username
+Type=str
+Categories=backup
+
+[bareos/webui/console/user1/password]
+Description[de]=Passwort
+Description[en]=Password
+Type=str
+Categories=backup
diff --git a/platforms/univention/AppCenter/LICENSE_AGREEMENT.in b/platforms/univention/AppCenter/LICENSE_AGREEMENT.in
@@ -25,3 +25,7 @@
     You should have received a copy of the GNU Affero General Public License
     along with this program.  If not, see http://www.gnu.org/licenses/
 </p>
+<p>
+     See full license text at https://github.com/bareos/bareos/blob/master/LICENSE
+</p>
+
diff --git a/platforms/univention/AppCenter/README_POST_INSTALL b/platforms/univention/AppCenter/README_POST_INSTALL
@@ -4,4 +4,7 @@ After installation, the Bareos Director is ready for backup jobs.
 Before you continue, you should review the UCR variables
 bareos/filestorage, bareos/backup_myself and bareos/max_*_volume*,
 to limit the local disk space it uses.
+In addition to that, you should also review the Bareos Webui related
+UCR variables bareos/webui/console/user1/* and set them to your
+needs.
 </p>
diff --git a/platforms/univention/AppCenter/bareos-webui_screenshot.png b/platforms/univention/AppCenter/bareos-webui_screenshot.png
diff --git a/platforms/univention/AppCenter/univention-bareos.ini.in b/platforms/univention/AppCenter/univention-bareos.ini.in
@@ -9,22 +9,24 @@ NotifyVendor=True
 Description=scalable open source network backup solution
 LongDescription=Bareos (Backup Archiving Recovery Open Sourced) is a reliable,
   network-based open source software for backup, archiving and recovery
-  of data for all well-established operating systems. In the year 2010
-  emerged from the Bacula Project, Bareos was and is actively developed as
-  a fork and enriched with lots of new features.  Thus Bareos today offers
-  among other features LTO hardware encryption, bandwitdth limitation and
-  new practical console commands. The source code of Bareos is available
-  on Github under the AGPL v3 license. Additionally
+  of data for all well-established operating systems. The source code of
+  Bareos is available on Github under the AGPL v3 license. Additionally
   Bareos offers binary package repositories for the most important Linux
-  distributions as well as for Windows.
-
-Screenshot=
+  distributions as well as for Windows. ATTENTION: After installation,
+  you need to review at least the UCR variables
+  bareos/filestorage, bareos/backup_myself and bareos/max_*_volumes
+  for proper operation.
+  Set the login credentials for the webui with the UCR variables
+  bareos/webui/console/user1/username and bareos/webui/console/user1/password.
+
+Screenshot=bareos-webui_screenshot.png
 Categories=Administration
 
 Vendor=Bareos GmbH und Co. KG
 Website=http://www.bareos.org/en/HOWTO/articles/bareos-univention-documentation.html
 WebsiteVendor=http://www.bareos.com
-Contact=info@bareos.com
+SupportURL=http://www.bareos.com/en/support.html
+Contact=sales@bareos.com
 NotificationEmail=info@bareos.com
 LicenseFile=LICENSE_AGREEMENT
 
@@ -37,20 +39,21 @@ DefaultPackagesMaster=univention-bareos-schema
 ServerRole=domaincontroller_master,domaincontroller_backup,domaincontroller_slave
 
 # whether a "Shop" button is displayed in the App details, leading to the ShopURL
-#UseShop=True
+UseShop=True
 
 # URL that the user is directed to. Only makes sense in combination with UseShop=True.
-#ShopURL=https://shop.maintain.com/application
+#ShopURL=https://www.bareos.com/en/Buy.html
 
 [de]
 Description=Leistungsfähige Open-Source-Backup-Lösung
 LongDescription=Bareos (Backup Archiving Recovery Open Sourced) ist eine zuverlässige,
   netzwerkübergreifende Open Source Software zur Sicherung, Archivierung
-  und Wiederherstellung von Daten aller gängigen Betriebssysteme. Im Jahr
-  2010 hervorgegangen aus dem Projekt Bacula wurde und wird Bareos als
-  Fork aktiv weiterentwickelt und mit vielen neuen Features angereichert.
-  So bietet Bareos heute unter anderem eine LTO Hardware-Verschlüsselung,
-  eine Bandbreitenbegrenzung und neue praktische Konsolen-Kommandos. Der
+  und Wiederherstellung von Daten aller gängigen Betriebssysteme. Der
   Quellcode von Bareos ist auf Github verfügbar und steht unter der Lizenz
   AGPL v3. Zudem stellt Bareos fertige Pakete über Repositories für die
   wichtigsten Linux Distributionen sowie für Windows bereit.
+  ACHTUNG: Nach der Installation sollten die UCR-Variablen
+  bareos/filestorage, bareos/backup_myself und bareos/max_*_volumes geprüft werden,
+  um einen korrekten Betrieb zu gewährleisten. Die anzupassenden Anmeldedaten für
+  die webui sind in den UCR-Variablen bareos/webui/console/user1/username und
+  bareos/webui/console/user1/password hinterlegt.
diff --git a/platforms/univention/Makefile.in b/platforms/univention/Makefile.in
@@ -15,7 +15,8 @@ all:
 	$(INSTALL_DATA)    AppCenter/univention-bareos.ini ../../AppCenter/
 	$(INSTALL_DATA)    AppCenter/LICENSE_AGREEMENT     ../../AppCenter/
 	$(INSTALL_DATA)    AppCenter/README_POST_INSTALL   ../../AppCenter/
-	$(INSTALL_DATA)    ../../src/images/bareos_logo_shadow.png ../../AppCenter/univention-bareos.png
+	$(INSTALL_DATA)    AppCenter/bareos-webui_screenshot.png  ../../AppCenter/
+	$(INSTALL_DATA)    ../../src/images/bareos_logo_shadow.png ../../AppCenter/bareos.png
 
 install:
 	(cd ../debian; $(MAKE) $@;)
@@ -51,6 +52,9 @@ install:
 	@$(MKDIR)           $(DESTDIR)/usr/share/univention-bareos-schema/
 	@$(INSTALL_CONFIG)  univention-bareos.schema $(DESTDIR)/usr/share/univention-bareos-schema/univention-bareos.schema
 
+	@$(MKDIR)           $(DESTDIR)/etc/univention/templates/scripts/etc/bareos/
+	@$(INSTALL_PROGRAM) bareos-dir.conf $(DESTDIR)/etc/univention/templates/scripts/etc/bareos/
+
 clean:
 	(cd ../debian; $(MAKE) $@;)
 	@$(RMF) 1 2 3

diff --git a/platforms/univention/bareos-dir.conf b/platforms/univention/bareos-dir.conf
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+service bareos-dir reload
+
diff --git a/platforms/univention/create_ucs_template_files.sh b/platforms/univention/create_ucs_template_files.sh
@@ -88,6 +88,18 @@ Job {
 # include clients configured in webfrontend
 @/etc/bareos/autogenerated/clients.include
 
+#
+# bareos-webui
+#
+@/etc/bareos/bareos-dir.d/webui-profiles.conf
+
+# Restricted console used by bareos-webui
+Console {
+  Name = @%@bareos/webui/console/user1/username@%@
+  Password = "@%@bareos/webui/console/user1/password@%@"
+  Profile = webui
+}
+
 ' >> $file
 
     cat $file
@@ -130,8 +142,6 @@ create_bconsole_template()
     cat $file
 }
 
-
-
 DEST_DIR=$1
 create_bareos_fd_template
 create_bareos_sd_template