[DRE-commits] [diaspora] 165/257: ask only the host name from user

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository diaspora.

commit 9facafdde1e3d20a6d1ef9ee6c714ec52943a744
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Nov 28 15:19:42 2014 +0530

    ask only the host name from user
    
    this will make it easy for us to configre reverse proxy
---
 debian/config    | 2 +-
 debian/templates | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/config b/debian/config
index cb50717..5feb301 100644
--- a/debian/config
+++ b/debian/config
@@ -23,7 +23,7 @@ db_go
 # Configure pod address.
 db_get diaspora/url
 if ! grep ENVIRONMENT_URL /etc/diaspora.conf >/dev/null
-	then echo export ENVIRONMENT_URL=$RET >> /etc/diaspora.conf
+	then echo export ENVIRONMENT_URL=http://$RET >> /etc/diaspora.conf
 fi
 
 if [ "$RET" = "false" ]; then
diff --git a/debian/templates b/debian/templates
index 157c3d2..1965f2f 100644
--- a/debian/templates
+++ b/debian/templates
@@ -3,9 +3,10 @@ Type: string
 Default: http://localhost:3000/
 Description: Set hostname for your diaspora pod
  Set the hostname of the machine you're running Diaspora on, as seen
- from the internet. This should be the URL you want to use to
+ from the internet. This should be the domain name you want to use to
  access the pod. So if you plan to use a reverse proxy, it should be
- the URL the proxy listens on. DO NOT CHANGE THIS AFTER INITIAL SETUP!
- However changing http to https is okay and has no consequences.
- If you do change the URL, you will have to start again as the URL
+ the hostname the proxy listens on. DO NOT CHANGE THIS AFTER INITIAL SETUP!
+ If you do change the hostname, you will have to start again as the hostname
  will be hardcoded into the database.
+ .
+ Examples: example.com, pod.example.com etc

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