diff --git a/autoconf/configure.in b/autoconf/configure.in
index caf06e904e7..c8a45326f05 100644
--- a/autoconf/configure.in
+++ b/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`
diff --git a/debian/control.in b/debian/control.in
index c4564b045f8..04a8baac540 100644
--- a/debian/control.in
+++ b/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@
diff --git a/debian/control.univention-bareos b/debian/control.univention-bareos
index bb287bef1a7..9208dc7ee66 100644
--- a/debian/control.univention-bareos
+++ b/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
diff --git a/debian/control.univention-bareos-schema b/debian/control.univention-bareos-schema
deleted file mode 100644
index 6749fa970e0..00000000000
--- a/debian/control.univention-bareos-schema
+++ /dev/null
@@ -1,8 +0,0 @@
-Package: univention-bareos-schema
-Architecture: all
-Depends: shell-univention-lib (>> 2.0.17-1.125),
- univention-ldap-server (>= 9.0.20-1.580.201303211526)
-Description: Backup Archiving Recovery Open Sourced - LDAP schema extension
- This package provides the LDAP schema extension
- which enables the backup configuration for client
- systems from the Univention Management Console
diff --git a/debian/univention-bareos-schema.install.in b/debian/univention-bareos-schema.install.in
deleted file mode 100644
index 000f59c5558..00000000000
--- a/debian/univention-bareos-schema.install.in
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/univention-bareos-schema/univention-bareos.schema
diff --git a/debian/univention-bareos-schema.postinst.in b/debian/univention-bareos-schema.postinst.in
deleted file mode 100644
index 01152cd5d64..00000000000
--- a/debian/univention-bareos-schema.postinst.in
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-. /usr/share/univention-lib/all.sh
-if [ "$1" = "configure" ]; then
- ucs_registerLDAPSchema /usr/share/univention-bareos-schema/univention-bareos.schema
-fi
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/univention-bareos.install.in b/debian/univention-bareos.install.in
index b334460776d..6b063309948 100644
--- a/debian/univention-bareos.install.in
+++ b/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
+
diff --git a/debian/univention-bareos.postinst.in b/debian/univention-bareos.postinst.in
index 5fbec3001ad..07b807c94b1 100644
--- a/debian/univention-bareos.postinst.in
+++ b/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
diff --git a/platforms/packaging/bareos-Univention_3.1.dsc b/platforms/packaging/bareos-Univention_3.1.dsc
deleted file mode 100644
index 09e2dc61d6f..00000000000
--- a/platforms/packaging/bareos-Univention_3.1.dsc
+++ /dev/null
@@ -1,12 +0,0 @@
-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
-Architecture: any
-Version: 15.2.2
-Maintainer: Joerg Steffens
+After installation, the Bareos Director is ready for backup jobs.
+Before you continue, you should review the UCR variables
+
+
+to limit the local disk space it uses.
+
+In addition to that, you should set the login credentials for the Bareos WebUI with the following UCR variables: +
+Univention Configuration Registry Module to manage the bareos/* UCR variables on this system. +
+ ++For more details, see the Bareos documentation. +
+ ++Bareos Web User Interface to monitor and manage Bareos. +
diff --git a/platforms/univention/AppCenter/README_DE b/platforms/univention/AppCenter/README_DE new file mode 100644 index 00000000000..240d716a026 --- /dev/null +++ b/platforms/univention/AppCenter/README_DE @@ -0,0 +1,30 @@ ++Nach der Installation ist der Bareos Director einsatzbereit. +Es sollten jedoch noch die folgenden UCR Variablen +
+Zusätzlich sollten Sie die Anmelden-Informationen für das Bareos WebUI mit den folgenden UCR Variablen setzen: +
+Univention Configuration Registry Module ermöglicht die Konfiguration der bareos/* UCR Variablen auf diesem System. +
+ ++Für genauere Informationen lesen sie bitte die entsprechenden Abschnitte der Bareos Dokumentation. +
+ ++Bareos Web User Interface ermöglicht das Monitoring und Management von Bareos. +
diff --git a/platforms/univention/AppCenter/README_POST_INSTALL b/platforms/univention/AppCenter/README_POST_INSTALL deleted file mode 100644 index 15651e49077..00000000000 --- a/platforms/univention/AppCenter/README_POST_INSTALL +++ /dev/null @@ -1,10 +0,0 @@ --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. -
diff --git a/platforms/univention/AppCenter/univention-bareos.ini.in b/platforms/univention/AppCenter/univention-bareos.ini.in index b186330bf6d..d7d54da252f 100644 --- a/platforms/univention/AppCenter/univention-bareos.ini.in +++ b/platforms/univention/AppCenter/univention-bareos.ini.in @@ -1,59 +1,58 @@ [Application] ID=bareos -Name=Bareos Backup +Logo=bareos-logo.svg +LogoDetailPage=bareos-logo-full.svg + +# 2-char Code for this App ID +Code=BR +Name=Bareos Backup Server Version=@VERSION@ EmailRequired=True NotifyVendor=True -Description=scalable open source network backup solution +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. 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. 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 + network-based open source software for backup, archiving and recovery + of data for all well-established operating systems (Linux, UN*X, MacOS, Windows). + It has a WebUI and Univention Management Console integration. +Thumbnails=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 -SupportURL=http://www.bareos.com/en/support.html +SupportURL=http://www.bareos.com/en/Support.html Contact=sales@bareos.com NotificationEmail=info@bareos.com LicenseFile=LICENSE_AGREEMENT +WebInterface=/bareos-webui +WebInterfaceName=Bareos Backup - Web User Interface +UCSOverviewCategory=admin + ConflictedApps= ConflictedSystemPackages=univention-bacula,bacula-director-common,bacula-fd,bacula-sd DefaultPackages=univention-bareos -DefaultPackagesMaster=univention-bareos-schema - -# allow installation on these server roles -ServerRole=domaincontroller_master,domaincontroller_backup,domaincontroller_slave # whether a "Shop" button is displayed in the App details, leading to the ShopURL UseShop=True - -# URL that the user is directed to. Only makes sense in combination with UseShop=True. -#ShopURL=https://www.bareos.com/en/Buy.html +ShopURL=https://appcenter.univention.com/bareos.html + +ApplianceCreate=True +# ApplianceName= +# ApplianceLogo= +AppliancePagesBlackList=software +ApplianceFieldsBlackList=basesystem +# ApplianceBlackList= +# ApplianceWhiteList= +# ApplianceMemory= +# ApplianceAdditionalApps= [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. 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. + und Wiederherstellung von Daten aller gängigen Betriebssysteme (Linux, UN*X, MacOS, Windows). + Es bietet ein eigenes Webfrontend sowie Integration in die Univention Management Console. +ShopURL=https://appcenter.univention.de/bareos.html diff --git a/platforms/univention/Makefile.in b/platforms/univention/Makefile.in index d496e504d66..8c3f128d368 100644 --- a/platforms/univention/Makefile.in +++ b/platforms/univention/Makefile.in @@ -14,9 +14,11 @@ all: @$(MKDIR) ../../AppCenter/ $(INSTALL_DATA) AppCenter/univention-bareos.ini ../../AppCenter/ $(INSTALL_DATA) AppCenter/LICENSE_AGREEMENT ../../AppCenter/ - $(INSTALL_DATA) AppCenter/README_POST_INSTALL ../../AppCenter/ + $(INSTALL_DATA) AppCenter/README ../../AppCenter/ + $(INSTALL_DATA) AppCenter/README_DE ../../AppCenter/ $(INSTALL_DATA) AppCenter/bareos-webui_screenshot.png ../../AppCenter/ - $(INSTALL_DATA) ../../src/images/bareos_logo_shadow.png ../../AppCenter/bareos.png + $(INSTALL_DATA) ../../src/images/bareos-logo.svg ../../AppCenter/ + $(INSTALL_DATA) ../../src/images/bareos-logo-full.svg ../../AppCenter/ install: (cd ../debian; $(MAKE) $@;) @@ -47,10 +49,8 @@ install: @$(INSTALL_PROGRAM) 63univention-bareos.uinst $(DESTDIR)/usr/lib/univention-uninstall/ @$(MKDIR) $(DESTDIR)/usr/share/univention-bareos/ - @$(INSTALL_PROGRAM) restart_director $(DESTDIR)/usr/share/univention-bareos/ - - @$(MKDIR) $(DESTDIR)/usr/share/univention-bareos-schema/ - @$(INSTALL_CONFIG) univention-bareos.schema $(DESTDIR)/usr/share/univention-bareos-schema/univention-bareos.schema + @$(INSTALL_PROGRAM) restart_director $(DESTDIR)/usr/share/univention-bareos/ + @$(INSTALL_CONFIG) univention-bareos.schema $(DESTDIR)/usr/share/univention-bareos/ @$(MKDIR) $(DESTDIR)/etc/univention/templates/scripts/etc/bareos/ @$(INSTALL_PROGRAM) bareos-dir.conf $(DESTDIR)/etc/univention/templates/scripts/etc/bareos/ diff --git a/src/images/bareos-logo-full.svg b/src/images/bareos-logo-full.svg new file mode 100644 index 00000000000..333ee3e2366 --- /dev/null +++ b/src/images/bareos-logo-full.svg @@ -0,0 +1,136 @@ + + + + \ No newline at end of file diff --git a/src/images/bareos-logo.svg b/src/images/bareos-logo.svg new file mode 100644 index 00000000000..fee701ceb97 --- /dev/null +++ b/src/images/bareos-logo.svg @@ -0,0 +1,108 @@ + + + + \ No newline at end of file