[DRE-commits] [diaspora-installer] 02/02: modify debconf templates and description

[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 3ac77475620433bc8bf7f2f029611ae87b0c2dcf
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Mon May 4 15:21:13 2015 +0530

    modify debconf templates and description
---
 debian/changelog                 |  4 +++-
 debian/control                   |  8 +++++---
 debian/diaspora-common.templates | 17 +++++++----------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e15e2d1..1cdfa1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,10 +10,12 @@ diaspora-installer (0.5.0.0+debian1) UNRELEASED; urgency=medium
   * 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
+  * Add an introduction debconf note about postgresql password
+    and ssl certificate
   * Add rake as dependency to diaspora-common
   * Remove dependencies needed only for building native gems from
     diaspora-common
+  * Modify debconf tempaltes (Thanks to Justin B Rye)
 
   * [Debconf translation updates]
   * Swedish (Martin Bagge / brother).  Closes: #781671
diff --git a/debian/control b/debian/control
index f884cd1..b944c9f 100644
--- a/debian/control
+++ b/debian/control
@@ -45,7 +45,8 @@ Description: distributed social networking service - installer
  .
  Learn more about Diaspora at http://diasporafoundation.org
  .
- This package helps to install Diaspora using rubygems.
+ This package configures PostgreSQL as the database and Nginx as the web server.
+ It downloads diaspora and install dependencies using rubygems packaging system.
 
 Package: diaspora-common
 Architecture: all
@@ -63,6 +64,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  mta | exim4,
  net-tools,
  nginx
+Suggests: easy-rsa
 Description: distributed social networking service - common files
  Diaspora (currently styled diaspora* and formerly styled DIASPORA*) is a free
  personal web server that implements a distributed social networking service.
@@ -79,5 +81,5 @@ Description: distributed social networking service - common files
  .
  Learn more about Diaspora at http://diasporafoundation.org
  .
- This package provides files common for the diaspora and diaspora-installer
- packages.
+ This package configures PostgreSQL as the database and Nginx as the web server.
+ It provides files common for the diaspora and diaspora-installer packages.
diff --git a/debian/diaspora-common.templates b/debian/diaspora-common.templates
index 9ed0bea..eadb0be 100644
--- a/debian/diaspora-common.templates
+++ b/debian/diaspora-common.templates
@@ -1,15 +1,12 @@
 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.
+Type: note
+_Description: Notes
+ You can leave the PostgreSQL application password blank, as the "ident"
+ authentication method is used, allowing the diaspora user on the system
+ to connect to the Diaspora database without a password.
  .
- 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.
+ Running Diaspora requires at least a self-signed SSL certificate, which
+ can be generated using (for instance) the package easy-rsa.
 
 Template: diaspora-common/url
 Type: string

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