Added support for redirection and 404 hosts

Author: jc21

README.md

@@ -2,13 +2,13 @@
 
 # Nginx Proxy Manager
 
-![Version](https://img.shields.io/badge/version-1.0.0-green.svg)
+![Version](https://img.shields.io/badge/version-1.0.1-green.svg)
 ![Stars](https://img.shields.io/docker/stars/jc21/nginx-proxy-manager.svg)
 ![Pulls](https://img.shields.io/docker/pulls/jc21/nginx-proxy-manager.svg)
 
 ![Build Status](http://bamboo.jc21.com/plugins/servlet/wittified/build-status/AB-NPM)
 
-This NPM comes as a pre-built docker image that enables you to easily forward to your websites
+This project comes as a pre-built docker image that enables you to easily forward to your websites
 running at home or otherwise, including free SSL, without having to know too much about Nginx or Letsencrypt.
 
 
@@ -19,6 +19,10 @@ running at home or otherwise, including free SSL, without having to know too muc
 - Secure your sites with SSL and optionally force SSL
 - Secure your sites with Basic HTTP Authentication Access Lists
 - Advanced Nginx config option for super users
+- 3 domain uses:
+  - Proxy requests to upstream server
+  - Redirect requests to another domain
+  - Return immediate 404's
 
 
 ## Getting started
@@ -84,7 +88,7 @@ I won't go in to too much detail here but here are the basics for someone new to
 1. Your home router will have a Port Forwarding section somewhere. Log in and find it
 2. Add port forwarding for port 80 and 443 to the server hosting this project
 3. Configure your domain name details to point to your home, either with a static ip or a service like DuckDNS
-4. Use the NPM here as your gateway to forward to your other web based services
+4. Use the Nginx Proxy Manager here as your gateway to forward to your other web based services
 
 
 ## Screenshots
@@ -98,8 +102,8 @@ I won't go in to too much detail here but here are the basics for someone new to
 
 - Pass on human readable ssl cert errors to the ui
 - Allow a host to be a redirection to another domain
-- Allow a host to return immediate 404's
 - UI: Allow column sorting on tables
 - UI: Allow filtering hosts by types
 - Advanced option to overwrite the default location block (or regex to do it automatically)
-- Change the renew ssl process to use the letsencrypt renew procedure so as to avoid rate limits
+- Add nice upstream error pages
+

manager/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nginx-proxy-manager",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Nginx proxt with built in Web based management",
   "main": "src/backend/index.js",
   "dependencies": {

manager/src/backend/internal/host.js

@@ -155,15 +155,14 @@ const internalHost = {
      *
      * @param   {Object}  host
      * @param   {Boolean} [reload_nginx]
-     * @param   {Boolean} [force_ssl_renew]
      * @returns {Promise}
      */
-    configure: (host, reload_nginx, force_ssl_renew) => {
+    configure: (host, reload_nginx) => {
         return new Promise((resolve/*, reject*/) => {
             resolve(internalNginx.deleteConfig(host));
         })
             .then(() => {
-                if (host.ssl && (force_ssl_renew || !internalSsl.hasValidSslCerts(host))) {
+                if (host.ssl && !internalSsl.hasValidSslCerts(host)) {
                     return internalSsl.configureSsl(host);
                 }
             })
@@ -248,7 +247,7 @@ const internalHost = {
                 reject(new error.ValidationError('Host does not have SSL enabled'));
             } else {
                 // 3. Fire the ssl and config generation for this host, forcing ssl
-                internalHost.configure(host, true, true)
+                internalSsl.renewSsl(host)
                     .then((/*result*/) => {
                         resolve(host);
                     })

manager/src/backend/internal/nginx.js

@@ -45,7 +45,11 @@ const internalNginx = {
             let filename = internalNginx.getConfigName(host);
 
             try {
-                template        = fs.readFileSync(__dirname + '/../templates/host.conf.ejs', {encoding: 'utf8'});
+                if (typeof host.type === 'undefined' || !host.type) {
+                    host.type = 'proxy';
+                }
+
+                template        = fs.readFileSync(__dirname + '/../templates/' + host.type + '.conf.ejs', {encoding: 'utf8'});
                 let config_text = ejs.render(template, host);
                 fs.writeFileSync(filename, config_text, {encoding: 'utf8'});
                 resolve(true);

manager/src/backend/schema/endpoints/hosts.json

@@ -10,13 +10,20 @@
       "type": "string",
       "readonly": true
     },
+    "type": {
+      "type": "string",
+      "pattern": "^(proxy|redirection|404)$"
+    },
     "hostname": {
       "$ref": "../definitions.json#/definitions/hostname"
     },
     "forward_server": {
       "type": "string",
       "format": "ipv4"
     },
+    "forward_host": {
+      "type": "string"
+    },
     "forward_port": {
       "type": "integer",
       "minumum": 1,
@@ -79,14 +86,19 @@
       "schema": {
         "type": "object",
         "required": [
-          "hostname",
-          "forward_server",
-          "forward_port"
+          "type",
+          "hostname"
         ],
         "properties": {
+          "type": {
+            "$ref": "#/definitions/type"
+          },
           "hostname": {
             "$ref": "#/definitions/hostname"
           },
+          "forward_host": {
+            "$ref": "#/definitions/forward_host"
+          },
           "forward_server": {
             "$ref": "#/definitions/forward_server"
           },
@@ -137,6 +149,9 @@
           "hostname": {
             "$ref": "#/definitions/hostname"
           },
+          "forward_host": {
+            "$ref": "#/definitions/forward_host"
+          },
           "forward_server": {
             "$ref": "#/definitions/forward_server"
           },
@@ -188,9 +203,15 @@
     "_id": {
       "$ref": "#/definitions/_id"
     },
+    "type": {
+      "$ref": "#/definitions/type"
+    },
     "hostname": {
       "$ref": "#/definitions/hostname"
     },
+    "forward_host": {
+      "$ref": "#/definitions/forward_host"
+    },
     "forward_server": {
       "$ref": "#/definitions/forward_server"
     },

manager/src/backend/templates/404.conf.ejs

@@ -0,0 +1,19 @@
+# <%- hostname %>
+server {
+  listen 80;
+  <%- typeof ssl !== 'undefined' && ssl ? 'listen 443 ssl;' : '' %>
+
+  server_name <%- hostname %>;
+
+  access_log /config/logs/<%- hostname %>.log proxy;
+
+<% if (typeof ssl !== 'undefined' && ssl) { -%>
+  include conf.d/include/ssl-ciphers.conf;
+  ssl_certificate /etc/letsencrypt/live/<%- hostname %>/fullchain.pem;
+  ssl_certificate_key /etc/letsencrypt/live/<%- hostname %>/privkey.pem;
+<% } -%>
+
+  <%- typeof advanced !== 'undefined' && advanced ? advanced : '' %>
+
+  return 404;
+}

manager/src/backend/templates/host.conf.ejs renamed to manager/src/backend/templates/proxy.conf.ejs

@@ -0,0 +1,22 @@
+# <%- hostname %>
+server {
+  listen 80;
+  <%- typeof ssl !== 'undefined' && ssl ? 'listen 443 ssl;' : '' %>
+
+  server_name <%- hostname %>;
+
+  access_log /config/logs/<%- hostname %>.log proxy;
+
+  <%- typeof asset_caching !== 'undefined' && asset_caching ? 'include conf.d/include/assets.conf;' : '' %>
+  <%- typeof block_exploits !== 'undefined' && block_exploits ? 'include conf.d/include/block-exploits.conf;' : '' %>
+
+<% if (typeof ssl !== 'undefined' && ssl) { -%>
+  include conf.d/include/ssl-ciphers.conf;
+  ssl_certificate /etc/letsencrypt/live/<%- hostname %>/fullchain.pem;
+  ssl_certificate_key /etc/letsencrypt/live/<%- hostname %>/privkey.pem;
+<% } -%>
+
+  <%- typeof advanced !== 'undefined' && advanced ? advanced : '' %>
+
+  return 301 $scheme://<%- forward_host %>$request_uri;
+}

manager/src/backend/templates/redirection.conf.ejs

@@ -54,12 +54,34 @@ module.exports = {
     },
 
     /**
-     * Show Host Form
+     * Show Proxy Host Form
      *
      * @param model
      */
-    showHostForm: function (model) {
-        require(['./main', './host/form'], function (App, View) {
+    showProxyHostForm: function (model) {
+        require(['./main', './host/proxy_form'], function (App, View) {
+            App.UI.showModalDialog(new View({model: model}));
+        });
+    },
+
+    /**
+     * Show Redirection Host Form
+     *
+     * @param model
+     */
+    showRedirectionHostForm: function (model) {
+        require(['./main', './host/redirection_form'], function (App, View) {
+            App.UI.showModalDialog(new View({model: model}));
+        });
+    },
+
+    /**
+     * Show 404 Host Form
+     *
+     * @param model
+     */
+    show404HostForm: function (model) {
+        require(['./main', './host/404_form'], function (App, View) {
             App.UI.showModalDialog(new View({model: model}));
         });
     },

manager/src/frontend/js/app/controller.js

@@ -1,5 +1,9 @@
 <td colspan="10" class="text-center">
     <br><br>
     <p>It looks like there are no hosts configured.</p>
-    <p><button type="button" class="btn btn-sm btn-success">Create your first Host</button></p>
+    <p>
+        <button type="button" class="btn btn-sm btn-success proxy">Create Proxy Host</button>
+        <button type="button" class="btn btn-sm btn-success redirection">Create Redirection Host</button>
+        <button type="button" class="btn btn-sm btn-success 404">Create 404 Host</button>
+    </p>
 </td>