gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1012 from hennevogel/master

Browse source 
Fix heroku setup
This commit is contained in:
Henne Vogelsang 2016-05-25 17:08:20 +02:00
commit efda31870b
3 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app.json
View file

@ -5,7 +5,9 @@
"CLOUDINARY_URL": { "CLOUDINARY_URL": {
"required": true "required": true
}, },
"DATABASE_URL": "WILL_NOT_BE_USED", "DATABASE_URL": {
"required": true
},
"DEPLOY_TASKS": "db:cleardb_env", "DEPLOY_TASKS": "db:cleardb_env",
"LANG": { "LANG": {
"required": true "required": true

2
config/database.yml.heroku Normal file
View file

@ -0,0 +1,2 @@
production:
url: <%= ENV["CLEARDB_DATABASE_URL"].sub(/^mysql/, "mysql2") %>

9
lib/tasks/cleardb.rake
View file

@ -1,11 +1,8 @@
namespace :db do namespace :db do
desc 'setup DATABASE_URL from CLEARDB_DATABASE_URL in .env' desc 'setup DATABASE_URL from CLEARDB_DATABASE_URL in config/database.yml'
task cleardb_env: :environment do task 'cleardb_env' do
unless ENV['CLEARDB_DATABASE_URL'].nil? unless ENV['CLEARDB_DATABASE_URL'].nil?
cleardb_url = ENV['CLEARDB_DATABASE_URL'].gsub(/^mysql:\/\//, 'mysql2://') FileUtils.copy_file('config/database.yml.heroku', 'config/database.yml')
dot_env = File.open(Rails.root.join(".env"), 'w')
dot_env.puts "DATABASE_URL=\"#{cleardb_url}\""
dot_env.close
end end
end end
end end