Commit cedc49bf authored by Maxwell Salzberg's avatar Maxwell Salzberg
Browse files

MS DC; oauth keys are now pulled out of application.yml to be simplier. ... 

MS DC; oauth keys are now pulled out of application.yml to be simplier.  incldue newrelic as heroku expects it, without affecting people who do not use newrelic. If you do use new relic in production, you have to put your newrelic api key in application.yml
parent 683a74d8

.gitignore

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ config/oauth_keys.yml 
config/initializers/secret_token.rb

config/redis.conf

config/deploy_config.yml

config/newrelic.yml

.bundle

vendor/bundle/*

vendor/cache/*

app/models/app_config.rb

+3 −0
Original line number Diff line number Diff line 
# Copyright (c) 2010-2011, Diaspora Inc.  This file is

# licensed under the Affero General Public License version 3 or later.  See

# the COPYRIGHT file.



require 'uri'

require File.join(Rails.root, 'lib', 'enviroment_configuration')
@@ -67,7 +68,9 @@ Please do the following: 
HELP

      Process.exit(1)

    end

  end



  def self.setup!

    normalize_pod_url

    normalize_admins

    normalize_pod_services

config/application.yml.example

+12 −0
Original line number Diff line number Diff line
@@ -96,8 +96,20 @@ defaults: &defaults 
  # Hoptoad api key, send failures to Hoptoad

  hoptoad_api_key: ''



  #social media setup

  facebook_app_id:  ''

  facebook_app_secret: ''



  twitter_consumer_key: ''

  twitter_consumer_secret: ''



  tumblr_consumer_key: ''

  tumblr_consumer_secret: '' 

  # Miscellaneous



  NEW_RELIC_LICENSE_KEY: ''





  # If set to true Diaspora will work with just the appserver, thin by default,

  # running, however this makes it quite slow as all the time intensive jobs

  # must be run inside the request cycle. Also the live updates from the Websocket

config/environments/development.rb

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ Diaspora::Application.configure do 
  

  # Don't care if the mailer can't send

  config.action_mailer.raise_delivery_errors = false

  config.active_support.deprecation = :log

  config.active_support.deprecation = [:stderr, :log]

  #config.threadsafe!

  # Monkeypatch around the nasty "2.5MB exception page" issue, caused by very large environment vars

  # This snippet via: http://stackoverflow.com/questions/3114993/exception-pages-in-development-mode-take-upwards-of-15-30-seconds-to-render-why