From 579b7260330334a2710fbce85371996cad73dfad Mon Sep 17 00:00:00 2001 From: Jan Marcek Date: Wed, 11 Feb 2015 11:27:24 +0100 Subject: [PATCH 1/5] edit default users --- unifiedviews-backend-mysql/src/deb/control/templates | 5 ++++- unifiedviews-backend-pgsql/src/deb/control/config | 4 ++-- unifiedviews-backend-pgsql/src/deb/control/templates | 2 ++ unifiedviews-webapp-mysql/src/deb/control/templates | 2 ++ unifiedviews-webapp-pgsql/src/deb/control/config | 4 ++-- unifiedviews-webapp-pgsql/src/deb/control/templates | 2 ++ 6 files changed, 14 insertions(+), 5 deletions(-) diff --git a/unifiedviews-backend-mysql/src/deb/control/templates b/unifiedviews-backend-mysql/src/deb/control/templates index 2b463dc..efa0b8a 100644 --- a/unifiedviews-backend-mysql/src/deb/control/templates +++ b/unifiedviews-backend-mysql/src/deb/control/templates @@ -1,12 +1,15 @@ Template: backend/mysql_root Type: password -Default: admin +Default: root Description: MySQL root password Template: backend/mysql_db_user Type: string +Default: uv Description: MySQL user for unifiedviews + Template: backend/mysql_db_password Type: password +Default: uv Description: MySQL user password for unifiedviews diff --git a/unifiedviews-backend-pgsql/src/deb/control/config b/unifiedviews-backend-pgsql/src/deb/control/config index 398024a..b382253 100644 --- a/unifiedviews-backend-pgsql/src/deb/control/config +++ b/unifiedviews-backend-pgsql/src/deb/control/config @@ -2,8 +2,8 @@ set -e . /usr/share/debconf/confmodule -db_input critical backend/pgsql_db_user || true +db_input low backend/pgsql_db_user || true db_go -db_input critical backend/pgsql_db_password || true +db_input low backend/pgsql_db_password || true db_go diff --git a/unifiedviews-backend-pgsql/src/deb/control/templates b/unifiedviews-backend-pgsql/src/deb/control/templates index 73b6597..3104797 100644 --- a/unifiedviews-backend-pgsql/src/deb/control/templates +++ b/unifiedviews-backend-pgsql/src/deb/control/templates @@ -1,8 +1,10 @@ Template: backend/pgsql_db_user Type: string +Default: uv Description: Postgres user for unifiedviews Template: backend/pgsql_db_password Type: password +Default: uv Description: Postgres user password for unifiedviews \ No newline at end of file diff --git a/unifiedviews-webapp-mysql/src/deb/control/templates b/unifiedviews-webapp-mysql/src/deb/control/templates index c1390ce..8c313a3 100644 --- a/unifiedviews-webapp-mysql/src/deb/control/templates +++ b/unifiedviews-webapp-mysql/src/deb/control/templates @@ -1,7 +1,9 @@ Template: frontend/mysql_db_user Type: string +Default: uv Description: MySQL user for unifiedviews Template: frontend/mysql_db_password Type: password +Default: uv Description: MySQL user password diff --git a/unifiedviews-webapp-pgsql/src/deb/control/config b/unifiedviews-webapp-pgsql/src/deb/control/config index e5501ed..f213c43 100644 --- a/unifiedviews-webapp-pgsql/src/deb/control/config +++ b/unifiedviews-webapp-pgsql/src/deb/control/config @@ -2,8 +2,8 @@ set -e . /usr/share/debconf/confmodule -db_input critical frontend/pgsql_db_user || true +db_input low frontend/pgsql_db_user || true db_go -db_input critical frontend/pgsql_db_password || true +db_input low frontend/pgsql_db_password || true db_go diff --git a/unifiedviews-webapp-pgsql/src/deb/control/templates b/unifiedviews-webapp-pgsql/src/deb/control/templates index bf4b152..38d83af 100644 --- a/unifiedviews-webapp-pgsql/src/deb/control/templates +++ b/unifiedviews-webapp-pgsql/src/deb/control/templates @@ -1,7 +1,9 @@ Template: frontend/pgsql_db_user Type: string +Default: uv Description: Postgresql user for unifiedviews Template: frontend/pgsql_db_password Type: password +Default: uv Description: Postgresql user password From 850ca15526cf529b2ae30e8d02023357f9dce11f Mon Sep 17 00:00:00 2001 From: Jan Marcek Date: Wed, 11 Feb 2015 11:28:02 +0100 Subject: [PATCH 2/5] fix: remove answering user/pass for mysql --- unifiedviews-webapp-shared/src/deb/control/config | 9 --------- unifiedviews-webapp-shared/src/deb/control/postinst | 2 -- unifiedviews-webapp-shared/src/deb/control/templates | 7 ------- 3 files changed, 18 deletions(-) delete mode 100644 unifiedviews-webapp-shared/src/deb/control/config delete mode 100644 unifiedviews-webapp-shared/src/deb/control/templates diff --git a/unifiedviews-webapp-shared/src/deb/control/config b/unifiedviews-webapp-shared/src/deb/control/config deleted file mode 100644 index 2bc2702..0000000 --- a/unifiedviews-webapp-shared/src/deb/control/config +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -set -e -. /usr/share/debconf/confmodule - -db_input critical frontend/mysql_dba_user || true -db_go -db_input critical frontend/mysql_dba_password || true -db_go - diff --git a/unifiedviews-webapp-shared/src/deb/control/postinst b/unifiedviews-webapp-shared/src/deb/control/postinst index 5073605..7faf800 100644 --- a/unifiedviews-webapp-shared/src/deb/control/postinst +++ b/unifiedviews-webapp-shared/src/deb/control/postinst @@ -17,7 +17,6 @@ set -e # for details, see http://www.debian.org/doc/debian-policy/ or # the debian-policy package -. /usr/share/debconf/confmodule prepare_dir() { @@ -33,7 +32,6 @@ prepare_dir() { case "$1" in configure) prepare_dir - db_stop ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/unifiedviews-webapp-shared/src/deb/control/templates b/unifiedviews-webapp-shared/src/deb/control/templates deleted file mode 100644 index bdd9a72..0000000 --- a/unifiedviews-webapp-shared/src/deb/control/templates +++ /dev/null @@ -1,7 +0,0 @@ -Template: frontend/mysql_dba_user -Type: string -Description: MySQL user for unifiedviews - -Template: frontend/mysql_dba_password -Type: password -Description: MySQL user password From 814b5fb6fe8591cd855474e19aeeb945e680a1c4 Mon Sep 17 00:00:00 2001 From: Jan Marcek Date: Wed, 11 Feb 2015 12:11:56 +0100 Subject: [PATCH 3/5] rise up version --- pom.xml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4949c50..ca8021f 100644 --- a/pom.xml +++ b/pom.xml @@ -21,9 +21,11 @@ - ${project.build.directory}/${project.artifactId}-${project.version}_all.deb + ${project.build.directory}/${project.artifactId}-${debian-package-version}_all.deb + ${project.build.directory}/${project.artifactId}-${debian-package-version}_all.deb - ${project.version} + -1 + ${project.version}${debian-package-version-suffix} UTF-8 UTF-8 @@ -38,6 +40,7 @@ because convetion of debian packages: unifiedviews-backend-1.5.1~rc${build_number}.deb --> ${project.version}~${backend-snapshot-suffix} ${project.build.directory}/${project.artifactId}_${debian-package-version}_all.deb + ${project.build.directory}/${project.artifactId}_${debian-package-version}_all.deb From 13293f6d322f7b7f94de733a228509d7fa5d41c7 Mon Sep 17 00:00:00 2001 From: Jan Marcek Date: Wed, 11 Feb 2015 12:43:44 +0100 Subject: [PATCH 4/5] #20 fix - missing LSB tags --- .../src/deb/etc/init.d/unifiedviews-backend | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/unifiedviews-backend/src/deb/etc/init.d/unifiedviews-backend b/unifiedviews-backend/src/deb/etc/init.d/unifiedviews-backend index 705f4ba..46abf6e 100644 --- a/unifiedviews-backend/src/deb/etc/init.d/unifiedviews-backend +++ b/unifiedviews-backend/src/deb/etc/init.d/unifiedviews-backend @@ -3,6 +3,18 @@ # unifiedviews backend # This file was inspirated by tomcat6 init script # +### BEGIN INIT INFO +# Provides: unifiedviews-backend +# Required-Start: $local_fs $remote_fs $network +# Required-Stop: $local_fs $remote_fs $network +# Should-Start: $named +# Should-Stop: $named +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Start unifiedviews-backend at boot time +# Description: Enable unifiedviews-backend provided by daemon. +### END INIT INFO + ## Source function library. #. /etc/rc.d/init.d/functions From bcc94e300241072a20d5788f085a3c3910ee65d9 Mon Sep 17 00:00:00 2001 From: Jan Marcek Date: Wed, 11 Feb 2015 13:13:15 +0100 Subject: [PATCH 5/5] rise up version -snapshot --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ca8021f..c25d793 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ - ${project.version}~${backend-snapshot-suffix} + ${project.version}${debian-package-version-suffix}~${backend-snapshot-suffix} ${project.build.directory}/${project.artifactId}_${debian-package-version}_all.deb ${project.build.directory}/${project.artifactId}_${debian-package-version}_all.deb