Merge pull request #25 from conc-at/clueshed_2018

Fix: fix deployment bugs
conc-at · Feb 14, 2018 · c31cf16 · c31cf16
2 parents 19d464b + 464a87f
commit c31cf16
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -20,7 +20,7 @@ deploy:
   api_key:
     secure: ZSMpKpx5Y4+fr1vk6bExCuxO+VgCiNPkuBhWyhVjyI4Zr3rqKPERfTq2BIMq1Ga7MU/V4Muq8tKgQQhrCclnQwfSZet9y37dE71SrIc7CmeUpDVKr7sPxn/CNfIsDjbEEg2jan9NCeIbElrrXCZt1KQ4hX7YHKwUplhfBSuRUVM=
   app:
-    master: clueshed
-    production: lightning-concat
+    master: clueshed2018
+    production: clueshed2018
   on:
     repo: conc-at/clueshed
diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -79,7 +79,7 @@
   config.active_record.dump_schema_after_migration = false
 
   # ActionMailer Config
-  config.action_mailer.default_url_options = {:host => ENV['APP_DOMAIN']}
+  config.action_mailer.default_url_options = { host: '137.74.175.51', port: 3001 }
   config.action_mailer.perform_caching = false
   config.action_mailer.perform_deliveries = true
   config.action_mailer.raise_delivery_errors = false
@@ -91,6 +91,6 @@
     address: "smtp.gmail.com",
     port: 587,
     authentication: "plain",
-    enable_starttls_auto: true
+    enable_starttls_auto: true,
   }
 end