From: Tom Clegg <tclegg@veritasgenetics.com>
Date: Thu, 17 Aug 2017 17:18:41 +0000 (-0400)
Subject: Merge branch 'master' into 12033-multisite-search
X-Git-Tag: 1.1.0~64^2~17
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/e38ac44d14e9006c24c93bca9de1ee299b16d367

Merge branch 'master' into 12033-multisite-search

refs #12033

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>
---

e38ac44d14e9006c24c93bca9de1ee299b16d367
diff --cc build/run-build-packages.sh
index af90eb6f2d,2958d3323d..2cde946d49
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@@ -620,8 -620,8 +620,9 @@@ if [[ "$?" == "0" ]] ; the
        \cp config/application.yml.example config/application.yml -f
        \cp config/environments/production.rb.example config/environments/production.rb -f
        sed -i 's/secret_token: ~/secret_token: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx/' config/application.yml
+       sed -i 's/keep_web_url: false/keep_web_url: exampledotcom/' config/application.yml
  
 +      RAILS_ENV=production RAILS_GROUPS=assets bundle exec rake npm:install >/dev/null
        RAILS_ENV=production RAILS_GROUPS=assets bundle exec rake assets:precompile >/dev/null
  
        # Remove generated configuration files so they don't go in the package.