Archives
/
asciinema.org
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use heroku style config (based on ENV)

Browse Source
openid
Marcin Kulik 12 years ago
parent 452a0f30d3
commit 38faf7e437
8 changed files with 35 additions and 39 deletions
Show Stats Download Patch File Download Diff File

2
app/uploaders/basic_uploader.rb
Unescape Escape View File

@ -7,7 +7,7 @@ class BasicUploader < CarrierWave::Uploader::Base
# include CarrierWave::MiniMagick
# Choose what kind of storage to use for this uploader:
storage CFG.carrierwave_storage
storage CFG['CARRIERWAVE_STORAGE']
# storage :fog
# Override the directory where uploaded files will be stored.

4
app/views/layouts/_ga.html.erb
Unescape Escape View File

@ -1,8 +1,8 @@
<% if CFG.google_analytics_id %>
<% if CFG['GOOGLE_ANALYTICS_ID'] %>
<script type="text/javascript">
var _gaq = _gaq || [];
_gaq.push(['_setAccount', '<%= CFG.google_analytics_id %>']);
_gaq.push(['_setAccount', '<%= CFG['GOOGLE_ANALYTICS_ID'] %>']);
_gaq.push(['_trackPageview']);
(function() {

2
app/views/layouts/application.html.erb
Unescape Escape View File

@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<title><% if @title %><%= @title + " - " %><% end %>ascii.io</title>
<%= airbrake_javascript_notifier unless CFG.airbrake_api_key.blank? %>
<%= airbrake_javascript_notifier unless CFG['AIRBRAKE_API_KEY'].blank? %>
<%= csrf_meta_tags %>
<!-- Le HTML5 shim, for IE6-8 support of HTML elements -->

42
config/app.yml
Unescape Escape View File

@ -1,36 +1,32 @@
defaults: &defaults
carrierwave_storage: :fog
oauth:
twitter:
consumer_key: "qAFaJs7lyIm3xjtdtFaQ"
consumer_secret: "Ytqj4IfXmQ7gn0yWf2GgFUpFDAWfqYpVkX3P1ng0TU"
github:
consumer_key: "455d7cde838004d7d46a"
consumer_secret: "5e076dbe06e79f6a7e329a4c7b306c0a0c6055c1"
google_analytics_id:
airbrake_api_key:
airbrake_host:
CARRIERWAVE_STORAGE: :fog
GOOGLE_ANALYTICS_ID:
AIRBRAKE_API_KEY:
AIRBRAKE_HOST:
AWS_ACCESS_KEY_ID:
AWS_SECRET_ACCESS_KEY:
AWS_REGION:
AWS_BUCKET:
development:
<<: *defaults
email_host: "localhost:3000"
carrierwave_storage: :file
EMAIL_HOST: "localhost:3000"
CARRIERWAVE_STORAGE: :file
TWITTER_CONSUMER_KEY: "qAFaJs7lyIm3xjtdtFaQ"
TWITTER_CONSUMER_SECRET: "Ytqj4IfXmQ7gn0yWf2GgFUpFDAWfqYpVkX3P1ng0TU"
GITHUB_CONSUMER_KEY: "455d7cde838004d7d46a"
GITHUB_CONSUMER_SECRET: "5e076dbe06e79f6a7e329a4c7b306c0a0c6055c1"
bugfix:
<<: *defaults
carrierwave_storage: :fog
CARRIERWAVE_STORAGE: :fog
production:
<<: *defaults
email_host: "ascii.io"
carrierwave_storage: :fog
carrierwave_fog:
aws_access_key_id:
aws_secret_access_key:
aws_region:
bucket:
EMAIL_HOST: "ascii.io"
CARRIERWAVE_STORAGE: :fog
test:
<<: *defaults
email_host: "example.org"
carrierwave_storage: :file
EMAIL_HOST: "example.org"
CARRIERWAVE_STORAGE: :file

2
config/application.rb
Unescape Escape View File

@ -53,7 +53,7 @@ module AsciiIo
# Version of your assets, change this if you want to expire all your assets
config.assets.version = '1.0'
config.action_mailer.default_url_options = { :host => CFG.email_host }
config.action_mailer.default_url_options = { :host => CFG['EMAIL_HOST'] }
end
end

10
config/initializers/carrierwave.rb
Unescape Escape View File

@ -1,11 +1,11 @@
if CFG.carrierwave_storage == :fog
if CFG['CARRIERWAVE_STORAGE'] == :fog
CarrierWave.configure do |config|
config.fog_credentials = {
:provider => 'AWS',
:aws_access_key_id => CFG.carrierwave_fog.aws_access_key_id,
:aws_secret_access_key => CFG.carrierwave_fog.aws_secret_access_key,
:region => CFG.carrierwave_fog.aws_region
:aws_access_key_id => CFG['AWS_ACCESS_KEY_ID'],
:aws_secret_access_key => CFG['AWS_SECRET_ACCESS_KEY'],
:region => CFG['AWS_REGION']
}
config.fog_directory = CFG.carrierwave_fog.bucket
config.fog_directory = CFG['AWS_BUCKET']
end
end

8
config/initializers/errbit.rb
Unescape Escape View File

@ -1,12 +1,12 @@
Airbrake.configure do |config|
unless CFG.airbrake_api_key.blank?
config.api_key = CFG.airbrake_api_key
config.host = CFG.airbrake_host
unless CFG['AIRBRAKE_API_KEY'].blank?
config.api_key = CFG['AIRBRAKE_API_KEY']
config.host = CFG['AIRBRAKE_HOST']
config.port = 80
config.secure = config.port == 443
end
envs = ['development', 'bugfix']
envs << Rails.env if CFG.airbrake_api_key.blank?
envs << Rails.env if CFG['AIRBRAKE_API_KEY'].blank?
config.development_environments = envs
end

4
config/initializers/omniauth.rb
Unescape Escape View File

@ -1,4 +1,4 @@
Rails.application.config.middleware.use OmniAuth::Builder do
provider :twitter, CFG.oauth.twitter.consumer_key, CFG.oauth.twitter.consumer_secret, :client_options => { :ssl => { :ca_path => "/etc/ssl/certs" } }
provider :github, CFG.oauth.github.consumer_key, CFG.oauth.github.consumer_secret, :client_options => { :ssl => { :ca_path => "/etc/ssl/certs" } }
provider :twitter, CFG['TWITTER_CONSUMER_KEY'], CFG['TWITTER_CONSUMER_SECRET'], :client_options => { :ssl => { :ca_path => "/etc/ssl/certs" } }
provider :github, CFG['GITHUB_CONSUMER_KEY'], CFG['GITHUB_CONSUMER_SECRET'], :client_options => { :ssl => { :ca_path => "/etc/ssl/certs" } }
end

Write Preview
Loading…
Cancel
Save