From b6938eac1c7ce8dc0acc0f1cabc10c8722c4cb27 Mon Sep 17 00:00:00 2001
From: Eric Schultz <eric@wwahammy.com>
Date: Thu, 6 Sep 2018 12:45:46 -0500
Subject: [PATCH] Remove CDN.port. BREAKING CHANGE

---
 config/commitchange.yml           | 3 +--
 config/environment.rb             | 5 +----
 config/environments/production.rb | 1 -
 config/settings.yml               | 3 +--
 lib/tasks/settings.rake           | 1 -
 5 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/config/commitchange.yml b/config/commitchange.yml
index 295b5ec7..8c9803d9 100644
--- a/config/commitchange.yml
+++ b/config/commitchange.yml
@@ -28,8 +28,7 @@ mailer:
   email: "support@commitchange.com"
 
 cdn:
-  url: "http://localhost"
-  port: 5000
+  url: "http://localhost:5000"
 
 payment_provider:
   stripe_connect: true
diff --git a/config/environment.rb b/config/environment.rb
index 71519b2b..31707397 100755
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -101,11 +101,8 @@ Config.schema do
 
   required(:cdn).schema do
     # URL for your CDN for assets. Usually this is just your url
-    # Default is http://localhost
+    # Default is http://localhost:8080
     required(:url).filled(:str?)
-
-    # the port for your cdn. Default is 8080
-    optional(:port).filled(:int?)
   end
 
   required(:payment_provider).schema do
diff --git a/config/environments/production.rb b/config/environments/production.rb
index f5bba9c2..8de071ba 100755
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -45,7 +45,6 @@ Commitchange::Application.configure do
 	# Enable serving of images, stylesheets, and JavaScripts from an asset server
 
   cdn_url= URI(Settings.cdn.url)
-  cdn_url.port = Settings.cdn.port if Settings.cdn.port
   cdn_url = cdn_url.to_s
 	config.action_controller.asset_host = cdn_url
 	config.action_mailer.asset_host = cdn_url
diff --git a/config/settings.yml b/config/settings.yml
index abc35b12..560c403a 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -30,8 +30,7 @@ mailer:
   host: "http://localhost"
 
 cdn:
-  url: "http://localhost"
-  port: 5000
+  url: "http://localhost:5000"
 
 payment_provider:
   stripe_connect: false
diff --git a/lib/tasks/settings.rake b/lib/tasks/settings.rake
index bcfa2b53..fcb1fbb0 100644
--- a/lib/tasks/settings.rake
+++ b/lib/tasks/settings.rake
@@ -14,7 +14,6 @@ namespace :settings do
   task :generate_json => :environment do
 
     cdn_url= URI(Settings.cdn.url)
-    cdn_url.port = Settings.cdn.port if Settings.cdn.port
     cdn_url = cdn_url.to_s
     if (Settings.button_config&.url)
       cdn_url= URI(Settings.button_config.url).to_s