Skip to content

Commit

Permalink
dbconfig
Browse files Browse the repository at this point in the history
  • Loading branch information
@joergsteffens
joergsteffens committed May 7, 2014
1 parent ae2f13c commit 436e36f
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 19 deletions.
9 changes: 4 additions & 5 deletions debian/bareos-database-common.config.in
View file
Expand Up @@ -5,7 +5,7 @@ set -e
. /usr/share/debconf/confmodule

#set -x
#echo "bareos-database-common.config: $@" >&2
echo "bareos-database-common.config: $@" >&2

if [ -r @scriptdir@/bareos-config-lib.sh ]; then
. @scriptdir@/bareos-config-lib.sh
Expand All @@ -17,9 +17,6 @@ if [ -r @scriptdir@/bareos-config-lib.sh ]; then
dbc_dbname=`get_database_name bareos` || true
dbc_dbuser=`get_database_user bareos` || true

# only postgresql
dbc_pgsql_createdb_encoding="SQL_ASCII"

# only required for sqlite3
dbc_basepath=`get_working_dir`

Expand Down Expand Up @@ -92,7 +89,9 @@ if [ -r @scriptdir@/bareos-config-lib.sh ]; then
case "`get_database_driver`" in
postgresql)
if [ -z "${bareos_database_password}" ]; then
db_set bareos-database-common/pgsql/authmethod-user "ident"
#db_set bareos-database-common/pgsql/authmethod-user "ident"
# workaround: if an empty database password is defined, explicitly set it
db_set bareos-database-common/pgsql/app-pass ""
fi
;;
mysql)
Expand Down
7 changes: 5 additions & 2 deletions debian/bareos-database-common.postinst.in
View file
Expand Up @@ -14,8 +14,8 @@ set -e
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package

#set -x
#echo "bareos-database-common.postinst: $@" >&2
set -x
echo "bareos-database-common.postinst: $@" >&2

. /usr/share/debconf/confmodule

Expand All @@ -39,6 +39,9 @@ if [ -r @scriptdir@/bareos-config-lib.sh ]; then
esac
fi

# dbc_pgsql_createdb_encoding: required for postgresql
dbc_pgsql_createdb_encoding="SQL_ASCII"

# dbc_dbfile_owner: only required for sqlite3
dbc_dbfile_owner=`get_user_dir`:`get_group_dir`

Expand Down
2 changes: 1 addition & 1 deletion debian/bareos-database-mysql.install
View file
@@ -1,4 +1,4 @@
/usr/lib/libb*-mysql*.so
/usr/lib/bareos/scripts/ddl/*/mysql*.sql
/usr/share/dbconfig-common/data/bareos-database-common/install/mysql
/usr/share/dbconfig-common/data/bareos-database-common/upgrade/mysql/*
/usr/share/dbconfig-common/data/bareos-database-common/upgrade-dbadmin/mysql/*
2 changes: 1 addition & 1 deletion debian/bareos-database-postgresql.install
View file
@@ -1,4 +1,4 @@
/usr/lib/libb*-postgresql*.so
/usr/lib/bareos/scripts/ddl/*/postgresql*.sql
/usr/share/dbconfig-common/data/bareos-database-common/install/pgsql
/usr/share/dbconfig-common/data/bareos-database-common/upgrade/pgsql/*
/usr/share/dbconfig-common/data/bareos-database-common/upgrade-dbadmin/pgsql/*
2 changes: 1 addition & 1 deletion debian/bareos-database-sqlite3.install
View file
@@ -1,5 +1,5 @@
/usr/lib/libb*-sqlite3*.so
/usr/lib/bareos/scripts/ddl/*/sqlite3*.sql
/usr/share/dbconfig-common/data/bareos-database-common/install/sqlite3
/usr/share/dbconfig-common/data/bareos-database-common/upgrade/sqlite3/*
/usr/share/dbconfig-common/data/bareos-database-common/upgrade/sqlite3-dbadmin/*

12 changes: 6 additions & 6 deletions platforms/debian/Makefile.in
View file
Expand Up @@ -52,12 +52,12 @@ install-dbconfig:
@ln -s $(scriptdir)/ddl/creates/mysql.sql $(DESTDIR)/usr/share/dbconfig-common/data/bareos-database-common/install/mysql
@ln -s $(scriptdir)/ddl/creates/postgresql.sql $(DESTDIR)/usr/share/dbconfig-common/data/bareos-database-common/install/pgsql
@ln -s $(scriptdir)/ddl/creates/sqlite3.sql $(DESTDIR)/usr/share/dbconfig-common/data/bareos-database-common/install/sqlite3
@$(MKDIR) $(DESTDIR)/usr/share/dbconfig-common/data/bareos-database-common/upgrade/mysql/
for i in $(DESTDIR)/$(scriptdir)/ddl/updates/mysql.*.sql; do BASENAME=`basename $$i`; VERSION=`echo $$BASENAME | sed -r 's/mysql\.[0-9]*_([0-9]*)\.sql/\1/'`; ln -s $(scriptdir)/ddl/updates/$$BASENAME $(DESTDIR)/usr/share/dbconfig-common/data/bareos-database-common/upgrade/mysql/$$VERSION; done
@$(MKDIR) $(DESTDIR)/usr/share/dbconfig-common/data/bareos-database-common/upgrade/pgsql/
for i in $(DESTDIR)/$(scriptdir)/ddl/updates/postgresql.*.sql; do BASENAME=`basename $$i`; VERSION=`echo $$BASENAME | sed -r 's/postgresql\.[0-9]*_([0-9]*)\.sql/\1/'`; ln -s $(scriptdir)/ddl/updates/$$BASENAME $(DESTDIR)/usr/share/dbconfig-common/data/bareos-database-common/upgrade/pgsql/$$VERSION; done
@$(MKDIR) $(DESTDIR)/usr/share/dbconfig-common/data/bareos-database-common/upgrade/sqlite3/
for i in $(DESTDIR)/$(scriptdir)/ddl/updates/sqlite3.*.sql; do BASENAME=`basename $$i`; VERSION=`echo $$BASENAME | sed -r 's/sqlite3\.[0-9]*_([0-9]*)\.sql/\1/'`; ln -s $(scriptdir)/ddl/updates/$$BASENAME $(DESTDIR)/usr/share/dbconfig-common/data/bareos-database-common/upgrade/sqlite3/$$VERSION; done
@$(MKDIR) $(DESTDIR)/usr/share/dbconfig-common/data/bareos-database-common/upgrade-dbadmin/mysql/
for i in $(DESTDIR)/$(scriptdir)/ddl/updates/mysql.*.sql; do BASENAME=`basename $$i`; VERSION=`echo $$BASENAME | sed -r 's/mysql\.[0-9]*_([0-9]*)\.sql/\1/'`; ln -s $(scriptdir)/ddl/updates/$$BASENAME $(DESTDIR)/usr/share/dbconfig-common/data/bareos-database-common/upgrade-dbadmin/mysql/$$VERSION; done
@$(MKDIR) $(DESTDIR)/usr/share/dbconfig-common/data/bareos-database-common/upgrade-dbadmin/pgsql/
for i in $(DESTDIR)/$(scriptdir)/ddl/updates/postgresql.*.sql; do BASENAME=`basename $$i`; VERSION=`echo $$BASENAME | sed -r 's/postgresql\.[0-9]*_([0-9]*)\.sql/\1/'`; ln -s $(scriptdir)/ddl/updates/$$BASENAME $(DESTDIR)/usr/share/dbconfig-common/data/bareos-database-common/upgrade-dbadmin/pgsql/$$VERSION; done
@$(MKDIR) $(DESTDIR)/usr/share/dbconfig-common/data/bareos-database-common/upgrade-dbadmin/sqlite3/
for i in $(DESTDIR)/$(scriptdir)/ddl/updates/sqlite3.*.sql; do BASENAME=`basename $$i`; VERSION=`echo $$BASENAME | sed -r 's/sqlite3\.[0-9]*_([0-9]*)\.sql/\1/'`; ln -s $(scriptdir)/ddl/updates/$$BASENAME $(DESTDIR)/usr/share/dbconfig-common/data/bareos-database-common/upgrade-dbadmin/sqlite3/$$VERSION; done

clean:
@$(RMF) 1 2 3
Expand Down
6 changes: 3 additions & 3 deletions platforms/debian/set_dbconfig_vars.sh.in
View file
Expand Up @@ -15,17 +15,17 @@ else
#dbc_dbport=
dbname=`get_database_name`
dbuser=`get_database_user`
bareos_database_password=`get_database_password`
dbpass=`get_database_password`
case "`get_database_driver`" in
postgresql)
dbtype="pgsql"
# if Bareos config password is defined, set dbpass
[ "$bareos_database_password" ] && dbpass="$bareos_database_password"
#[ "$bareos_database_password" ] && dbpass="$bareos_database_password"
;;
mysql)
dbtype="mysql"
# set dbpass, even if empty
dbpass="$bareos_database_password"
#dbpass="$bareos_database_password"
;;
sqlite3)
dbtype="sqlite3"
Expand Down

0 comments on commit 436e36f

Please sign in to comment.