[DRE-commits] [diaspora-installer] 01/02: add intro template

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository diaspora-installer.

commit 36259fb0bce1183969703bb6b9b7f1e17929ad04
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sat May 2 16:58:51 2015 +0530

    add intro template
---
 debian/changelog                 |  2 ++
 debian/diaspora-common.config    | 21 ++++++++++++---------
 debian/diaspora-common.templates | 13 +++++++++++++
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3df345f..4489185 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ diaspora-installer (0.5.0.0+debian1) UNRELEASED; urgency=medium
   * Needs bundler >= 1.7 to parse per gem source option in Gemfile
   * Switch to 0.5.0.0 release
   * Symlink /usr/bin to /usr/share/diaspora
+  * Move database configuration to diaspora-common
+  * Add an introduction debconf text
 
  -- Pirate Praveen <praveen at debian.org>  Wed, 15 Apr 2015 14:44:12 +0530
 
diff --git a/debian/diaspora-common.config b/debian/diaspora-common.config
index dc0863b..3c631ac 100644
--- a/debian/diaspora-common.config
+++ b/debian/diaspora-common.config
@@ -6,15 +6,9 @@ set -e
 # source debconf stuff
 . /usr/share/debconf/confmodule
 
-# source dbconfig-common shell library, and call the hook function
-if [ -f /usr/share/dbconfig-common/dpkg/config.pgsql ]; then
-   . /usr/share/dbconfig-common/dpkg/config.pgsql
-
-   dbc_dbname="diaspora_production"
-   dbc_dbuser="diaspora"
-
-   dbc_go diaspora-common $@
-fi
+# Introduce the package, explain defaults
+db_input high diaspora-common/intro || true
+db_go
 
 # What is your pod address?
 db_input high diaspora-common/url || true
@@ -29,3 +23,12 @@ if [ "$RET" = "false" ]; then
     db_go
 fi
 
+# source dbconfig-common shell library, and call the hook function
+if [ -f /usr/share/dbconfig-common/dpkg/config.pgsql ]; then
+   . /usr/share/dbconfig-common/dpkg/config.pgsql
+
+   dbc_dbname="diaspora_production"
+   dbc_dbuser="diaspora"
+
+   dbc_go diaspora-common $@
+fi
diff --git a/debian/diaspora-common.templates b/debian/diaspora-common.templates
index 2351892..9ed0bea 100644
--- a/debian/diaspora-common.templates
+++ b/debian/diaspora-common.templates
@@ -1,3 +1,16 @@
+Template: diaspora-common/intro
+Type: text
+_Description: Getting started with diaspora-installer
+ This package lets you setup a diaspora pod in easy steps. It configures
+ postgresql as database and nginx as web server.
+ .
+ You can leave PostgreSQL application password blank as we use "ident"
+ authentication method (diaspora user on the system can connect to
+ diaspora database without password).
+ .
+ You will need an ssl certificate for running diaspora. You can generate
+ a self signed certificate using easy-rsa package.
+
 Template: diaspora-common/url
 Type: string
 Default: localhost

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/diaspora-installer.git