nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "add a circumvent_ssl_requirement option to application.yml.example; sending out a mail to diaspora-dev for more info"

Browse source 
This reverts commit ed45789403.
This commit is contained in:
Maxwell Salzberg 2012-01-18 16:52:13 -08:00
parent e4bb00fa2f
commit 1b3cdbb78a
3 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
config/application.yml.example
View file

@ -125,7 +125,6 @@ defaults: &defaults
# Diaspora is only tested against this default pubsub server. You probably don't want to change this. # Diaspora is only tested against this default pubsub server. You probably don't want to change this.
pubsub_server: 'https://pubsubhubbub.appspot.com/' pubsub_server: 'https://pubsubhubbub.appspot.com/'
circumvent_ssl_requirement: false
# Email # Email
# Setting this to true enables Diaspora's "send email" functionality, # Setting this to true enables Diaspora's "send email" functionality,

4
config/environments/production.rb
View file

@ -2,8 +2,6 @@
# licensed under the Affero General Public License version 3 or later. See # licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file. # the COPYRIGHT file.
require File.join(Rails.root, 'lib', 'enviroment_configuration')
Diaspora::Application.configure do Diaspora::Application.configure do
# Settings specified here will take precedence over those in config/environment.rb # Settings specified here will take precedence over those in config/environment.rb
@ -40,7 +38,7 @@ Diaspora::Application.configure do
config.serve_static_assets = false config.serve_static_assets = false
#force ssl in production #force ssl in production
config.middleware.insert_before ActionDispatch::Static, "Rack::SSL" unless EnviromentConfiguration.circumvent_ssl? config.middleware.insert_before ActionDispatch::Static, "Rack::SSL"
# Enable serving of images, stylesheets, and javascripts from an asset server # Enable serving of images, stylesheets, and javascripts from an asset server
# config.action_controller.asset_host = "http://assets.example.com" # config.action_controller.asset_host = "http://assets.example.com"

4
lib/enviroment_configuration.rb
View file

@ -29,10 +29,6 @@ module EnviromentConfiguration
end end
end end
def self.circumvent_ssl?
ENV['NO_SSL'] || AppConfig[:circumvent_ssl_requirement].present?
end
def self.ca_cert_file_location def self.ca_cert_file_location
if self.heroku? if self.heroku?
"/usr/lib/ssl/certs/ca-certificates.crt" "/usr/lib/ssl/certs/ca-certificates.crt"