From 617324abee567a7a35d59781a1658070943728dc Mon Sep 17 00:00:00 2001
From: DMehaffy <derrickmehaffy@gmail.com>
Date: Mon, 27 Aug 2018 06:27:42 -0700
Subject: [PATCH 01/14] Basic global proxy support

---
 .../3.x.x/en/configurations/configurations.md | 32 +++++++++++++++++++
 .../environments/development/server.json      |  3 ++
 .../environments/production/server.json       |  3 ++
 .../config/environments/staging/server.json   |  3 ++
 packages/strapi/lib/core/configurations.js    | 18 ++++++++++-
 5 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/docs/3.x.x/en/configurations/configurations.md b/docs/3.x.x/en/configurations/configurations.md
index 56a2ba4d51..2c061fdbc6 100644
--- a/docs/3.x.x/en/configurations/configurations.md
+++ b/docs/3.x.x/en/configurations/configurations.md
@@ -336,6 +336,11 @@ Most of the application's configurations are defined by environment. It means th
  - `host` (string): Host name. Default value: `localhost`.
  - `port` (integer): Port on which the server should be running. Default value: `1337`.
  - `autoReload` (boolean): Enable or disabled server reload on files update. Default value: depends on the environment.
+ - `proxy`
+  - `enabled` (boolean): Enable proxy support such as Apache or Nginx. Default value: `false`.
+  - `ssl` (boolean): Enable proxy SSL support
+  - `host` (string): Host name your proxy service uses for Strapi.
+  - `port` (integer): Port that your proxy service accepts connections on.
  - [`cron`](https://en.wikipedia.org/wiki/Cron)
   - `enabled` (boolean): Enable or disable CRON tasks to schedule jobs at specific dates. Default value: `false`.
  - `admin`
@@ -347,6 +352,33 @@ Most of the application's configurations are defined by environment. It means th
         - `source` (string): Define the source mode (origin, host, custom).
         - `folder` (string): Indicate what the plugins folder in `host` source mode.
 
+#### Example
+
+**Path —** `./config/environments/**/server.json`.
+
+As an example using this configuration with Nginx your server would respond to `https://example.com:8443` instead of `http://localhost:1337`
+
+**Note:** you will need to configure Nginx or Apache as a proxy before configuring this example.
+
+```json
+{
+  "host": "localhost",
+  "port": 1337,
+  "proxy": {
+    "enabled": true,
+    "ssl": true,
+    "host": "example.com",
+    "port": "8443"
+  },
+  "autoReload": {
+    "enabled": true
+  },
+  "cron": {
+    "enabled": true
+  }
+}
+```
+
 ***
 
 ## Dynamic configurations
diff --git a/packages/strapi-generate-new/files/config/environments/development/server.json b/packages/strapi-generate-new/files/config/environments/development/server.json
index 2c9235833f..46db2086bb 100755
--- a/packages/strapi-generate-new/files/config/environments/development/server.json
+++ b/packages/strapi-generate-new/files/config/environments/development/server.json
@@ -1,6 +1,9 @@
 {
   "host": "localhost",
   "port": 1337,
+  "proxy": {
+    "enabled": false
+  },
   "autoReload": {
     "enabled": true
   },
diff --git a/packages/strapi-generate-new/files/config/environments/production/server.json b/packages/strapi-generate-new/files/config/environments/production/server.json
index 0a35d003aa..bc0294e31f 100755
--- a/packages/strapi-generate-new/files/config/environments/production/server.json
+++ b/packages/strapi-generate-new/files/config/environments/production/server.json
@@ -1,6 +1,9 @@
 {
   "host": "localhost",
   "port": "${process.env.PORT || 1337}",
+  "proxy": {
+    "enabled": false
+  },
   "autoReload": {
     "enabled": false
   },
diff --git a/packages/strapi-generate-new/files/config/environments/staging/server.json b/packages/strapi-generate-new/files/config/environments/staging/server.json
index 0a35d003aa..bc0294e31f 100755
--- a/packages/strapi-generate-new/files/config/environments/staging/server.json
+++ b/packages/strapi-generate-new/files/config/environments/staging/server.json
@@ -1,6 +1,9 @@
 {
   "host": "localhost",
   "port": "${process.env.PORT || 1337}",
+  "proxy": {
+    "enabled": false
+  },
   "autoReload": {
     "enabled": false
   },
diff --git a/packages/strapi/lib/core/configurations.js b/packages/strapi/lib/core/configurations.js
index 8fa9da809b..49e80d2c9d 100755
--- a/packages/strapi/lib/core/configurations.js
+++ b/packages/strapi/lib/core/configurations.js
@@ -320,7 +320,23 @@ module.exports.app = async function() {
 
   this.config.port = get(this.config.currentEnvironment, 'server.port') || this.config.port;
   this.config.host = get(this.config.currentEnvironment, 'server.host') || this.config.host;
-  this.config.url = `http://${this.config.host}:${this.config.port}`;
+  
+  // Global proxy support settings
+  this.config.proxy.enabled = get(this.config.currentEnvironment, 'server.proxy.enabled') || this.config.proxy.enabled;
+  this.config.proxy.port = get(this.config.currentEnvironment, 'server.proxy.port') || this.config.proxy.port;
+  this.config.proxy.host = get(this.config.currentEnvironment, 'server.proxy.host') || this.config.proxy.host;
+  this.config.proxy.ssl = get(this.config.currentEnvironment, 'server.proxy.ssl') || this.config.proxy.ssl;
+
+  // check if proxy is enabled and use the defined settings or if false use default
+  if (this.config.proxy.enabled = true) {
+    if (this.config.proxy.ssl = true) {
+      this.config.url = `https://${this.config.proxy.host}:${this.config.proxy.port}`;
+    } else {
+      this.config.url = `http://${this.config.proxy.host}:${this.config.proxy.port}`;
+    }
+  } else {
+    this.config.url = `http://${this.config.host}:${this.config.port}`;
+  }
 };
 
 const enableHookNestedDependencies = function (name, flattenHooksConfig, force = false) {

From 38c4a528e214ff5d115c8d083073f60556415466 Mon Sep 17 00:00:00 2001
From: DMehaffy <derrickmehaffy@gmail.com>
Date: Mon, 27 Aug 2018 07:06:24 -0700
Subject: [PATCH 02/14] Add proxy config to Settings-Manager

---
 .../services/SettingsManager.js               | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/packages/strapi-plugin-settings-manager/services/SettingsManager.js b/packages/strapi-plugin-settings-manager/services/SettingsManager.js
index 3945a3eeda..8fc9666bff 100755
--- a/packages/strapi-plugin-settings-manager/services/SettingsManager.js
+++ b/packages/strapi-plugin-settings-manager/services/SettingsManager.js
@@ -445,6 +445,34 @@ module.exports = {
             value: _.get(strapi.config, `environments.${env}.server.port`, null),
             validations: {}
           },
+          {
+            name: 'form.server.item.proxy.enabled',
+            target: 'server.proxy.enabled',
+            type: 'boolean',
+            value: _.get(strapi.config, `environments.${env}.server.proxy.enabled`, null),
+            validations: {}
+          },
+          {
+            name: 'form.server.item.proxy.ssl',
+            target: 'server.proxy.ssl',
+            type: 'boolean',
+            value: _.get(strapi.config, `environments.${env}.server.proxy.ssl`, null),
+            validations: {}
+          },
+          {
+            name: 'form.server.item.proxy.host',
+            target: 'server.proxy.host',
+            type: 'string',
+            value: _.get(strapi.config, `environments.${env}.server.proxy.host`, null),
+            validations: {}
+          },
+          {
+            name: 'form.server.item.proxy.port',
+            target: 'server.proxy.port',
+            type: 'number',
+            value: _.get(strapi.config, `environments.${env}.server.proxy.port`, null),
+            validations: {}
+          },
           {
             name: 'form.server.item.cron',
             target: 'server.cron.enabled',

From fb6a38c5937d3518cb2c9e0269797696bb2d8a52 Mon Sep 17 00:00:00 2001
From: DMehaffy <derrickmehaffy@gmail.com>
Date: Mon, 27 Aug 2018 07:44:36 -0700
Subject: [PATCH 03/14] Update based on PR Feedback

---
 packages/strapi/lib/core/configurations.js | 24 +++++++++++++---------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/packages/strapi/lib/core/configurations.js b/packages/strapi/lib/core/configurations.js
index 49e80d2c9d..f40a682447 100755
--- a/packages/strapi/lib/core/configurations.js
+++ b/packages/strapi/lib/core/configurations.js
@@ -318,24 +318,28 @@ module.exports.app = async function() {
     return acc;
   }, {});
 
+  // default settings
   this.config.port = get(this.config.currentEnvironment, 'server.port') || this.config.port;
   this.config.host = get(this.config.currentEnvironment, 'server.host') || this.config.host;
   
-  // Global proxy support settings
+  // default construct url
+  this.config.url = `http://${this.config.host}:${this.config.port}`
+
+  // proxy settings
   this.config.proxy.enabled = get(this.config.currentEnvironment, 'server.proxy.enabled') || this.config.proxy.enabled;
   this.config.proxy.port = get(this.config.currentEnvironment, 'server.proxy.port') || this.config.proxy.port;
   this.config.proxy.host = get(this.config.currentEnvironment, 'server.proxy.host') || this.config.proxy.host;
   this.config.proxy.ssl = get(this.config.currentEnvironment, 'server.proxy.ssl') || this.config.proxy.ssl;
 
-  // check if proxy is enabled and use the defined settings or if false use default
-  if (this.config.proxy.enabled = true) {
-    if (this.config.proxy.ssl = true) {
-      this.config.url = `https://${this.config.proxy.host}:${this.config.proxy.port}`;
-    } else {
-      this.config.url = `http://${this.config.proxy.host}:${this.config.proxy.port}`;
-    }
-  } else {
-    this.config.url = `http://${this.config.host}:${this.config.port}`;
+  // check if SSL enabled and construct url
+  function getProxyUrl(ssl, url) {
+  if (ssl) return `https://${url}`
+    return `http://${url}`
+  }
+
+  // check if proxy is enabled and construct url
+  if (get(this.config, 'proxy.enabled')) {
+    this.config.url = getProxyUrl(this.config.proxy.ssl, '${this.config.proxy.host}:${this.config.proxy.port}');
   }
 };
 

From d16191576aa7c1f3a5bccc8af544511806a55923 Mon Sep 17 00:00:00 2001
From: DMehaffy <derrickmehaffy@gmail.com>
Date: Mon, 27 Aug 2018 08:05:44 -0700
Subject: [PATCH 04/14] Add semicolons per feedback

---
 packages/strapi/lib/core/configurations.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/strapi/lib/core/configurations.js b/packages/strapi/lib/core/configurations.js
index f40a682447..50d5e0be0b 100755
--- a/packages/strapi/lib/core/configurations.js
+++ b/packages/strapi/lib/core/configurations.js
@@ -333,8 +333,8 @@ module.exports.app = async function() {
 
   // check if SSL enabled and construct url
   function getProxyUrl(ssl, url) {
-  if (ssl) return `https://${url}`
-    return `http://${url}`
+  if (ssl) return `https://${url}`;
+    return `http://${url}`;
   }
 
   // check if proxy is enabled and construct url

From 76befdbc2660afddc702a6e47cc80221e4c984e4 Mon Sep 17 00:00:00 2001
From: DMehaffy <derrickmehaffy@gmail.com>
Date: Tue, 28 Aug 2018 01:12:53 -0700
Subject: [PATCH 05/14] Fix strapi can't find proxy config

Thank you @MartinMuzatko for your help
---
 packages/strapi/lib/core/configurations.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/strapi/lib/core/configurations.js b/packages/strapi/lib/core/configurations.js
index 50d5e0be0b..3225a3b8fa 100755
--- a/packages/strapi/lib/core/configurations.js
+++ b/packages/strapi/lib/core/configurations.js
@@ -321,11 +321,12 @@ module.exports.app = async function() {
   // default settings
   this.config.port = get(this.config.currentEnvironment, 'server.port') || this.config.port;
   this.config.host = get(this.config.currentEnvironment, 'server.host') || this.config.host;
-  
+
   // default construct url
   this.config.url = `http://${this.config.host}:${this.config.port}`
 
   // proxy settings
+  this.config.proxy = this.config.currentEnvironment.server.proxy;
   this.config.proxy.enabled = get(this.config.currentEnvironment, 'server.proxy.enabled') || this.config.proxy.enabled;
   this.config.proxy.port = get(this.config.currentEnvironment, 'server.proxy.port') || this.config.proxy.port;
   this.config.proxy.host = get(this.config.currentEnvironment, 'server.proxy.host') || this.config.proxy.host;

From 1b20de5f6f4dbfcc8f4115e5e2077ee6b9a752aa Mon Sep 17 00:00:00 2001
From: DMehaffy <derrickmehaffy@gmail.com>
Date: Tue, 28 Aug 2018 01:23:08 -0700
Subject: [PATCH 06/14] Add en names

---
 .../admin/src/translations/en.json                           | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/strapi-plugin-settings-manager/admin/src/translations/en.json b/packages/strapi-plugin-settings-manager/admin/src/translations/en.json
index 2f613a630e..38ed3f0fd5 100755
--- a/packages/strapi-plugin-settings-manager/admin/src/translations/en.json
+++ b/packages/strapi-plugin-settings-manager/admin/src/translations/en.json
@@ -107,6 +107,11 @@
   "form.server.item.port": "Port",
   "form.server.item.cron": "Cron",
 
+  "form.server.item.proxy.enabled": "Proxy Enabled",
+  "form.server.item.proxy.ssl": "Proxy SSL",
+  "form.server.item.proxy.host": "Proxy Host",
+  "form.server.item.proxy.port": "Proxy Port",
+
   "form.language.name": "Languages",
   "form.language.description": "Configure your languages.",
   "form.language.choose": "Choose a language:",

From 282d1a3749538ec83eb609855c6a1cff36ef31ea Mon Sep 17 00:00:00 2001
From: DMehaffy <derrickmehaffy@gmail.com>
Date: Tue, 28 Aug 2018 02:40:08 -0700
Subject: [PATCH 07/14] Fix typo :(

---
 packages/strapi/lib/core/configurations.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/strapi/lib/core/configurations.js b/packages/strapi/lib/core/configurations.js
index 3225a3b8fa..5e8371a8be 100755
--- a/packages/strapi/lib/core/configurations.js
+++ b/packages/strapi/lib/core/configurations.js
@@ -340,7 +340,7 @@ module.exports.app = async function() {
 
   // check if proxy is enabled and construct url
   if (get(this.config, 'proxy.enabled')) {
-    this.config.url = getProxyUrl(this.config.proxy.ssl, '${this.config.proxy.host}:${this.config.proxy.port}');
+    this.config.url = getProxyUrl(this.config.proxy.ssl, `${this.config.proxy.host}:${this.config.proxy.port}`);
   }
 };
 

From 4ae6722674c382651006f3d608d67a2cb49b602d Mon Sep 17 00:00:00 2001
From: DMehaffy <derrickmehaffy@gmail.com>
Date: Tue, 28 Aug 2018 02:45:52 -0700
Subject: [PATCH 08/14] Testing fix for adminui

---
 .../admin/src/translations/en.json                        | 8 ++++----
 .../services/SettingsManager.js                           | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/strapi-plugin-settings-manager/admin/src/translations/en.json b/packages/strapi-plugin-settings-manager/admin/src/translations/en.json
index 38ed3f0fd5..0d9e0baf61 100755
--- a/packages/strapi-plugin-settings-manager/admin/src/translations/en.json
+++ b/packages/strapi-plugin-settings-manager/admin/src/translations/en.json
@@ -107,10 +107,10 @@
   "form.server.item.port": "Port",
   "form.server.item.cron": "Cron",
 
-  "form.server.item.proxy.enabled": "Proxy Enabled",
-  "form.server.item.proxy.ssl": "Proxy SSL",
-  "form.server.item.proxy.host": "Proxy Host",
-  "form.server.item.proxy.port": "Proxy Port",
+  "form.server.item.proxyenabled": "Proxy Enabled",
+  "form.server.item.proxyssl": "Proxy SSL",
+  "form.server.item.proxyhost": "Proxy Host",
+  "form.server.item.proxyport": "Proxy Port",
 
   "form.language.name": "Languages",
   "form.language.description": "Configure your languages.",
diff --git a/packages/strapi-plugin-settings-manager/services/SettingsManager.js b/packages/strapi-plugin-settings-manager/services/SettingsManager.js
index 8fc9666bff..958c320b42 100755
--- a/packages/strapi-plugin-settings-manager/services/SettingsManager.js
+++ b/packages/strapi-plugin-settings-manager/services/SettingsManager.js
@@ -446,28 +446,28 @@ module.exports = {
             validations: {}
           },
           {
-            name: 'form.server.item.proxy.enabled',
+            name: 'form.server.item.proxyenabled',
             target: 'server.proxy.enabled',
             type: 'boolean',
             value: _.get(strapi.config, `environments.${env}.server.proxy.enabled`, null),
             validations: {}
           },
           {
-            name: 'form.server.item.proxy.ssl',
+            name: 'form.server.item.proxyssl',
             target: 'server.proxy.ssl',
             type: 'boolean',
             value: _.get(strapi.config, `environments.${env}.server.proxy.ssl`, null),
             validations: {}
           },
           {
-            name: 'form.server.item.proxy.host',
+            name: 'form.server.item.proxyhost',
             target: 'server.proxy.host',
             type: 'string',
             value: _.get(strapi.config, `environments.${env}.server.proxy.host`, null),
             validations: {}
           },
           {
-            name: 'form.server.item.proxy.port',
+            name: 'form.server.item.proxyport',
             target: 'server.proxy.port',
             type: 'number',
             value: _.get(strapi.config, `environments.${env}.server.proxy.port`, null),

From 53fb70cdda72ea5de61535a1c98c052f10472d75 Mon Sep 17 00:00:00 2001
From: DMehaffy <derrickmehaffy@gmail.com>
Date: Tue, 28 Aug 2018 03:08:41 -0700
Subject: [PATCH 09/14] Fix missing title in adminUI

---
 .../admin/src/translations/en.json                 |  2 +-
 .../services/SettingsManager.js                    | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/strapi-plugin-settings-manager/admin/src/translations/en.json b/packages/strapi-plugin-settings-manager/admin/src/translations/en.json
index 0d9e0baf61..7c29a359b5 100755
--- a/packages/strapi-plugin-settings-manager/admin/src/translations/en.json
+++ b/packages/strapi-plugin-settings-manager/admin/src/translations/en.json
@@ -107,7 +107,7 @@
   "form.server.item.port": "Port",
   "form.server.item.cron": "Cron",
 
-  "form.server.item.proxyenabled": "Proxy Enabled",
+  "form.server.item.proxyenable": "Proxy Enable",
   "form.server.item.proxyssl": "Proxy SSL",
   "form.server.item.proxyhost": "Proxy Host",
   "form.server.item.proxyport": "Proxy Port",
diff --git a/packages/strapi-plugin-settings-manager/services/SettingsManager.js b/packages/strapi-plugin-settings-manager/services/SettingsManager.js
index 958c320b42..f3f3d5e1e9 100755
--- a/packages/strapi-plugin-settings-manager/services/SettingsManager.js
+++ b/packages/strapi-plugin-settings-manager/services/SettingsManager.js
@@ -446,7 +446,13 @@ module.exports = {
             validations: {}
           },
           {
-            name: 'form.server.item.proxyenabled',
+            name: 'form.server.item.cron',
+            target: 'server.cron.enabled',
+            type: 'boolean',
+            value: _.get(strapi.config, `environments.${env}.server.cron.enabled`, null)
+          },
+          {
+            name: 'form.server.item.proxyenable',
             target: 'server.proxy.enabled',
             type: 'boolean',
             value: _.get(strapi.config, `environments.${env}.server.proxy.enabled`, null),
@@ -472,12 +478,6 @@ module.exports = {
             type: 'number',
             value: _.get(strapi.config, `environments.${env}.server.proxy.port`, null),
             validations: {}
-          },
-          {
-            name: 'form.server.item.cron',
-            target: 'server.cron.enabled',
-            type: 'boolean',
-            value: _.get(strapi.config, `environments.${env}.server.cron.enabled`, null)
           }
         ]
       }

From b5a0fd90c8ec9fce8036137427fa2e6dad22da30 Mon Sep 17 00:00:00 2001
From: DMehaffy <derrickmehaffy@gmail.com>
Date: Tue, 28 Aug 2018 03:37:22 -0700
Subject: [PATCH 10/14] Fix port typo in docs

---
 docs/3.x.x/en/configurations/configurations.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/3.x.x/en/configurations/configurations.md b/docs/3.x.x/en/configurations/configurations.md
index 2c061fdbc6..b58df81601 100644
--- a/docs/3.x.x/en/configurations/configurations.md
+++ b/docs/3.x.x/en/configurations/configurations.md
@@ -368,7 +368,7 @@ As an example using this configuration with Nginx your server would respond to `
     "enabled": true,
     "ssl": true,
     "host": "example.com",
-    "port": "8443"
+    "port": 8443
   },
   "autoReload": {
     "enabled": true

From 19918578424ef7647b3ec0bcf676f37273e5d003 Mon Sep 17 00:00:00 2001
From: DMehaffy <derrickmehaffy@gmail.com>
Date: Wed, 29 Aug 2018 08:01:55 -0700
Subject: [PATCH 11/14] Update per PR Feedback

---
 .../admin/src/translations/en.json            |  8 +--
 .../services/SettingsManager.js               | 53 +++++++++++--------
 packages/strapi/lib/core/configurations.js    |  7 ++-
 3 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/packages/strapi-plugin-settings-manager/admin/src/translations/en.json b/packages/strapi-plugin-settings-manager/admin/src/translations/en.json
index 7c29a359b5..367ac24b8b 100755
--- a/packages/strapi-plugin-settings-manager/admin/src/translations/en.json
+++ b/packages/strapi-plugin-settings-manager/admin/src/translations/en.json
@@ -107,10 +107,10 @@
   "form.server.item.port": "Port",
   "form.server.item.cron": "Cron",
 
-  "form.server.item.proxyenable": "Proxy Enable",
-  "form.server.item.proxyssl": "Proxy SSL",
-  "form.server.item.proxyhost": "Proxy Host",
-  "form.server.item.proxyport": "Proxy Port",
+  "form.server.item.proxy.enable": "Proxy Enable",
+  "form.server.item.proxy.ssl": "Proxy SSL",
+  "form.server.item.proxy.host": "Proxy Host",
+  "form.server.item.proxy.port": "Proxy Port",
 
   "form.language.name": "Languages",
   "form.language.description": "Configure your languages.",
diff --git a/packages/strapi-plugin-settings-manager/services/SettingsManager.js b/packages/strapi-plugin-settings-manager/services/SettingsManager.js
index f3f3d5e1e9..40db05f88e 100755
--- a/packages/strapi-plugin-settings-manager/services/SettingsManager.js
+++ b/packages/strapi-plugin-settings-manager/services/SettingsManager.js
@@ -450,33 +450,40 @@ module.exports = {
             target: 'server.cron.enabled',
             type: 'boolean',
             value: _.get(strapi.config, `environments.${env}.server.cron.enabled`, null)
-          },
+          }
+        ]
+      },
+      {
+        name: 'form.server.item.proxy',
+        items: [
           {
-            name: 'form.server.item.proxyenable',
+            name: 'form.server.item.proxy.enable',
             target: 'server.proxy.enabled',
             type: 'boolean',
             value: _.get(strapi.config, `environments.${env}.server.proxy.enabled`, null),
-            validations: {}
-          },
-          {
-            name: 'form.server.item.proxyssl',
-            target: 'server.proxy.ssl',
-            type: 'boolean',
-            value: _.get(strapi.config, `environments.${env}.server.proxy.ssl`, null),
-            validations: {}
-          },
-          {
-            name: 'form.server.item.proxyhost',
-            target: 'server.proxy.host',
-            type: 'string',
-            value: _.get(strapi.config, `environments.${env}.server.proxy.host`, null),
-            validations: {}
-          },
-          {
-            name: 'form.server.item.proxyport',
-            target: 'server.proxy.port',
-            type: 'number',
-            value: _.get(strapi.config, `environments.${env}.server.proxy.port`, null),
+            items: [
+              {
+                name: 'form.server.item.proxy.ssl',
+                target: 'server.proxy.ssl',
+                type: 'boolean',
+                value: _.get(strapi.config, `environments.${env}.server.proxy.ssl`, null),
+                validations: {}
+              },
+              {
+                name: 'form.server.item.proxy.host',
+                target: 'server.proxy.host',
+                type: 'string',
+                value: _.get(strapi.config, `environments.${env}.server.proxy.host`, null),
+                validations: {}
+              },
+              {
+                name: 'form.server.item.proxy.port',
+                target: 'server.proxy.port',
+                type: 'number',
+                value: _.get(strapi.config, `environments.${env}.server.proxy.port`, null),
+                validations: {}
+              }
+            ],
             validations: {}
           }
         ]
diff --git a/packages/strapi/lib/core/configurations.js b/packages/strapi/lib/core/configurations.js
index 5e8371a8be..3adaaeabfe 100755
--- a/packages/strapi/lib/core/configurations.js
+++ b/packages/strapi/lib/core/configurations.js
@@ -326,16 +326,15 @@ module.exports.app = async function() {
   this.config.url = `http://${this.config.host}:${this.config.port}`
 
   // proxy settings
-  this.config.proxy = this.config.currentEnvironment.server.proxy;
+  this.config.proxy = get(this.config.currentEnvironment, 'server.proxy' || {});
   this.config.proxy.enabled = get(this.config.currentEnvironment, 'server.proxy.enabled') || this.config.proxy.enabled;
   this.config.proxy.port = get(this.config.currentEnvironment, 'server.proxy.port') || this.config.proxy.port;
   this.config.proxy.host = get(this.config.currentEnvironment, 'server.proxy.host') || this.config.proxy.host;
   this.config.proxy.ssl = get(this.config.currentEnvironment, 'server.proxy.ssl') || this.config.proxy.ssl;
 
-  // check if SSL enabled and construct url
+  // check if SSL enabled and construct proxy url
   function getProxyUrl(ssl, url) {
-  if (ssl) return `https://${url}`;
-    return `http://${url}`;
+    return `http${ssl ? 's' : ''}://${url}`;
   }
 
   // check if proxy is enabled and construct url

From 873ec86cd5fed94a70d7affe167c015596760671 Mon Sep 17 00:00:00 2001
From: DMehaffy <derrickmehaffy@gmail.com>
Date: Wed, 29 Aug 2018 08:24:18 -0700
Subject: [PATCH 12/14] add section header name

---
 .../admin/src/translations/en.json                               | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/strapi-plugin-settings-manager/admin/src/translations/en.json b/packages/strapi-plugin-settings-manager/admin/src/translations/en.json
index 367ac24b8b..b9365fada3 100755
--- a/packages/strapi-plugin-settings-manager/admin/src/translations/en.json
+++ b/packages/strapi-plugin-settings-manager/admin/src/translations/en.json
@@ -107,6 +107,7 @@
   "form.server.item.port": "Port",
   "form.server.item.cron": "Cron",
 
+  "form.server.item.proxy": "Proxy Settings",
   "form.server.item.proxy.enable": "Proxy Enable",
   "form.server.item.proxy.ssl": "Proxy SSL",
   "form.server.item.proxy.host": "Proxy Host",

From bfadb3f91479cd5112b8c848cbff996dd270446c Mon Sep 17 00:00:00 2001
From: DMehaffy <derrickmehaffy@gmail.com>
Date: Wed, 29 Aug 2018 23:35:44 -0700
Subject: [PATCH 13/14] Adjust Proxy Settings layout in Admin

Cleaning it up and moving SSL to the end.
---
 .../services/SettingsManager.js                    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/strapi-plugin-settings-manager/services/SettingsManager.js b/packages/strapi-plugin-settings-manager/services/SettingsManager.js
index 40db05f88e..8821a267d3 100755
--- a/packages/strapi-plugin-settings-manager/services/SettingsManager.js
+++ b/packages/strapi-plugin-settings-manager/services/SettingsManager.js
@@ -462,13 +462,6 @@ module.exports = {
             type: 'boolean',
             value: _.get(strapi.config, `environments.${env}.server.proxy.enabled`, null),
             items: [
-              {
-                name: 'form.server.item.proxy.ssl',
-                target: 'server.proxy.ssl',
-                type: 'boolean',
-                value: _.get(strapi.config, `environments.${env}.server.proxy.ssl`, null),
-                validations: {}
-              },
               {
                 name: 'form.server.item.proxy.host',
                 target: 'server.proxy.host',
@@ -482,6 +475,13 @@ module.exports = {
                 type: 'number',
                 value: _.get(strapi.config, `environments.${env}.server.proxy.port`, null),
                 validations: {}
+              },
+              {
+                name: 'form.server.item.proxy.ssl',
+                target: 'server.proxy.ssl',
+                type: 'boolean',
+                value: _.get(strapi.config, `environments.${env}.server.proxy.ssl`, null),
+                validations: {}
               }
             ],
             validations: {}

From 6dd705a178bc1eb22944a5dc853c7bb88a529088 Mon Sep 17 00:00:00 2001
From: DMehaffy <derrickmehaffy@gmail.com>
Date: Thu, 30 Aug 2018 02:46:44 -0700
Subject: [PATCH 14/14] Remove lines that aren't needed

Per Jim, removed some lines we don't need.
---
 packages/strapi/lib/core/configurations.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/strapi/lib/core/configurations.js b/packages/strapi/lib/core/configurations.js
index 3adaaeabfe..d39e61fec4 100755
--- a/packages/strapi/lib/core/configurations.js
+++ b/packages/strapi/lib/core/configurations.js
@@ -327,10 +327,6 @@ module.exports.app = async function() {
 
   // proxy settings
   this.config.proxy = get(this.config.currentEnvironment, 'server.proxy' || {});
-  this.config.proxy.enabled = get(this.config.currentEnvironment, 'server.proxy.enabled') || this.config.proxy.enabled;
-  this.config.proxy.port = get(this.config.currentEnvironment, 'server.proxy.port') || this.config.proxy.port;
-  this.config.proxy.host = get(this.config.currentEnvironment, 'server.proxy.host') || this.config.proxy.host;
-  this.config.proxy.ssl = get(this.config.currentEnvironment, 'server.proxy.ssl') || this.config.proxy.ssl;
 
   // check if SSL enabled and construct proxy url
   function getProxyUrl(ssl, url) {