Use dbconfig-common template mechanism

Use dbconfig-commons' template mechanism to generate the configuration
files for rsyslog-mysql and rsyslog-pgsql.
This simplifies postinst quite a bit and makes sure we don't read any
unitialized debconf values.

6 files changed, 16 insertions, 46 deletions

diff --git a/debian/rsyslog-mysql.conf.template b/debian/rsyslog-mysql.conf.template
new file mode 100644
index 0000000..ca9e477
--- /dev/null
+++ b/debian/rsyslog-mysql.conf.template
@@ -0,0 +1,5 @@
+### Configuration file for rsyslog-mysql
+### Changes are preserved
+
+$ModLoad ommysql
+*.* :ommysql:_DBC_DBSERVER_,_DBC_DBNAME_,_DBC_DBUSER_,_DBC_DBPASS_
diff --git a/debian/rsyslog-mysql.install b/debian/rsyslog-mysql.install
index 0cae021..6d1525b 100644
--- a/debian/rsyslog-mysql.install
+++ b/debian/rsyslog-mysql.install
@@ -1 +1,2 @@
 debian/tmp/usr/lib/rsyslog/ommysql.so
+debian/rsyslog-mysql.conf.template usr/share/rsyslog-mysql/
diff --git a/debian/rsyslog-mysql.postinst b/debian/rsyslog-mysql.postinst
index 6436bfa..fd92deb 100644
--- a/debian/rsyslog-mysql.postinst
+++ b/debian/rsyslog-mysql.postinst
@@ -18,35 +18,14 @@ set -e
 . /usr/share/dbconfig-common/dpkg/postinst.mysql
 
 
-db_get rsyslog-mysql/db/dbname
-DATABASE="$RET"
-db_get rsyslog-mysql/db/app-user
-USER="$RET"
-db_get rsyslog-mysql/mysql/app-pass
-PASS="$RET"
-db_get rsyslog-mysql/remote/host
-HOST="$RET"
-[ -z "$HOST" ] && HOST="localhost"
-
-
+dbc_generate_include_args="-o template_infile=/usr/share/rsyslog-mysql/rsyslog-mysql.conf.template"
+dbc_generate_include=template:/etc/rsyslog.d/mysql.conf
 dbc_go rsyslog-mysql $@
 
 
 case "$1" in
     configure)
-	tempfile=`tempfile`
-
-	cat <<-EOF > $tempfile
-	### Configuration file for rsyslog-mysql
-	### Changes are preserved 
-
-	\$ModLoad ommysql
-	*.* :ommysql:$HOST,$DATABASE,$USER,$PASS
-	EOF
-
-	ucf --debconf-ok $tempfile /etc/rsyslog.d/mysql.conf
 	ucfr rsyslog-mysql /etc/rsyslog.d/mysql.conf
-	rm -f $tempfile
 
 	invoke-rc.d rsyslog reload
     ;;
diff --git a/debian/rsyslog-pgsql.conf.template b/debian/rsyslog-pgsql.conf.template
new file mode 100644
index 0000000..1c97ea3
--- /dev/null
+++ b/debian/rsyslog-pgsql.conf.template
@@ -0,0 +1,5 @@
+### Configuration file for rsyslog-pgsql
+### Changes are preserved
+
+$ModLoad ompgsql
+*.* :ompgsql:_DBC_DBSERVER_,_DBC_DBNAME_,_DBC_DBUSER_,_DBC_DBPASS_
diff --git a/debian/rsyslog-pgsql.install b/debian/rsyslog-pgsql.install
index e64e899..aa361b6 100644
--- a/debian/rsyslog-pgsql.install
+++ b/debian/rsyslog-pgsql.install
@@ -1 +1,2 @@
 debian/tmp/usr/lib/rsyslog/ompgsql.so
+debian/rsyslog-pgsql.conf.template usr/share/rsyslog-pgsql/
diff --git a/debian/rsyslog-pgsql.postinst b/debian/rsyslog-pgsql.postinst
index 9ab43c6..1ffe776 100644
--- a/debian/rsyslog-pgsql.postinst
+++ b/debian/rsyslog-pgsql.postinst
@@ -18,35 +18,14 @@ set -e
 . /usr/share/dbconfig-common/dpkg/postinst.pgsql
 
 
-db_get rsyslog-pgsql/db/dbname
-DATABASE="$RET"
-db_get rsyslog-pgsql/db/app-user
-USER="$RET"
-db_get rsyslog-pgsql/pgsql/app-pass
-PASS="$RET"
-db_get rsyslog-pgsql/remote/host
-HOST="$RET"
-[ -z "$HOST" ] && HOST="localhost"
-
-
+dbc_generate_include_args="-o template_infile=/usr/share/rsyslog-pgsql/rsyslog-pgsql.conf.template"
+dbc_generate_include=template:/etc/rsyslog.d/pgsql.conf
 dbc_go rsyslog-pgsql $@
 
 
 case "$1" in
     configure)
-	tempfile=`tempfile`
-
-	cat <<-EOF > $tempfile
-	### Configuration file for rsyslog-pgsql
-	### Changes are preserved 
-
-	\$ModLoad ompgsql
-	*.* :ompgsql:$HOST,$DATABASE,$USER,$PASS
-	EOF
-
-	ucf --debconf-ok $tempfile /etc/rsyslog.d/pgsql.conf
 	ucfr rsyslog-pgsql /etc/rsyslog.d/pgsql.conf
-	rm -f $tempfile
 
 	invoke-rc.d rsyslog reload
     ;;