Skip to content

Commit

Permalink
packaging: remove dbdriver initialization on install
Browse files Browse the repository at this point in the history
  • Loading branch information
joergsteffens committed Dec 17, 2021
1 parent aa5b0ab commit f985e86
Show file tree
Hide file tree
Showing 6 changed files with 2 additions and 48 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ initialize_bareos(){
echo "$PKGNAME: initializing bareos configuration, logs to ${LOGFILE}"
/usr/lib/bareos/scripts/bareos-config initialize_local_hostname >>${LOGFILE} 2>&1 || echo "initialize_local_hostname failed"
/usr/lib/bareos/scripts/bareos-config initialize_passwords >>${LOGFILE} 2>&1 || echo "initialize_passwords failed"
/usr/lib/bareos/scripts/bareos-config initialize_database_driver >>${LOGFILE} 2>&1 || echo "initialize_database_driver failed"
}

case "$MODE" in
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ initialize_bareos(){
echo "$PKGNAME: initializing bareos configuration, logs to ${LOGFILE}"
/usr/lib/bareos/scripts/bareos-config initialize_local_hostname >>${LOGFILE} 2>&1 || echo "initialize_local_hostname failed"
/usr/lib/bareos/scripts/bareos-config initialize_passwords >>${LOGFILE} 2>&1 || echo "initialize_passwords failed"
/usr/lib/bareos/scripts/bareos-config initialize_database_driver >>${LOGFILE} 2>&1 || echo "initialize_database_driver failed"
}

case "$MODE" in
Expand Down

This file was deleted.

3 changes: 1 addition & 2 deletions core/platforms/packaging/bareos.spec
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Release: 0
Group: Productivity/Archiving/Backup
License: AGPL-3.0
BuildRoot: %{_tmppath}/%{name}-root
URL: http://www.bareos.org/
URL: https://www.bareos.org/
Vendor: The Bareos Team
#Packager: {_packager}

Expand Down Expand Up @@ -1787,7 +1787,6 @@ a2enmod php5 &> /dev/null || true
%post_backup_file /etc/%{name}/bareos-dir.conf
%{script_dir}/bareos-config initialize_local_hostname
%{script_dir}/bareos-config initialize_passwords
%{script_dir}/bareos-config initialize_database_driver
%if 0%{?suse_version} >= 1210
%service_add_post bareos-dir.service
/bin/systemctl enable bareos-dir.service >/dev/null 2>&1 || true
Expand Down
27 changes: 1 addition & 26 deletions core/scripts/bareos-config-lib.sh.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# BAREOS® - Backup Archiving REcovery Open Sourced
#
# Copyright (C) 2013-2020 Bareos GmbH & Co. KG
# Copyright (C) 2013-2021 Bareos GmbH & Co. KG
#
# This program is Free Software; you can redistribute it and/or
# modify it under the terms of version three of the GNU Affero General Public
Expand Down Expand Up @@ -976,31 +976,6 @@ apply_dbconfig_settings()
set_config_param "bareos-dir" "Catalog" "MyCatalog" "dbname" "$dbc_dbname"
fi

case "$dbc_dbtype" in
pgsql)
set_config_param "bareos-dir" "Catalog" "MyCatalog" "dbdriver" "postgresql"
;;
mysql)
set_config_param "bareos-dir" "Catalog" "MyCatalog" "dbdriver" "mysql"
;;
sqlite3)
set_config_param "bareos-dir" "Catalog" "MyCatalog" "dbdriver" "sqlite3"
# dbconfig creates the db file as ${dbc_basepath}/${dbc_dbname}
# while bareos expects the sqlite3 db file
# as ${dbc_basepath}/${dbc_dbname}.db
# Therefore a link is created.
if [ -r "${dbc_basepath}/${dbc_dbname}" ]; then
BAREOS_SQLITE_DB="`get_working_dir`/`get_database_name $DB_NAME`.db"
if [ ! -f $BAREOS_SQLITE_DB ]; then
ln -s "${dbc_basepath}/${dbc_dbname}" "$BAREOS_SQLITE_DB"
fi
fi
;;
*)
error "unknown database type $dbc_dbtype in /etc/dbconfig-common/bareos-database-common.conf"
return 1
esac

if [ "$dbc_authmethod_user" != "ident" ] && [ "$dbc_dbpass" ]; then
set_config_param "bareos-dir" "Catalog" "MyCatalog" "dbpassword" "$dbc_dbpass"
fi
Expand Down
1 change: 0 additions & 1 deletion debian/bareos-director.postinst.in
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ permissions()
case "$1" in
configure)
if /usr/lib/bareos/scripts/bareos-config deploy_config "@configtemplatedir@" "@confdir@" "bareos-dir"; then
/usr/lib/bareos/scripts/bareos-config initialize_database_driver
/usr/lib/bareos/scripts/bareos-config apply_dbconfig_settings
fi
permissions
Expand Down

0 comments on commit f985e86

Please sign in to comment.