From fe03d7875d0913d0e085b6a54df12084094fec27 Mon Sep 17 00:00:00 2001
From: Maxwell Salzberg <maxwell@joindiaspora.com>
Date: Wed, 18 Jan 2012 18:01:38 -0800
Subject: [PATCH] update some docs on how circumvent_ssl_requirement works [ci
 skip]"

---
 config/application.yml.example | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/config/application.yml.example b/config/application.yml.example
index 1f2d69eebf..23c900bc14 100644
--- a/config/application.yml.example
+++ b/config/application.yml.example
@@ -196,6 +196,11 @@ defaults: &defaults
   # is running on the default Redis port.
   redis_location: ''
 
+
+
+  #when set, your pod will not force you to use https in production
+  #NOTE: not all features of Diaspora work without SSL, and you may have trouble federating
+  # with other pods
   circumvent_ssl_requirement: false
 
   # Web tracking
-- 
GitLab