zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-01 16:53:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:internetee/registry

Browse source
This commit is contained in:
Martin Lensment 2014-09-25 13:15:27 +03:00
commit 1f2c12d7da
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -87,8 +87,8 @@ group :development, :test do
# For feature testing # For feature testing
# gem 'capybara-webkit', '1.2.0' # Webkit driver didn't work with turbolinks # gem 'capybara-webkit', '1.2.0' # Webkit driver didn't work with turbolinks
gem 'phantomjs-binaries', '~> 1.9.2.4' gem 'phantomjs-binaries', '~> 1.9.2.4'
gem 'phantomjs', '~> 1.9.7.1', require: 'phantomjs/poltergeist'
gem 'poltergeist', '~> 1.5.1' # We are using PhantomJS instead gem 'poltergeist', '~> 1.5.1' # We are using PhantomJS instead
gem 'phantomjs', '~> 1.9.7.1'
# For cleaning db in feature and epp tests # For cleaning db in feature and epp tests
gem 'database_cleaner', '~> 1.3.0' gem 'database_cleaner', '~> 1.3.0'

9
config/deploy.rb
View file

@ -21,8 +21,7 @@ set :shared_paths, [
'config/database.yml', 'config/database.yml',
'config/secrets.yml', 'config/secrets.yml',
'log', 'log',
'public/system', 'public/system'
'public/assets'
] ]
# Optional settings: # Optional settings:
@ -50,6 +49,12 @@ task :setup => :environment do
queue! %[mkdir -p "#{deploy_to}/shared/config"] queue! %[mkdir -p "#{deploy_to}/shared/config"]
queue! %[chmod g+rx,u+rwx "#{deploy_to}/shared/config"] queue! %[chmod g+rx,u+rwx "#{deploy_to}/shared/config"]
queue! %[mkdir -p "#{deploy_to}/shared/public"]
queue! %[chmod g+rx,u+rwx "#{deploy_to}/shared/public"]
queue! %[mkdir -p "#{deploy_to}/shared/public/system"]
queue! %[chmod g+rx,u+rwx "#{deploy_to}/shared/public/system"]
queue! %[touch "#{deploy_to}/shared/config/database.yml"] queue! %[touch "#{deploy_to}/shared/config/database.yml"]
queue %[echo "-----> Be sure to edit 'shared/config/database.yml'."] queue %[echo "-----> Be sure to edit 'shared/config/database.yml'."]
end end