From d532016312885e1f0c2e4e3af97a28876337dc82 Mon Sep 17 00:00:00 2001 From: Henne Vogelsang Date: Tue, 22 Mar 2016 18:08:17 +0100 Subject: [PATCH] Get config.yml/secrets.yml out of travis/vagrant --- .travis.yml | 2 -- bootstrap.sh | 18 ------------------ 2 files changed, 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index 050f1f04..f380c1b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,8 +18,6 @@ notifications: on_failure: change before_script: - cp config/database.yml.example config/database.yml - - cp config/config.yml.example config/config.yml - - cp config/secrets.yml.example config/secrets.yml - RAILS_ENV=test bundle exec rake db:migrate --trace script: - 'bundle exec rubocop -Dc .rubocop.yml' diff --git a/bootstrap.sh b/bootstrap.sh index 7ef62f4a..9bebd04d 100644 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -15,24 +15,6 @@ gem install bundler echo -e "\ninstalling your bundle...\n" su - vagrant -c "cd /vagrant/; bundle install --quiet" -# Configure the app if it isn't -if [ ! -f /vagrant/config/config.yml ] && [ -f /vagrant/config/config.yml.example ]; then - echo "Configuring your app in config/options.yml..." - cp config/config.yml.example config/config.yml -else - echo -e "\n\nWARNING: You have already configured your app in config/options.yml." - echo -e "WARNING: Please make sure this configuration works in this vagrant box!\n\n" -fi - -# Configure the app if it isn't -if [ ! -f /vagrant/config/secrets.yml ] && [ -f /vagrant/config/secrets.yml.example ]; then - echo "Configuring your secrets in config/secrets.yml..." - cp config/secrets.yml.example config/secrets.yml -else - echo -e "\n\nWARNING: You have already configured your secrets in config/secrets.yml." - echo -e "WARNING: Please make sure this configuration works in this vagrant box!\n\n" -fi - # Configure the database if it isn't if [ ! -f /vagrant/config/database.yml ] && [ -f /vagrant/config/database.yml.example ]; then echo -e "\nSetting up your database from config/database.yml...\n"