[DRE-commits] [diaspora] 152/257: disable ssl

[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 750719e74d5733b5d74a6d4d36c770eca4fb98fa
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Thu Nov 27 00:22:08 2014 +0530

    disable ssl
---
 debian/diaspora.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/diaspora.yml b/debian/diaspora.yml
index b63b61c..f5b85ba 100644
--- a/debian/diaspora.yml
+++ b/debian/diaspora.yml
@@ -36,7 +36,7 @@ configuration: ## Section
     ## 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
     ## will be hardcoded into the database.
-    #url: "https://example.org/"
+    url: "http://localhost:3000/"
 
     ## Set the bundle of certificate authorities (CA) certificates.
     ## This is specific to your operating system.
@@ -57,7 +57,7 @@ configuration: ## Section
     ## OAuth2 requires SSL Diaspora's future API might not work if you're not using
     ## SSL. Also there is no guarantee that posting to services will be possible
     ## if SSL is disabled. Do not change this default unless you are sure!
-    #require_ssl: true
+    require_ssl: false
 
     ## Single-process mode (default=false)
     ## If set to true Diaspora will work with just the appserver (Unicorn by default)

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