Merge branch 'master' of https://github.com/ZeusWPI/Tap

2015-09-02 14:35:36 +02:00 · 2015-09-02 14:35:36 +02:00 · 3f43dd8cd5
parent c0fe8833fa 060d4b6a0c
commit 3f43dd8cd5
1 changed files with 8 additions and 1 deletions
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@ -78,5 +78,12 @@ Rails.application.configure do

  Paperclip.options[:command_path] = "/usr/local/bin/"

-  config.action_mailer.default_url_options = { host: 'TODO' }
+  # Help the asset pipeline for staging
+  config.x.host = 'zeus.ugent.be'
+  config.relative_url_root = "/tap"
+
+  config.action_mailer.default_url_options = {
+    host: config.x.host,
+    script_name: config.relative_url_root,
+  }
 end