2.0.13

.gitlab-ci.yml

@@ -1,4 +1,4 @@
-image: hosttoday/ht-docker-node:npmts
+image: hosttoday/ht-docker-node:npmci
 
 stages:
 - test
@@ -10,17 +10,20 @@ before_script:
 testSTABLE:
   stage: test
   script:
-    - npmci test stable
+    - npmci npm install
+    - npmci npm test stable
   only:
     - tags
   tags:
     - docker
+    - notpriv
 
 release:
   stage: release
   environment: npmjs-com_registry
   script:
-    - npmci publish
+    - npmci npm prepare
+    - npmci npm publish
   only:
     - tags
   tags:

LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 Lossless GmbH
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,20 +1,30 @@
 # smartnginx
+
 control nginx from node, TypeScript ready
 
 ## Status
+
 [![build status](https://gitlab.com/pushrocks/smartnginx/badges/master/build.svg)](https://gitlab.com/pushrocks/smartnginx/commits/master)
 
+## Features
+
+- easy reverse configuration
+- automatic letsencrypt DNS01 challenge based ssl cert generation
+- automatic nginx process handling zero-downtime config reloading
+- works in Docker environements
+
 ## Usage
+
 We recommend the use of TypeScript! :)
 
 ```typescript
-import * as smartnginx from "smartnginx";
-myNginxConfig = new smartnginx.NginxConfig();
-myNginxZone = new smartnginx.NginxZone({
-    zoneName:"some.example.com",
-    type:"reverseProxy",
-    destination:"192.192.192.192" // some destination IP
+import * as smartnginx from 'smartnginx';
+const smartnginxInstance = new smartnginx.SmartNginx();
+myNginxHost = new smartnginx.NginxHost({
+  hostName: 'some.example.com',
+  type: 'reverseProxy',
+  destination: '192.192.192.192' // some destination IP
 });
 myNginxConfig.addZone(myNginxZone); // adds the zone to the config
-myNginxConfig.deploy(); // deploys the referenced NginxConfig and restarts nginx
-```
+myNginxConfig.deploy(); // deploys the referenced NginxConfig and gracefully reloads it
+```

dist/index.d.ts

@@ -1,3 +1,3 @@
-export { NginxConfig } from "./smartnginx.classes.nginxconfig";
-export { NginxProcess } from "./smartnginx.classes.nginxprocess";
-export { NginxZone, zoneTypes } from "./smartnginx.classes.nginxzone";
+export * from "./smartnginx.classes.nginxconfig";
+export * from "./smartnginx.classes.nginxprocess";
+export * from "./smartnginx.classes.nginxhost";

dist/index.js

@@ -1,10 +1,9 @@
 "use strict";
+function __export(m) {
+    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
+}
 // classes
-var smartnginx_classes_nginxconfig_1 = require("./smartnginx.classes.nginxconfig");
-exports.NginxConfig = smartnginx_classes_nginxconfig_1.NginxConfig;
-var smartnginx_classes_nginxprocess_1 = require("./smartnginx.classes.nginxprocess");
-exports.NginxProcess = smartnginx_classes_nginxprocess_1.NginxProcess;
-var smartnginx_classes_nginxzone_1 = require("./smartnginx.classes.nginxzone");
-exports.NginxZone = smartnginx_classes_nginxzone_1.NginxZone;
-exports.zoneTypes = smartnginx_classes_nginxzone_1.zoneTypes;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBRUEsVUFBVTtBQUNWLCtDQUEwQixrQ0FBa0MsQ0FBQztBQUFyRCxtRUFBcUQ7QUFDN0QsZ0RBQTJCLG1DQUFtQyxDQUFDO0FBQXZELHNFQUF1RDtBQUMvRCw2Q0FBa0MsZ0NBQWdDLENBQUM7QUFBM0QsNkRBQVM7QUFBQyw2REFBaUQifQ==
+__export(require("./smartnginx.classes.nginxconfig"));
+__export(require("./smartnginx.classes.nginxprocess"));
+__export(require("./smartnginx.classes.nginxhost"));
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O0FBRUEsVUFBVTtBQUNWLGlCQUFjLGtDQUFrQyxDQUFDLEVBQUE7QUFDakQsaUJBQWMsbUNBQW1DLENBQUMsRUFBQTtBQUNsRCxpQkFBYyxnQ0FBZ0MsQ0FBQyxFQUFBIn0=

dist/smartnginx.classes.nginxconfig.d.ts

@@ -1,16 +1,19 @@
 /// <reference types="q" />
 import * as plugins from "./smartnginx.plugins";
-import { NginxZone } from "./smartnginx.classes.nginxzone";
+import { NginxHost } from "./smartnginx.classes.nginxhost";
 import { NginxProcess } from "./smartnginx.classes.nginxprocess";
+/**
+ * main class that manages a NginxInstance
+ */
 export declare class NginxConfig {
-    zones: NginxZone[];
+    hosts: NginxHost[];
     cert: plugins.cert.Cert;
     nginxProcess: NginxProcess;
     isDeployed: boolean;
     constructor(optionsArg: plugins.cert.ICertConstructorOptions);
-    addZone(zoneArg: NginxZone): void;
-    listZones(): NginxZone[];
-    removeZones(zoneArg: NginxZone): void;
+    addHost(nginxHostArg: NginxHost): void;
+    listHosts(): NginxHost[];
+    removeHost(nginxHostArg: NginxHost): void;
     clean(): void;
     deploy(): plugins.q.Promise<{}>;
 }

dist/smartnginx.classes.nginxconfig.js

@@ -4,9 +4,12 @@ const paths = require("./smartnginx.paths");
 const snippets = require("./smartnginx.snippets");
 const smartnginx_classes_nginxprocess_1 = require("./smartnginx.classes.nginxprocess");
 let allConfigs = [];
+/**
+ * main class that manages a NginxInstance
+ */
 class NginxConfig {
     constructor(optionsArg) {
-        this.zones = [];
+        this.hosts = [];
         this.nginxProcess = new smartnginx_classes_nginxprocess_1.NginxProcess(this);
         this.isDeployed = false;
         this.cert = new plugins.cert.Cert({
@@ -18,24 +21,24 @@ class NginxConfig {
         });
     }
     ;
-    // interact with Zones
-    addZone(zoneArg) {
-        this.zones.push(zoneArg);
+    // interact with Hosts
+    addHost(nginxHostArg) {
+        this.hosts.push(nginxHostArg);
     }
-    listZones() {
-        return this.zones;
+    listHosts() {
+        return this.hosts;
     }
     ;
-    removeZones(zoneArg) {
+    removeHost(nginxHostArg) {
     }
     clean() {
-        this.zones = [];
+        this.hosts = [];
     }
-    // handle deployment of zones
+    // handle deployment of hosts
     deploy() {
         let done = plugins.q.defer();
         plugins.smartfile.fs.ensureDirSync(paths.nginxConfigBase);
-        plugins.smartfile.fs.ensureDirSync(paths.nginxZoneBase);
+        plugins.smartfile.fs.ensureDirSync(paths.nginxHostFileBase);
         plugins.smartfile.fs.ensureDirSync(paths.nginxCertBase);
         for (let config of allConfigs) {
             config.isDeployed = false;
@@ -44,15 +47,15 @@ class NginxConfig {
         this.isDeployed = true;
         // write base config
         plugins.smartfile.memory.toFsSync(snippets.getBaseConfigString(), paths.nginxConfFile);
-        // deploy zones
+        // deploy hosts
         let promiseArray = [];
-        for (let zone of this.zones) {
-            let zoneDeployedPromise = zone.deploy(this.cert);
-            zoneDeployedPromise.then(() => {
-                plugins.beautylog.info(`Zone ${zone.zoneName} deployed!`);
+        for (let host of this.hosts) {
+            let hostDeployedPromise = host.deploy(this.cert);
+            hostDeployedPromise.then(() => {
+                plugins.beautylog.info(`Host ${host.hostName} deployed!`);
                 this.nginxProcess.reloadConfig();
             });
-            promiseArray.push(zoneDeployedPromise);
+            promiseArray.push(hostDeployedPromise);
         }
         ;
         plugins.q.all(promiseArray)
@@ -65,4 +68,4 @@ class NginxConfig {
 }
 exports.NginxConfig = NginxConfig;
 ;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRuZ2lueC5jbGFzc2VzLm5naW54Y29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRuZ2lueC5jbGFzc2VzLm5naW54Y29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxNQUFZLE9BQU8sV0FBTSxzQkFBc0IsQ0FBQyxDQUFBO0FBQ2hELE1BQVksS0FBSyxXQUFNLG9CQUFvQixDQUFDLENBQUE7QUFDNUMsTUFBWSxRQUFRLFdBQU0sdUJBQXVCLENBQUMsQ0FBQTtBQUVsRCxrREFBNkIsbUNBQW1DLENBQUMsQ0FBQTtBQUNqRSxJQUFJLFVBQVUsR0FBa0IsRUFBRSxDQUFDO0FBRW5DO0lBS0ksWUFBWSxVQUFnRDtRQUo1RCxVQUFLLEdBQWdCLEVBQUUsQ0FBQztRQUV4QixpQkFBWSxHQUFpQixJQUFJLDhDQUFZLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDcEQsZUFBVSxHQUFZLEtBQUssQ0FBQztRQUV4QixJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUM7WUFDOUIsT0FBTyxFQUFFLFVBQVUsQ0FBQyxPQUFPO1lBQzNCLEtBQUssRUFBRSxVQUFVLENBQUMsS0FBSztZQUN2QixNQUFNLEVBQUUsS0FBSyxDQUFDLGFBQWE7WUFDM0IsYUFBYSxFQUFFLFVBQVUsQ0FBQyxhQUFhO1lBQ3ZDLFFBQVEsRUFBRSxVQUFVLENBQUMsUUFBUTtTQUNoQyxDQUFDLENBQUM7SUFDUCxDQUFDOztJQUVELHNCQUFzQjtJQUN0QixPQUFPLENBQUMsT0FBa0I7UUFDdEIsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDN0IsQ0FBQztJQUNELFNBQVM7UUFDTCxNQUFNLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQztJQUN0QixDQUFDOztJQUNELFdBQVcsQ0FBQyxPQUFrQjtJQUU5QixDQUFDO0lBQ0QsS0FBSztRQUNELElBQUksQ0FBQyxLQUFLLEdBQUcsRUFBRSxDQUFDO0lBQ3BCLENBQUM7SUFDRCw2QkFBNkI7SUFDN0IsTUFBTTtRQUNGLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDN0IsT0FBTyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsYUFBYSxDQUFDLEtBQUssQ0FBQyxlQUFlLENBQUMsQ0FBQztRQUMxRCxPQUFPLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyxhQUFhLENBQUMsS0FBSyxDQUFDLGFBQWEsQ0FBQyxDQUFDO1FBQ3hELE9BQU8sQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUMsYUFBYSxDQUFDLENBQUM7UUFDeEQsR0FBRyxDQUFDLENBQUMsSUFBSSxNQUFNLElBQUksVUFBVSxDQUFDLENBQUMsQ0FBQztZQUM1QixNQUFNLENBQUMsVUFBVSxHQUFHLEtBQUssQ0FBQztRQUM5QixDQUFDO1FBQUEsQ0FBQztRQUNGLElBQUksQ0FBQyxVQUFVLEdBQUcsSUFBSSxDQUFDO1FBQ3ZCLG9CQUFvQjtRQUNwQixPQUFPLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQzdCLFFBQVEsQ0FBQyxtQkFBbUIsRUFBRSxFQUM5QixLQUFLLENBQUMsYUFBYSxDQUN0QixDQUFDO1FBQ0YsZUFBZTtRQUNmLElBQUksWUFBWSxHQUFHLEVBQUUsQ0FBQztRQUN0QixHQUFHLENBQUMsQ0FBQyxJQUFJLElBQUksSUFBSSxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQztZQUMxQixJQUFJLG1CQUFtQixHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQ2pELG1CQUFtQixDQUFDLElBQUksQ0FBQztnQkFDckIsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsUUFBUSxJQUFJLENBQUMsUUFBUSxZQUFZLENBQUMsQ0FBQztnQkFDMUQsSUFBSSxDQUFDLFlBQVksQ0FBQyxZQUFZLEVBQUUsQ0FBQztZQUNyQyxDQUFDLENBQUMsQ0FBQztZQUNILFlBQVksQ0FBQyxJQUFJLENBQUMsbUJBQW1CLENBQUMsQ0FBQztRQUMzQyxDQUFDO1FBQUEsQ0FBQztRQUNGLE9BQU8sQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FBQzthQUN0QixJQUFJLENBQUM7WUFDRixJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDbkIsQ0FBQyxDQUFDLENBQUM7UUFFUCxNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQztJQUN4QixDQUFDOztBQUNMLENBQUM7QUE1RFksbUJBQVcsY0E0RHZCLENBQUE7QUFBQSxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRuZ2lueC5jbGFzc2VzLm5naW54Y29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRuZ2lueC5jbGFzc2VzLm5naW54Y29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxNQUFZLE9BQU8sV0FBTSxzQkFBc0IsQ0FBQyxDQUFBO0FBQ2hELE1BQVksS0FBSyxXQUFNLG9CQUFvQixDQUFDLENBQUE7QUFDNUMsTUFBWSxRQUFRLFdBQU0sdUJBQXVCLENBQUMsQ0FBQTtBQUVsRCxrREFBNkIsbUNBQW1DLENBQUMsQ0FBQTtBQUNqRSxJQUFJLFVBQVUsR0FBa0IsRUFBRSxDQUFDO0FBRW5DOztHQUVHO0FBQ0g7SUFLSSxZQUFZLFVBQWdEO1FBSjVELFVBQUssR0FBZ0IsRUFBRSxDQUFDO1FBRXhCLGlCQUFZLEdBQWlCLElBQUksOENBQVksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNwRCxlQUFVLEdBQVksS0FBSyxDQUFDO1FBRXhCLElBQUksQ0FBQyxJQUFJLEdBQUcsSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQztZQUM5QixPQUFPLEVBQUUsVUFBVSxDQUFDLE9BQU87WUFDM0IsS0FBSyxFQUFFLFVBQVUsQ0FBQyxLQUFLO1lBQ3ZCLE1BQU0sRUFBRSxLQUFLLENBQUMsYUFBYTtZQUMzQixhQUFhLEVBQUUsVUFBVSxDQUFDLGFBQWE7WUFDdkMsUUFBUSxFQUFFLFVBQVUsQ0FBQyxRQUFRO1NBQ2hDLENBQUMsQ0FBQztJQUNQLENBQUM7O0lBRUQsc0JBQXNCO0lBQ3RCLE9BQU8sQ0FBQyxZQUF1QjtRQUMzQixJQUFJLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsQ0FBQztJQUNsQyxDQUFDO0lBQ0QsU0FBUztRQUNMLE1BQU0sQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDO0lBQ3RCLENBQUM7O0lBQ0QsVUFBVSxDQUFDLFlBQXVCO0lBRWxDLENBQUM7SUFDRCxLQUFLO1FBQ0QsSUFBSSxDQUFDLEtBQUssR0FBRyxFQUFFLENBQUM7SUFDcEIsQ0FBQztJQUNELDZCQUE2QjtJQUM3QixNQUFNO1FBQ0YsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUM3QixPQUFPLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyxhQUFhLENBQUMsS0FBSyxDQUFDLGVBQWUsQ0FBQyxDQUFDO1FBQzFELE9BQU8sQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUMsaUJBQWlCLENBQUMsQ0FBQztRQUM1RCxPQUFPLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyxhQUFhLENBQUMsS0FBSyxDQUFDLGFBQWEsQ0FBQyxDQUFDO1FBQ3hELEdBQUcsQ0FBQyxDQUFDLElBQUksTUFBTSxJQUFJLFVBQVUsQ0FBQyxDQUFDLENBQUM7WUFDNUIsTUFBTSxDQUFDLFVBQVUsR0FBRyxLQUFLLENBQUM7UUFDOUIsQ0FBQztRQUFBLENBQUM7UUFDRixJQUFJLENBQUMsVUFBVSxHQUFHLElBQUksQ0FBQztRQUN2QixvQkFBb0I7UUFDcEIsT0FBTyxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUM3QixRQUFRLENBQUMsbUJBQW1CLEVBQUUsRUFDOUIsS0FBSyxDQUFDLGFBQWEsQ0FDdEIsQ0FBQztRQUNGLGVBQWU7UUFDZixJQUFJLFlBQVksR0FBRyxFQUFFLENBQUM7UUFDdEIsR0FBRyxDQUFDLENBQUMsSUFBSSxJQUFJLElBQUksSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUM7WUFDMUIsSUFBSSxtQkFBbUIsR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUNqRCxtQkFBbUIsQ0FBQyxJQUFJLENBQUM7Z0JBQ3JCLE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLFFBQVEsSUFBSSxDQUFDLFFBQVEsWUFBWSxDQUFDLENBQUM7Z0JBQzFELElBQUksQ0FBQyxZQUFZLENBQUMsWUFBWSxFQUFFLENBQUM7WUFDckMsQ0FBQyxDQUFDLENBQUM7WUFDSCxZQUFZLENBQUMsSUFBSSxDQUFDLG1CQUFtQixDQUFDLENBQUM7UUFDM0MsQ0FBQztRQUFBLENBQUM7UUFDRixPQUFPLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUM7YUFDdEIsSUFBSSxDQUFDO1lBQ0YsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQ25CLENBQUMsQ0FBQyxDQUFDO1FBRVAsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7SUFDeEIsQ0FBQzs7QUFDTCxDQUFDO0FBNURZLG1CQUFXLGNBNER2QixDQUFBO0FBQUEsQ0FBQyJ9

dist/smartnginx.classes.nginxhost.d.ts

@@ -0,0 +1,25 @@
+/// <reference types="q" />
+import * as plugins from "./smartnginx.plugins";
+/**
+ * the host config data that NginxHost needs to create a valid instance
+ */
+export interface IHostConfigData {
+    hostName: string;
+    type: hostTypes;
+    destination: string;
+}
+export declare enum hostTypes {
+    reverseProxy = 0,
+    static = 1,
+}
+/**
+ * manages a single nginx host
+ */
+export declare class NginxHost {
+    hostName: string;
+    type: hostTypes;
+    destination: string;
+    configString: string;
+    constructor(optionsArg: IHostConfigData);
+    deploy(certInstanceArg: plugins.cert.Cert): plugins.q.Promise<{}>;
+}

dist/smartnginx.classes.nginxhost.js

@@ -0,0 +1,35 @@
+"use strict";
+const plugins = require("./smartnginx.plugins");
+const paths = require("./smartnginx.paths");
+const snippets = require("./smartnginx.snippets");
+(function (hostTypes) {
+    hostTypes[hostTypes["reverseProxy"] = 0] = "reverseProxy";
+    hostTypes[hostTypes["static"] = 1] = "static";
+})(exports.hostTypes || (exports.hostTypes = {}));
+var hostTypes = exports.hostTypes;
+/**
+ * manages a single nginx host
+ */
+class NginxHost {
+    constructor(optionsArg) {
+        this.hostName = optionsArg.hostName;
+        this.type = optionsArg.type;
+        this.destination = optionsArg.destination;
+        this.configString = snippets.getHostConfigString(optionsArg.hostName, optionsArg.destination);
+    }
+    ;
+    deploy(certInstanceArg) {
+        let done = plugins.q.defer();
+        let filePath = plugins.path.join(paths.nginxHostFileBase, this.hostName + ".conf");
+        // writeConfig
+        plugins.smartfile.memory.toFsSync(this.configString, filePath);
+        // get cert
+        certInstanceArg.getDomainCert(this.hostName)
+            .then(done.resolve);
+        return done.promise;
+    }
+    ;
+}
+exports.NginxHost = NginxHost;
+;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRuZ2lueC5jbGFzc2VzLm5naW54aG9zdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0bmdpbnguY2xhc3Nlcy5uZ2lueGhvc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLE1BQVksT0FBTyxXQUFNLHNCQUFzQixDQUFDLENBQUE7QUFDaEQsTUFBWSxLQUFLLFdBQU0sb0JBQW9CLENBQUMsQ0FBQTtBQUM1QyxNQUFZLFFBQVEsV0FBTSx1QkFLMUIsQ0FBQyxDQUxnRDtBQVdqRCxXQUFZLFNBQVM7SUFDakIseURBQVksQ0FBQTtJQUNaLDZDQUFNLENBQUE7QUFDVixDQUFDLEVBSFcsaUJBQVMsS0FBVCxpQkFBUyxRQUdwQjtBQUhELElBQVksU0FBUyxHQUFULGlCQUdYLENBQUE7QUFFRDs7R0FFRztBQUNIO0lBS0ksWUFBWSxVQUEwQjtRQUNsQyxJQUFJLENBQUMsUUFBUSxHQUFHLFVBQVUsQ0FBQyxRQUFRLENBQUM7UUFDcEMsSUFBSSxDQUFDLElBQUksR0FBRyxVQUFVLENBQUMsSUFBSSxDQUFDO1FBQzVCLElBQUksQ0FBQyxXQUFXLEdBQUcsVUFBVSxDQUFDLFdBQVcsQ0FBQztRQUMxQyxJQUFJLENBQUMsWUFBWSxHQUFHLFFBQVEsQ0FBQyxtQkFBbUIsQ0FBQyxVQUFVLENBQUMsUUFBUSxFQUFFLFVBQVUsQ0FBQyxXQUFXLENBQUMsQ0FBQztJQUNsRyxDQUFDOztJQUNELE1BQU0sQ0FBQyxlQUFrQztRQUNyQyxJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQzdCLElBQUksUUFBUSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxpQkFBaUIsRUFBRSxJQUFJLENBQUMsUUFBUSxHQUFHLE9BQU8sQ0FBQyxDQUFDO1FBQ25GLGNBQWM7UUFDZCxPQUFPLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLFlBQVksRUFBRSxRQUFRLENBQUMsQ0FBQztRQUMvRCxXQUFXO1FBQ1gsZUFBZSxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDO2FBQ3ZDLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDeEIsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7SUFDeEIsQ0FBQzs7QUFDTCxDQUFDO0FBckJZLGlCQUFTLFlBcUJyQixDQUFBO0FBQUEsQ0FBQyJ9

dist/smartnginx.classes.nginxprocess.d.ts

@@ -2,6 +2,9 @@
 /// <reference types="q" />
 import * as plugins from "./smartnginx.plugins";
 import { NginxConfig } from "./smartnginx.classes.nginxconfig";
+/**
+ * manages a nginxprocess for an NginxConfig
+ */
 export declare class NginxProcess {
     started: boolean;
     nginxConfig: NginxConfig;

dist/smartnginx.classes.nginxprocess.js

@@ -1,6 +1,9 @@
 "use strict";
 const plugins = require("./smartnginx.plugins");
 const paths = require("./smartnginx.paths");
+/**
+ * manages a nginxprocess for an NginxConfig
+ */
 class NginxProcess {
     constructor(nginxConfigArg) {
         this.started = false;
@@ -38,7 +41,7 @@ class NginxProcess {
             this.start();
         }
         else {
-            this.nginxChildProcess.kill("SIGHUP");
+            plugins.shelljs.exec("nginx -s reload");
         }
         ;
         plugins.beautylog.ok("NginxProcess has loaded the new config!");
@@ -52,7 +55,8 @@ class NginxProcess {
     stop() {
         let done = plugins.q.defer();
         if (typeof this.nginxChildProcess != "undefined") {
-            this.nginxChildProcess.kill();
+            plugins.shelljs.exec("nginx -s quit");
+            this.started = false;
             plugins.beautylog.info("stopped Nginx!");
         }
         else {
@@ -72,4 +76,4 @@ class NginxProcess {
     ;
 }
 exports.NginxProcess = NginxProcess;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRuZ2lueC5jbGFzc2VzLm5naW54cHJvY2Vzcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0bmdpbnguY2xhc3Nlcy5uZ2lueHByb2Nlc3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLE1BQVksT0FBTyxXQUFNLHNCQUFzQixDQUFDLENBQUE7QUFDaEQsTUFBWSxLQUFLLFdBQU0sb0JBQW9CLENBQUMsQ0FBQTtBQUk1QztJQUlJLFlBQVksY0FBYztRQUgxQixZQUFPLEdBQVksS0FBSyxDQUFDO1FBSXJCLElBQUksQ0FBQyxXQUFXLEdBQUcsY0FBYyxDQUFDO0lBQ3RDLENBQUM7O0lBRUQ7O09BRUc7SUFDSCxLQUFLO1FBQ0QsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUM3QixFQUFFLENBQUMsQ0FBQyxPQUFPLElBQUksQ0FBQyxpQkFBaUIsSUFBSSxXQUFXLENBQUMsQ0FBQSxDQUFDO1lBQzlDLElBQUksQ0FBQyxpQkFBaUIsR0FBRyxPQUFPLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxZQUFZLEtBQUssQ0FBQyxhQUFhLEVBQUUsRUFBRSxVQUFVLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTTtnQkFDakgsT0FBTyxDQUFDLEdBQUcsQ0FBQyxXQUFXLE1BQU0sRUFBRSxDQUFDLENBQUM7Z0JBQ2pDLE9BQU8sQ0FBQyxHQUFHLENBQUMsV0FBVyxNQUFNLEVBQUUsQ0FBQyxDQUFDO2dCQUNqQyxFQUFFLENBQUMsQ0FBQyxLQUFLLEtBQUssSUFBSSxDQUFDLENBQUMsQ0FBQztvQkFDakIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxlQUFlLEtBQUssRUFBRSxDQUFDLENBQUM7Z0JBQ3hDLENBQUM7Z0JBQUEsQ0FBQztZQUNOLENBQUMsQ0FBQyxDQUFDO1FBQ1AsQ0FBQztRQUFBLENBQUM7UUFDRixJQUFJLENBQUMsT0FBTyxHQUFHLElBQUksQ0FBQztRQUNwQixPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDO1FBQ3pDLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUNmLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDO0lBQ3hCLENBQUM7O0lBRUQ7O09BRUc7SUFDSCxZQUFZO1FBQ1IsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUM3QixFQUFFLENBQUEsQ0FBQyxJQUFJLENBQUMsT0FBTyxJQUFJLEtBQUssQ0FBQyxDQUFBLENBQUM7WUFDdEIsSUFBSSxDQUFDLEtBQUssRUFBRSxDQUFBO1FBQ2hCLENBQUM7UUFBQyxJQUFJLENBQUMsQ0FBQztZQUNKLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUM7UUFDMUMsQ0FBQztRQUFBLENBQUM7UUFDRixPQUFPLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyx5Q0FBeUMsQ0FBQyxDQUFBO1FBQy9ELElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUNmLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDO0lBQ3hCLENBQUM7O0lBRUQ7O09BRUc7SUFDSCxJQUFJO1FBQ0EsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUM3QixFQUFFLENBQUMsQ0FBQyxPQUFPLElBQUksQ0FBQyxpQkFBaUIsSUFBSSxXQUFXLENBQUMsQ0FBQyxDQUFDO1lBQy9DLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxJQUFJLEVBQUUsQ0FBQztZQUM5QixPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDO1FBQzdDLENBQUM7UUFBQyxJQUFJLENBQUMsQ0FBQztZQUNKLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLHdCQUF3QixDQUFDLENBQUM7UUFDcEQsQ0FBQztRQUFBLENBQUM7UUFDRixJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDZixNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQztJQUN4QixDQUFDOztJQUVEOztPQUVHO0lBQ0gsS0FBSztRQUNELE1BQU0sQ0FBQztJQUNYLENBQUM7O0FBQ0wsQ0FBQztBQWhFWSxvQkFBWSxlQWdFeEIsQ0FBQSJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRuZ2lueC5jbGFzc2VzLm5naW54cHJvY2Vzcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0bmdpbnguY2xhc3Nlcy5uZ2lueHByb2Nlc3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLE1BQVksT0FBTyxXQUFNLHNCQUFzQixDQUFDLENBQUE7QUFDaEQsTUFBWSxLQUFLLFdBQU0sb0JBQW9CLENBQUMsQ0FBQTtBQUk1Qzs7R0FFRztBQUNIO0lBSUksWUFBWSxjQUFjO1FBSDFCLFlBQU8sR0FBWSxLQUFLLENBQUM7UUFJckIsSUFBSSxDQUFDLFdBQVcsR0FBRyxjQUFjLENBQUM7SUFDdEMsQ0FBQzs7SUFFRDs7T0FFRztJQUNILEtBQUs7UUFDRCxJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQzdCLEVBQUUsQ0FBQyxDQUFDLE9BQU8sSUFBSSxDQUFDLGlCQUFpQixJQUFJLFdBQVcsQ0FBQyxDQUFBLENBQUM7WUFDOUMsSUFBSSxDQUFDLGlCQUFpQixHQUFHLE9BQU8sQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLFlBQVksS0FBSyxDQUFDLGFBQWEsRUFBRSxFQUFFLFVBQVUsS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNO2dCQUNqSCxPQUFPLENBQUMsR0FBRyxDQUFDLFdBQVcsTUFBTSxFQUFFLENBQUMsQ0FBQztnQkFDakMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxXQUFXLE1BQU0sRUFBRSxDQUFDLENBQUM7Z0JBQ2pDLEVBQUUsQ0FBQyxDQUFDLEtBQUssS0FBSyxJQUFJLENBQUMsQ0FBQyxDQUFDO29CQUNqQixPQUFPLENBQUMsR0FBRyxDQUFDLGVBQWUsS0FBSyxFQUFFLENBQUMsQ0FBQztnQkFDeEMsQ0FBQztnQkFBQSxDQUFDO1lBQ04sQ0FBQyxDQUFDLENBQUM7UUFDUCxDQUFDO1FBQUEsQ0FBQztRQUNGLElBQUksQ0FBQyxPQUFPLEdBQUcsSUFBSSxDQUFDO1FBQ3BCLE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLENBQUM7UUFDekMsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQ2YsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7SUFDeEIsQ0FBQzs7SUFFRDs7T0FFRztJQUNILFlBQVk7UUFDUixJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQzdCLEVBQUUsQ0FBQSxDQUFDLElBQUksQ0FBQyxPQUFPLElBQUksS0FBSyxDQUFDLENBQUEsQ0FBQztZQUN0QixJQUFJLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDakIsQ0FBQztRQUFDLElBQUksQ0FBQyxDQUFDO1lBQ0osT0FBTyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsaUJBQWlCLENBQUMsQ0FBQztRQUM1QyxDQUFDO1FBQUEsQ0FBQztRQUNGLE9BQU8sQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLHlDQUF5QyxDQUFDLENBQUE7UUFDL0QsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQ2YsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7SUFDeEIsQ0FBQzs7SUFFRDs7T0FFRztJQUNILElBQUk7UUFDQSxJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQzdCLEVBQUUsQ0FBQyxDQUFDLE9BQU8sSUFBSSxDQUFDLGlCQUFpQixJQUFJLFdBQVcsQ0FBQyxDQUFDLENBQUM7WUFDL0MsT0FBTyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsZUFBZSxDQUFDLENBQUM7WUFDdEMsSUFBSSxDQUFDLE9BQU8sR0FBRyxLQUFLLENBQUM7WUFDckIsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztRQUM3QyxDQUFDO1FBQUMsSUFBSSxDQUFDLENBQUM7WUFDSixPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyx3QkFBd0IsQ0FBQyxDQUFDO1FBQ3BELENBQUM7UUFBQSxDQUFDO1FBQ0YsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQ2YsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7SUFDeEIsQ0FBQzs7SUFFRDs7T0FFRztJQUNILEtBQUs7UUFDRCxNQUFNLENBQUM7SUFDWCxDQUFDOztBQUNMLENBQUM7QUFqRVksb0JBQVksZUFpRXhCLENBQUEifQ==

dist/smartnginx.classes.nginxzone.d.ts

@@ -1,18 +0,0 @@
-/// <reference types="q" />
-import * as plugins from "./smartnginx.plugins";
-export declare enum zoneTypes {
-    reverseProxy = 0,
-    static = 1,
-}
-export declare class NginxZone {
-    zoneName: string;
-    type: zoneTypes;
-    destination: string;
-    configString: string;
-    constructor(optionsArg: {
-        zoneName: string;
-        type: zoneTypes;
-        destination: string;
-    });
-    deploy(certInstanceArg: plugins.cert.Cert): plugins.q.Promise<{}>;
-}

dist/smartnginx.classes.nginxzone.js

@@ -1,32 +0,0 @@
-"use strict";
-const plugins = require("./smartnginx.plugins");
-const paths = require("./smartnginx.paths");
-const snippets = require("./smartnginx.snippets");
-(function (zoneTypes) {
-    zoneTypes[zoneTypes["reverseProxy"] = 0] = "reverseProxy";
-    zoneTypes[zoneTypes["static"] = 1] = "static";
-})(exports.zoneTypes || (exports.zoneTypes = {}));
-var zoneTypes = exports.zoneTypes;
-class NginxZone {
-    constructor(optionsArg) {
-        this.zoneName = optionsArg.zoneName;
-        this.type = optionsArg.type;
-        this.destination = optionsArg.destination;
-        this.configString = snippets.getZoneConfigString(optionsArg.zoneName, optionsArg.destination);
-    }
-    ;
-    deploy(certInstanceArg) {
-        let done = plugins.q.defer();
-        let filePath = plugins.path.join(paths.nginxZoneBase, this.zoneName + ".conf");
-        // writeConfig
-        plugins.smartfile.memory.toFsSync(this.configString, filePath);
-        // get cert
-        certInstanceArg.getDomainCert(this.zoneName)
-            .then(done.resolve);
-        return done.promise;
-    }
-    ;
-}
-exports.NginxZone = NginxZone;
-;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRuZ2lueC5jbGFzc2VzLm5naW54em9uZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0bmdpbnguY2xhc3Nlcy5uZ2lueHpvbmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLE1BQVksT0FBTyxXQUFNLHNCQUFzQixDQUFDLENBQUE7QUFDaEQsTUFBWSxLQUFLLFdBQU0sb0JBQW9CLENBQUMsQ0FBQTtBQUM1QyxNQUFZLFFBQVEsV0FBTSx1QkFDMUIsQ0FBQyxDQURnRDtBQUNqRCxXQUFZLFNBQVM7SUFDakIseURBQVksQ0FBQTtJQUNaLDZDQUFNLENBQUE7QUFDVixDQUFDLEVBSFcsaUJBQVMsS0FBVCxpQkFBUyxRQUdwQjtBQUhELElBQVksU0FBUyxHQUFULGlCQUdYLENBQUE7QUFFRDtJQUtJLFlBQVksVUFJWDtRQUNHLElBQUksQ0FBQyxRQUFRLEdBQUcsVUFBVSxDQUFDLFFBQVEsQ0FBQztRQUNwQyxJQUFJLENBQUMsSUFBSSxHQUFHLFVBQVUsQ0FBQyxJQUFJLENBQUM7UUFDNUIsSUFBSSxDQUFDLFdBQVcsR0FBRyxVQUFVLENBQUMsV0FBVyxDQUFDO1FBQzFDLElBQUksQ0FBQyxZQUFZLEdBQUcsUUFBUSxDQUFDLG1CQUFtQixDQUFDLFVBQVUsQ0FBQyxRQUFRLEVBQUUsVUFBVSxDQUFDLFdBQVcsQ0FBQyxDQUFDO0lBQ2xHLENBQUM7O0lBQ0QsTUFBTSxDQUFDLGVBQWtDO1FBQ3JDLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDN0IsSUFBSSxRQUFRLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLGFBQWEsRUFBRSxJQUFJLENBQUMsUUFBUSxHQUFHLE9BQU8sQ0FBQyxDQUFDO1FBQy9FLGNBQWM7UUFDZCxPQUFPLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLFlBQVksRUFBRSxRQUFRLENBQUMsQ0FBQztRQUMvRCxXQUFXO1FBQ1gsZUFBZSxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDO2FBQ3ZDLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDeEIsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7SUFDeEIsQ0FBQzs7QUFDTCxDQUFDO0FBekJZLGlCQUFTLFlBeUJyQixDQUFBO0FBQUEsQ0FBQyJ9

dist/smartnginx.paths.d.ts

@@ -1,5 +1,5 @@
 export declare let packageBase: string;
 export declare let nginxConfigBase: string;
-export declare let nginxZoneBase: string;
+export declare let nginxHostFileBase: string;
 export declare let nginxCertBase: string;
 export declare let nginxConfFile: string;

dist/smartnginx.paths.js

@@ -3,8 +3,8 @@ const plugins = require("./smartnginx.plugins");
 // directories
 exports.packageBase = plugins.path.join(__dirname, "../");
 exports.nginxConfigBase = plugins.path.join(exports.packageBase, "nginxconfig");
-exports.nginxZoneBase = plugins.path.join(exports.nginxConfigBase, "zones");
+exports.nginxHostFileBase = plugins.path.join(exports.nginxConfigBase, "hosts");
 exports.nginxCertBase = plugins.path.join(exports.nginxConfigBase, "cert");
 // files
 exports.nginxConfFile = plugins.path.join(exports.nginxConfigBase, "nginx.conf");
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRuZ2lueC5wYXRocy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0bmdpbngucGF0aHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLE1BQVksT0FBTyxXQUFNLHNCQUd6QixDQUFDLENBSDhDO0FBRS9DLGNBQWM7QUFDSCxtQkFBVyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBQyxLQUFLLENBQUMsQ0FBQztBQUNqRCx1QkFBZSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLG1CQUFXLEVBQUMsYUFBYSxDQUFDLENBQUM7QUFDL0QscUJBQWEsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyx1QkFBZSxFQUFDLE9BQU8sQ0FBQyxDQUFDO0FBQzNELHFCQUFhLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsdUJBQWUsRUFBQyxNQUFNLENBQUMsQ0FBQztBQUVyRSxRQUFRO0FBQ0cscUJBQWEsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyx1QkFBZSxFQUFDLFlBQVksQ0FBQyxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRuZ2lueC5wYXRocy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0bmdpbngucGF0aHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLE1BQVksT0FBTyxXQUFNLHNCQUd6QixDQUFDLENBSDhDO0FBRS9DLGNBQWM7QUFDSCxtQkFBVyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBQyxLQUFLLENBQUMsQ0FBQztBQUNqRCx1QkFBZSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLG1CQUFXLEVBQUMsYUFBYSxDQUFDLENBQUM7QUFDL0QseUJBQWlCLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsdUJBQWUsRUFBQyxPQUFPLENBQUMsQ0FBQztBQUMvRCxxQkFBYSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLHVCQUFlLEVBQUMsTUFBTSxDQUFDLENBQUM7QUFFckUsUUFBUTtBQUNHLHFCQUFhLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsdUJBQWUsRUFBQyxZQUFZLENBQUMsQ0FBQyJ9

dist/smartnginx.snippets.d.ts

@@ -1,2 +1,2 @@
 export declare let getBaseConfigString: () => string;
-export declare let getZoneConfigString: (zoneNameArg: string, destinationIpArg: string) => string;
+export declare let getHostConfigString: (hostNameArg: string, destinationIpArg: string) => string;

dist/smartnginx.snippets.js

@@ -1,5 +1,6 @@
 "use strict";
 const plugins = require("./smartnginx.plugins");
+const paths = require("./smartnginx.paths");
 exports.getBaseConfigString = () => {
     let baseConfig = plugins.smartstring.indent.normalize(`
 		user www-data;
@@ -63,33 +64,33 @@ exports.getBaseConfigString = () => {
 			# Virtual Host Configs
 			##
 
-			include /etc/nginx/conf.d/*.conf;
+			include ${paths.nginxHostFileBase}/*.conf;
 			include /etc/nginx/sites-enabled/*;
 		}
 		daemon off;
 	`);
     return baseConfig;
 };
-exports.getZoneConfigString = (zoneNameArg, destinationIpArg) => {
-    let zoneConfig = plugins.smartstring.indent.normalize(`
-		upstream ${zoneNameArg} {
+exports.getHostConfigString = (hostNameArg, destinationIpArg) => {
+    let hostConfig = plugins.smartstring.indent.normalize(`
+		upstream ${hostNameArg} {
 			server ${destinationIpArg};
 		}
 
 		server {
 			listen *:80 ;
-			server_name ${zoneNameArg};
-			rewrite        ^ https://${zoneNameArg}$request_uri? permanent;
+			server_name ${hostNameArg};
+			rewrite        ^ https://${hostNameArg}$request_uri? permanent;
 		}
 
 		server {
 			listen *:443 ssl;
-			server_name ${zoneNameArg};
-			ssl_certificate /LE_CERTS/${zoneNameArg}/fullchain.pem;
-			ssl_certificate_key /LE_CERTS/${zoneNameArg}/privkey.pem;
+			server_name ${hostNameArg};
+			ssl_certificate ${paths.nginxCertBase}/${hostNameArg}/fullchain.pem;
+			ssl_certificate_key ${paths.nginxCertBase}/${hostNameArg}/privkey.pem;
 
 			location / {
-				proxy_pass http://${zoneNameArg};
+				proxy_pass http://${hostNameArg};
 				include /etc/nginx/proxy_params;
 			}
 			location ~ /\.git {
@@ -97,6 +98,6 @@ exports.getZoneConfigString = (zoneNameArg, destinationIpArg) => {
 			}
 		}
 	`);
-    return zoneConfig;
+    return hostConfig;
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRuZ2lueC5zbmlwcGV0cy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0bmdpbnguc25pcHBldHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLE1BQVksT0FBTyxXQUFNLHNCQUFzQixDQUFDLENBQUE7QUFDckMsMkJBQW1CLEdBQUc7SUFDaEMsSUFBSSxVQUFVLEdBQUcsT0FBTyxDQUFDLFdBQVcsQ0FBQyxNQUFNLENBQUMsU0FBUyxDQUFDOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7RUFrRXJELENBQUMsQ0FBQztJQUNILE1BQU0sQ0FBQyxVQUFVLENBQUM7QUFDbkIsQ0FBQyxDQUFBO0FBR1UsMkJBQW1CLEdBQUcsQ0FBQyxXQUFrQixFQUFDLGdCQUF1QjtJQUMzRSxJQUFJLFVBQVUsR0FBRyxPQUFPLENBQUMsV0FBVyxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUM7YUFDMUMsV0FBVztZQUNaLGdCQUFnQjs7Ozs7aUJBS1gsV0FBVzs4QkFDRSxXQUFXOzs7OztpQkFLeEIsV0FBVzsrQkFDRyxXQUFXO21DQUNQLFdBQVc7Ozt3QkFHdEIsV0FBVzs7Ozs7OztFQU9qQyxDQUFDLENBQUM7SUFDSCxNQUFNLENBQUMsVUFBVSxDQUFDO0FBQ25CLENBQUMsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRuZ2lueC5zbmlwcGV0cy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0bmdpbnguc25pcHBldHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLE1BQVksT0FBTyxXQUFNLHNCQUFzQixDQUFDLENBQUE7QUFDaEQsTUFBWSxLQUFLLFdBQU0sb0JBQW9CLENBQUMsQ0FBQTtBQUNqQywyQkFBbUIsR0FBRztJQUNoQyxJQUFJLFVBQVUsR0FBRyxPQUFPLENBQUMsV0FBVyxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUM7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O2FBOEQxQyxLQUFLLENBQUMsaUJBQWlCOzs7O0VBSWxDLENBQUMsQ0FBQztJQUNILE1BQU0sQ0FBQyxVQUFVLENBQUM7QUFDbkIsQ0FBQyxDQUFBO0FBR1UsMkJBQW1CLEdBQUcsQ0FBQyxXQUFrQixFQUFDLGdCQUF1QjtJQUMzRSxJQUFJLFVBQVUsR0FBRyxPQUFPLENBQUMsV0FBVyxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUM7YUFDMUMsV0FBVztZQUNaLGdCQUFnQjs7Ozs7aUJBS1gsV0FBVzs4QkFDRSxXQUFXOzs7OztpQkFLeEIsV0FBVztxQkFDUCxLQUFLLENBQUMsYUFBYSxJQUFJLFdBQVc7eUJBQzlCLEtBQUssQ0FBQyxhQUFhLElBQUksV0FBVzs7O3dCQUduQyxXQUFXOzs7Ozs7O0VBT2pDLENBQUMsQ0FBQztJQUNILE1BQU0sQ0FBQyxVQUFVLENBQUM7QUFDbkIsQ0FBQyxDQUFDIn0=

npmextra.json

@@ -0,0 +1,8 @@
+{
+  "npmci": {
+    "npmAccessLevel": "public"
+  },
+  "npmdocker": {
+    
+  }
+}

package.json

@@ -1,12 +1,14 @@
 {
-  "name": "smartnginx",
-  "version": "0.0.9",
+  "name": "@pushrocks/smartnginx",
+  "version": "2.0.13",
+  "private": false,
   "description": "control nginx from node, TypeScript ready",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {
-    "test": "(npmts)",
-    "cleanTest": "(rm -r nginxconfig)"
+    "test": "tstest test/",
+    "cleanTest": "(rm -r nginxconfig) && npm run test",
+    "build": "(tsbuild)"
   },
   "repository": {
     "type": "git",
@@ -22,19 +24,20 @@
   },
   "homepage": "https://gitlab.com/pushrocks/smartnginx#README",
   "dependencies": {
-    "@types/q": "^0.0.27",
-    "@types/shelljs": "^0.3.27",
-    "beautylog": "^5.0.18",
-    "cert": "1.0.6",
-    "q": "^1.4.1",
-    "shelljs": "^0.7.1",
-    "smartfile": "^4.0.12",
-    "smartstring": "^2.0.15"
+    "@pushrocks/lik": "^3.0.4",
+    "@pushrocks/smartfile": "^6.0.11",
+    "@pushrocks/smartlog": "^2.0.9",
+    "@pushrocks/smartpromise": "^2.0.5",
+    "@pushrocks/smartshell": "^2.0.13",
+    "@pushrocks/smartstring": "^3.0.5"
   },
   "devDependencies": {
-    "npmts-g": "^5.2.6",
-    "qenv": "^1.0.8",
-    "should": "^10.0.0",
-    "typings-test": "^1.0.1"
+    "@gitzone/tsbuild": "^2.1.4",
+    "@gitzone/tsrun": "^1.1.17",
+    "@gitzone/tstest": "^1.0.18",
+    "@pushrocks/qenv": "^3.0.2",
+    "@pushrocks/tapbundle": "^3.0.7",
+    "tslint": "^5.12.0",
+    "tslint-config-prettier": "^1.17.0"
   }
 }

qenv.yml

@@ -1,3 +1 @@
 vars:
-- CF_EMAIL
-- CF_KEY

test/test.d.ts

@@ -1,2 +0,0 @@
-import "typings-test";
-import "should";

test/test.js

@@ -1,56 +0,0 @@
-"use strict";
-require("typings-test");
-const path = require("path");
-require("should");
-const qenv_1 = require("qenv");
-const smartnginx = require("../dist/index");
-// setup environment
-let testQenv = new qenv_1.Qenv(process.cwd(), path.join(process.cwd(), ".nogit"));
-describe("smartnginx", function () {
-    let testNginxConfig;
-    let testNginxZone01;
-    let testNginxZone02;
-    describe("NginxZone", function () {
-        it(`"new NginxZone()" should produce an instance of NginxConfig`, function () {
-            testNginxZone01 = new smartnginx.NginxZone({
-                zoneName: "test100.bleu.de",
-                type: smartnginx.zoneTypes.reverseProxy,
-                destination: "192.192.192.191"
-            });
-            testNginxZone02 = new smartnginx.NginxZone({
-                zoneName: "test102.bleu.de",
-                type: smartnginx.zoneTypes.reverseProxy,
-                destination: "192.192.192.192"
-            });
-            testNginxZone01.should.be.instanceof(smartnginx.NginxZone);
-            console.log(testNginxZone01.configString);
-        });
-    });
-    describe("NginxConfig", function () {
-        this.timeout(10000);
-        it(`"new NginxConfig()" should produce an instance of NginxConfig`, function () {
-            testNginxConfig = new smartnginx.NginxConfig({
-                cfEmail: process.env.CF_EMAIL,
-                cfKey: process.env.CF_KEY,
-                testMode: true
-            });
-            testNginxConfig.should.be.instanceof(smartnginx.NginxConfig);
-        });
-        describe(".addZone()", function () {
-            it("should add a zone to NginxConfig Object", function () {
-                testNginxConfig.addZone(testNginxZone01);
-                testNginxConfig.addZone(testNginxZone02);
-            });
-        });
-        describe(".deploy()", function () {
-            this.timeout(600000);
-            it("should deploy a config from an instance", function (done) {
-                testNginxConfig.deploy()
-                    .then(() => {
-                    done();
-                });
-            });
-        });
-    });
-});
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sY0FBYyxDQUFDLENBQUE7QUFDdEIsTUFBTyxJQUFJLFdBQVcsTUFBTSxDQUFDLENBQUM7QUFDOUIsUUFBTyxRQUFRLENBQUMsQ0FBQTtBQUNoQix1QkFBbUIsTUFBTSxDQUFDLENBQUE7QUFDMUIsTUFBWSxVQUFVLFdBQU0sZUFBZSxDQUFDLENBQUE7QUFFNUMsb0JBQW9CO0FBQ3BCLElBQUksUUFBUSxHQUFHLElBQUksV0FBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsRUFBQyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsRUFBQyxRQUFRLENBQUMsQ0FBQyxDQUFDO0FBQ3pFLFFBQVEsQ0FBQyxZQUFZLEVBQUM7SUFDbEIsSUFBSSxlQUFzQyxDQUFDO0lBQzNDLElBQUksZUFBb0MsQ0FBQztJQUN6QyxJQUFJLGVBQW9DLENBQUM7SUFDekMsUUFBUSxDQUFDLFdBQVcsRUFBQztRQUNqQixFQUFFLENBQUMsNkRBQTZELEVBQUM7WUFDN0QsZUFBZSxHQUFHLElBQUksVUFBVSxDQUFDLFNBQVMsQ0FBQztnQkFDdkMsUUFBUSxFQUFDLGlCQUFpQjtnQkFDMUIsSUFBSSxFQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUMsWUFBWTtnQkFDdEMsV0FBVyxFQUFDLGlCQUFpQjthQUNoQyxDQUFDLENBQUM7WUFDSCxlQUFlLEdBQUcsSUFBSSxVQUFVLENBQUMsU0FBUyxDQUFDO2dCQUN2QyxRQUFRLEVBQUMsaUJBQWlCO2dCQUMxQixJQUFJLEVBQUMsVUFBVSxDQUFDLFNBQVMsQ0FBQyxZQUFZO2dCQUN0QyxXQUFXLEVBQUMsaUJBQWlCO2FBQ2hDLENBQUMsQ0FBQztZQUNILGVBQWUsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDLENBQUM7WUFDM0QsT0FBTyxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsWUFBWSxDQUFDLENBQUM7UUFDOUMsQ0FBQyxDQUFDLENBQUM7SUFDUCxDQUFDLENBQUMsQ0FBQztJQUNILFFBQVEsQ0FBQyxhQUFhLEVBQUM7UUFDbkIsSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUNwQixFQUFFLENBQUMsK0RBQStELEVBQUM7WUFDL0QsZUFBZSxHQUFHLElBQUksVUFBVSxDQUFDLFdBQVcsQ0FBQztnQkFDekMsT0FBTyxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBUTtnQkFDN0IsS0FBSyxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTTtnQkFDekIsUUFBUSxFQUFDLElBQUk7YUFDaEIsQ0FBQyxDQUFDO1lBQ0gsZUFBZSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsVUFBVSxDQUFDLFVBQVUsQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUNqRSxDQUFDLENBQUMsQ0FBQztRQUNILFFBQVEsQ0FBQyxZQUFZLEVBQUM7WUFDbEIsRUFBRSxDQUFDLHlDQUF5QyxFQUFDO2dCQUN6QyxlQUFlLENBQUMsT0FBTyxDQUFDLGVBQWUsQ0FBQyxDQUFDO2dCQUN6QyxlQUFlLENBQUMsT0FBTyxDQUFDLGVBQWUsQ0FBQyxDQUFDO1lBQzdDLENBQUMsQ0FBQyxDQUFBO1FBQ04sQ0FBQyxDQUFDLENBQUM7UUFDSCxRQUFRLENBQUMsV0FBVyxFQUFDO1lBQ2pCLElBQUksQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUM7WUFDckIsRUFBRSxDQUFDLHlDQUF5QyxFQUFDLFVBQVMsSUFBSTtnQkFDdEQsZUFBZSxDQUFDLE1BQU0sRUFBRTtxQkFDbkIsSUFBSSxDQUFDO29CQUNGLElBQUksRUFBRSxDQUFDO2dCQUNYLENBQUMsQ0FBQyxDQUFDO1lBQ1gsQ0FBQyxDQUFDLENBQUE7UUFDTixDQUFDLENBQUMsQ0FBQztJQUNQLENBQUMsQ0FBQyxDQUFDO0FBQ1AsQ0FBQyxDQUFDLENBQUMifQ==

test/test.ts

@@ -1,55 +1,47 @@
-import "typings-test";
-import path = require("path");
-import "should";
-import {Qenv} from "qenv";
-import * as smartnginx from "../dist/index";
+import { tap, expect } from '@pushrocks/tapbundle';
+import path = require('path');
 
-// setup environment
-let testQenv = new Qenv(process.cwd(),path.join(process.cwd(),".nogit"));
-describe("smartnginx",function(){
-    let testNginxConfig:smartnginx.NginxConfig;
-    let testNginxZone01:smartnginx.NginxZone;
-    let testNginxZone02:smartnginx.NginxZone;
-    describe("NginxZone",function(){
-        it(`"new NginxZone()" should produce an instance of NginxConfig`,function(){
-            testNginxZone01 = new smartnginx.NginxZone({
-                zoneName:"test100.bleu.de",
-                type:smartnginx.zoneTypes.reverseProxy,
-                destination:"192.192.192.191"
-            });
-            testNginxZone02 = new smartnginx.NginxZone({
-                zoneName:"test102.bleu.de",
-                type:smartnginx.zoneTypes.reverseProxy,
-                destination:"192.192.192.192"
-            });
-            testNginxZone01.should.be.instanceof(smartnginx.NginxZone);
-            console.log(testNginxZone01.configString);
-        });
-    });
-    describe("NginxConfig",function(){
-        this.timeout(10000);
-        it(`"new NginxConfig()" should produce an instance of NginxConfig`,function(){
-            testNginxConfig = new smartnginx.NginxConfig({
-                cfEmail: process.env.CF_EMAIL,
-                cfKey: process.env.CF_KEY,
-                testMode:true
-            });
-            testNginxConfig.should.be.instanceof(smartnginx.NginxConfig);
-        });
-        describe(".addZone()",function(){
-            it("should add a zone to NginxConfig Object",function(){
-                testNginxConfig.addZone(testNginxZone01);
-                testNginxConfig.addZone(testNginxZone02);
-            })
-        });
-        describe(".deploy()",function(){
-            this.timeout(600000);
-            it("should deploy a config from an instance",function(done){
-                testNginxConfig.deploy()
-                    .then(() => {
-                        done();
-                    });
-            })
-        });
-    });
+import { Qenv } from '@pushrocks/qenv';
+const testQenv = new Qenv('./', './.nogit/');
+
+import * as smartnginx from '../ts/index';
+
+let testSmartNginx: smartnginx.SmartNginx;
+let testNginxZone01: smartnginx.NginxHost;
+let testNginxZone02: smartnginx.NginxHost;
+
+tap.test('should create a valid instance of SmartNginx', async () => {
+  testSmartNginx = new smartnginx.SmartNginx({});
+  expect(testSmartNginx).to.be.instanceof(smartnginx.SmartNginx);
 });
+
+tap.test(`should produce an instance of NginxConfig`, async () => {
+  testNginxZone01 = new smartnginx.NginxHost(testSmartNginx, {
+    hostName: 'test100.bleu.de',
+    destination: '192.192.192.191',
+    privateKey: 'some private',
+    publicKey: 'some public'
+  });
+  testNginxZone02 = new smartnginx.NginxHost(testSmartNginx, {
+    hostName: 'test102.bleu.de',
+    destination: '192.192.192.192',
+    privateKey: 'some private',
+    publicKey: 'some public'
+  });
+  expect(testNginxZone01).to.be.instanceof(smartnginx.NginxHost);
+});
+
+tap.test('.addZone() should add a zone to NginxConfig Object', async () => {
+  testSmartNginx.addHost(testNginxZone01);
+  testSmartNginx.addHost(testNginxZone02);
+});
+
+tap.test('.deploy() should deploy a config from an instance', async () => {
+  await testSmartNginx.deploy();
+});
+
+tap.test('.stop() should end the process', async () => {
+  testSmartNginx.nginxProcess.stop();
+});
+
+tap.start();

ts/index.ts

@@ -1,6 +1,6 @@
-import * as plugins from "./smartnginx.plugins";
+import * as plugins from './smartnginx.plugins';
 
 // classes
-export {NginxConfig} from "./smartnginx.classes.nginxconfig";
-export {NginxProcess} from "./smartnginx.classes.nginxprocess";
-export {NginxZone,zoneTypes} from "./smartnginx.classes.nginxzone";
+export * from './smartnginx.classes.smartnginx';
+export * from './smartnginx.classes.nginxprocess';
+export * from './smartnginx.classes.nginxhost';

ts/interfaces/hostconfig.ts

@@ -0,0 +1,6 @@
+export interface IHostConfig {
+  hostName: string;
+  destination: string;
+  privateKey: string;
+  publicKey: string;
+}

ts/smartnginx.classes.nginxconfig.ts

@@ -1,68 +0,0 @@
-import * as plugins from "./smartnginx.plugins";
-import * as paths from "./smartnginx.paths";
-import * as snippets from "./smartnginx.snippets";
-import { NginxZone } from "./smartnginx.classes.nginxzone";
-import { NginxProcess } from "./smartnginx.classes.nginxprocess";
-let allConfigs: NginxConfig[] = [];
-
-export class NginxConfig {
-    zones: NginxZone[] = [];
-    cert: plugins.cert.Cert; // the Cert Instance from which the config gets its certificates
-    nginxProcess: NginxProcess = new NginxProcess(this);
-    isDeployed: boolean = false;
-    constructor(optionsArg: plugins.cert.ICertConstructorOptions) {
-        this.cert = new plugins.cert.Cert({
-            cfEmail: optionsArg.cfEmail,
-            cfKey: optionsArg.cfKey,
-            sslDir: paths.nginxCertBase,
-            gitOriginRepo: optionsArg.gitOriginRepo,
-            testMode: optionsArg.testMode
-        });
-    };
-
-    // interact with Zones
-    addZone(zoneArg: NginxZone){
-        this.zones.push(zoneArg);
-    }
-    listZones(): NginxZone[]{
-        return this.zones;
-    };
-    removeZones(zoneArg: NginxZone) {
-
-    }
-    clean() {
-        this.zones = [];
-    }
-    // handle deployment of zones
-    deploy() {
-        let done = plugins.q.defer();
-        plugins.smartfile.fs.ensureDirSync(paths.nginxConfigBase);
-        plugins.smartfile.fs.ensureDirSync(paths.nginxZoneBase);
-        plugins.smartfile.fs.ensureDirSync(paths.nginxCertBase);
-        for (let config of allConfigs) {
-            config.isDeployed = false;
-        };
-        this.isDeployed = true;
-        // write base config
-        plugins.smartfile.memory.toFsSync(
-            snippets.getBaseConfigString(),
-            paths.nginxConfFile
-        );
-        // deploy zones
-        let promiseArray = [];
-        for (let zone of this.zones) {
-            let zoneDeployedPromise = zone.deploy(this.cert);
-            zoneDeployedPromise.then(() => {
-                plugins.beautylog.info(`Zone ${zone.zoneName} deployed!`);
-                this.nginxProcess.reloadConfig();
-            });
-            promiseArray.push(zoneDeployedPromise);
-        };
-        plugins.q.all(promiseArray)
-            .then(() => {
-                done.resolve();
-            });
-
-        return done.promise;
-    };
-};

ts/smartnginx.classes.nginxhost.ts

@@ -0,0 +1,53 @@
+import * as plugins from './smartnginx.plugins';
+import * as paths from './smartnginx.paths';
+import * as snippets from './smartnginx.snippets';
+
+import { SmartNginx } from './smartnginx.classes.smartnginx';
+
+import { IHostConfig } from './interfaces/hostconfig';
+
+export enum hostTypes {
+  reverseProxy
+}
+
+/**
+ * manages a single nginx host
+ */
+export class NginxHost implements IHostConfig {
+  /**
+   * smartnginxInstance this NginHost belongs to
+   */
+  smartnginxInstance: SmartNginx;
+
+  hostName: string; // the host name e.g. domain name
+  destination: string;
+  configString: string; // the actual host config file as string
+  privateKey: string;
+  publicKey: string;
+
+  constructor(smartnginxInstanceArg: SmartNginx, optionsArg: IHostConfig) {
+    this.smartnginxInstance = smartnginxInstanceArg;
+    this.hostName = optionsArg.hostName;
+    this.destination = optionsArg.destination;
+    this.configString = snippets.getHostConfigString(optionsArg.hostName, optionsArg.destination);
+    this.privateKey = optionsArg.privateKey;
+    this.publicKey = optionsArg.publicKey;
+  }
+
+  /**
+   *
+   * @param certInstanceArg
+   */
+  public async deploy() {
+    const filePathConfig = plugins.path.join(paths.nginxHostDirPath,  `${this.hostName}.conf`);
+    const filePathPrivate = plugins.path.join(paths.nginxHostDirPath,  `${this.hostName}.private.pem`);
+    const filePathPublic = plugins.path.join(paths.nginxHostDirPath,  `${this.hostName}.public.pem`);
+    // writeConfig
+    plugins.smartfile.memory.toFsSync(this.configString, filePathConfig);
+
+    // write ssl
+    plugins.smartfile.memory.toFsSync(this.privateKey, filePathPrivate);
+    plugins.smartfile.memory.toFsSync(this.publicKey, filePathPublic);
+
+  }
+}

ts/smartnginx.classes.nginxprocess.ts

@@ -1,70 +1,69 @@
-import * as plugins from "./smartnginx.plugins";
-import * as paths from "./smartnginx.paths";
-import { NginxConfig } from "./smartnginx.classes.nginxconfig";
-import { NginxZone } from "./smartnginx.classes.nginxzone";
+import * as plugins from './smartnginx.plugins';
+import * as paths from './smartnginx.paths';
+import { SmartNginx } from './smartnginx.classes.smartnginx';
+import { NginxHost } from './smartnginx.classes.nginxhost';
 
+import { Smartshell } from '@pushrocks/smartshell';
+
+import { ChildProcess } from 'child_process';
+
+/**
+ * manages a nginxprocess for an NginxConfig
+ */
 export class NginxProcess {
-    started: boolean = false;
-    nginxConfig:NginxConfig;
-    nginxChildProcess: plugins.childProcess.ChildProcess;
-    constructor(nginxConfigArg) {
-        this.nginxConfig = nginxConfigArg;
-    };
+  public started: boolean = false;
+  public smartNginxRef: SmartNginx;
+  private nginxChildProcess: ChildProcess;
+  private smartshellInstance = new Smartshell({
+    executor: 'bash'
+  });
 
-    /**
-     * start nginx
-     */
-    start() {
-        let done = plugins.q.defer();
-        if (typeof this.nginxChildProcess == "undefined"){
-            this.nginxChildProcess = plugins.childProcess.exec(`nginx -c ${paths.nginxConfFile}`, function (error, stdout, stderr) {
-                console.log(`stdout: ${stdout}`);
-                console.log(`stderr: ${stderr}`);
-                if (error !== null) {
-                    console.log(`exec error: ${error}`);
-                };
-            });
-        };
-        this.started = true;
-        plugins.beautylog.info("started Nginx!");
-        done.resolve();
-        return done.promise;
-    };
+  constructor(nginxRefArg: SmartNginx) {
+    this.smartNginxRef = nginxRefArg;
+  }
 
-    /**
-     * reload config
-     */
-    reloadConfig(){
-        let done = plugins.q.defer();
-        if(this.started == false){
-            this.start()
-        } else {
-            this.nginxChildProcess.kill("SIGHUP");
-        };
-        plugins.beautylog.ok("NginxProcess has loaded the new config!")
-        done.resolve();
-        return done.promise;
-    };
+  /**
+   * start nginx
+   */
+  public async start() {
+    if (!this.nginxChildProcess) {
+      this.nginxChildProcess = (await this.smartshellInstance.execStreaming(
+        `nginx -c ${paths.nginxConfFile}`
+      )).childProcess;
+    }
+    this.started = true;
+    plugins.smartlog.defaultLogger.log('info', 'started Nginx!');
+  }
 
-    /**
-     * stop the nginx instance
-     */
-    stop() {
-        let done = plugins.q.defer();
-        if (typeof this.nginxChildProcess != "undefined") {
-            this.nginxChildProcess.kill();
-            plugins.beautylog.info("stopped Nginx!");
-        } else {
-            plugins.beautylog.log("nginx already stopped!");
-        };
-        done.resolve();
-        return done.promise;
-    };
+  /**
+   * reload config
+   */
+  public async reloadConfig() {
+    if (!this.started) {
+      this.start();
+    } else {
+      await this.smartshellInstance.exec('nginx -s reload');
+    }
+    this.smartNginxRef.logger.log('info', 'NginxProcess has loaded the new config!');
+  }
 
-    /**
-     * checks if nginx is in path
-     */
-    check(): boolean {
-        return;
-    };
+  /**
+   * stop the nginx instance
+   */
+  public async stop() {
+    if (this.nginxChildProcess) {
+      this.smartshellInstance.exec('nginx -s quit');
+      this.started = false;
+      this.smartNginxRef.logger.log('info', 'stopped Nginx!');
+    } else {
+      this.smartNginxRef.logger.log('info', 'nginx already stopped!');
+    }
+  }
+
+  /**
+   * checks if nginx is in path
+   */
+  public check(): boolean {
+    return;
+  }
 }

ts/smartnginx.classes.nginxzone.ts

@@ -1,34 +0,0 @@
-import * as plugins from "./smartnginx.plugins";
-import * as paths from "./smartnginx.paths";
-import * as snippets from "./smartnginx.snippets"
-export enum zoneTypes {
-    reverseProxy,
-    static
-}
-
-export class NginxZone {
-    zoneName: string; // the zone name e.g. domain name
-    type: zoneTypes;
-    destination: string;
-    configString: string; // the actual zone config file as string
-    constructor(optionsArg: {
-        zoneName: string,
-        type: zoneTypes,
-        destination: string
-    }) {
-        this.zoneName = optionsArg.zoneName;
-        this.type = optionsArg.type;
-        this.destination = optionsArg.destination;
-        this.configString = snippets.getZoneConfigString(optionsArg.zoneName, optionsArg.destination);
-    };
-    deploy(certInstanceArg: plugins.cert.Cert) {
-        let done = plugins.q.defer();
-        let filePath = plugins.path.join(paths.nginxZoneBase, this.zoneName + ".conf");
-        // writeConfig
-        plugins.smartfile.memory.toFsSync(this.configString, filePath);
-        // get cert
-        certInstanceArg.getDomainCert(this.zoneName)
-            .then(done.resolve);
-        return done.promise;
-    };
-};

ts/smartnginx.classes.smartnginx.ts

@@ -0,0 +1,82 @@
+import * as plugins from './smartnginx.plugins';
+import * as paths from './smartnginx.paths';
+import * as snippets from './smartnginx.snippets';
+import { NginxHost } from './smartnginx.classes.nginxhost';
+import { NginxProcess } from './smartnginx.classes.nginxprocess';
+import { IHostConfig } from './interfaces/hostconfig';
+
+/**
+ * main class that manages a NginxInstance
+ */
+export class SmartNginx {
+  public logger: plugins.smartlog.Smartlog;
+  private hosts = new plugins.lik.Objectmap<NginxHost>();
+  public nginxProcess: NginxProcess = new NginxProcess(this);
+  constructor(optionsArg: { logger?: plugins.smartlog.Smartlog }) {
+    optionsArg.logger
+      ? (this.logger = optionsArg.logger)
+      : (this.logger = plugins.smartlog.defaultLogger);
+  }
+
+  // ===================
+  // interact with Hosts
+  // ===================
+
+  /**
+   * add a host
+   * @param nginxHostArg
+   */
+  public addHost(optionsArg: IHostConfig): NginxHost {
+    const nginxHost = new NginxHost(this, optionsArg);
+    this.hosts.add(nginxHost);
+    return nginxHost;
+  }
+
+  /**
+   * Gets a NginxHost by hostname
+   * @param hostNameArg
+   */
+  public getNginxHostByHostName(hostNameArg: string): NginxHost {
+    return this.hosts.find(nginxHost => {
+      return nginxHost.hostName === hostNameArg;
+    });
+  }
+  /**
+   * listHosts
+   */
+  public listHosts(): NginxHost[] {
+    return this.hosts.getArray();
+  }
+
+  /**
+   * remove a Host
+   * @param nginxHostArg
+   */
+  public removeHost(nginxHostArg: NginxHost) {
+    this.hosts.remove(nginxHostArg);
+  }
+
+  /**
+   * clean all hosts
+   */
+  public wipeHosts() {
+    this.hosts.wipe();
+  }
+
+  /**
+   * deploy the current stack and restart nginx
+   */
+  public async deploy() {
+    // write base config
+    plugins.smartfile.fs.ensureDirSync(paths.nginxConfigDirPath);
+    plugins.smartfile.memory.toFsSync(snippets.getBaseConfigString(), paths.nginxConfFile);
+
+    // deploy hosts
+    plugins.smartfile.fs.ensureEmptyDirSync(paths.nginxHostDirPath);
+    for (const host of this.hosts.getArray()) {
+      await host.deploy();
+      this.logger.log('info', `Host ${host.hostName} deployed!`);
+    }
+    this.nginxProcess.reloadConfig();
+  }
+}

ts/smartnginx.paths.ts

@@ -1,10 +1,9 @@
-import * as plugins from "./smartnginx.plugins"
+import * as plugins from './smartnginx.plugins';
 
 // directories
-export let packageBase = plugins.path.join(__dirname,"../");
-export let nginxConfigBase = plugins.path.join(packageBase,"nginxconfig");
-export let nginxZoneBase = plugins.path.join(nginxConfigBase,"zones");
-export let nginxCertBase = plugins.path.join(nginxConfigBase,"cert");
+export const packageBase = plugins.path.join(__dirname, '../');
+export const nginxConfigDirPath = plugins.path.join(packageBase, 'nginxconfig');
+export const nginxHostDirPath = plugins.path.join(nginxConfigDirPath, 'hosts');
 
 // files
-export let nginxConfFile = plugins.path.join(nginxConfigBase,"nginx.conf");
+export const nginxConfFile = plugins.path.join(nginxConfigDirPath, 'nginx.conf');

ts/smartnginx.plugins.ts

@@ -1,9 +1,14 @@
-import "typings-global";
-export import beautylog = require("beautylog");
-export import cert = require("cert");
-export import childProcess = require("child_process");
-export import path = require("path");
-export import q = require("q");
-export import shelljs = require("shelljs");
-export import smartfile = require("smartfile");
-export import smartstring = require("smartstring");
+// native
+import * as path from 'path';
+
+export { path };
+
+// @pushrocks scope
+import * as lik from '@pushrocks/lik';
+import * as smartlog from '@pushrocks/smartlog';
+import * as smartpromise from '@pushrocks/smartpromise';
+import * as smartshell from '@pushrocks/smartshell';
+import * as smartfile from '@pushrocks/smartfile';
+import * as smartstring from '@pushrocks/smartstring';
+
+export { lik, smartlog, smartpromise, smartshell, smartfile, smartstring };

ts/smartnginx.snippets.ts

@@ -1,6 +1,7 @@
-import * as plugins from "./smartnginx.plugins";
+import * as plugins from './smartnginx.plugins';
+import * as paths from './smartnginx.paths';
 export let getBaseConfigString = () => {
-	let baseConfig = plugins.smartstring.indent.normalize(`
+  let baseConfig = plugins.smartstring.indent.normalize(`
 		user www-data;
 		worker_processes auto;
 		pid /run/nginx.pid;
@@ -62,42 +63,43 @@ export let getBaseConfigString = () => {
 			# Virtual Host Configs
 			##
 
-			include /etc/nginx/conf.d/*.conf;
+			include ${paths.nginxHostDirPath}/*.conf;
 			include /etc/nginx/sites-enabled/*;
 		}
 		daemon off;
 	`);
-	return baseConfig;
-}
+  return baseConfig;
+};
 
-
-export let getZoneConfigString = (zoneNameArg:string,destinationIpArg:string) => {
-	let zoneConfig = plugins.smartstring.indent.normalize(`
-		upstream ${zoneNameArg} {
+export let getHostConfigString = (hostNameArg: string, destinationIpArg: string) => {
+  let hostConfig = plugins.smartstring.indent.normalize(`
+		upstream ${hostNameArg} {
 			server ${destinationIpArg};
 		}
 
 		server {
 			listen *:80 ;
-			server_name ${zoneNameArg};
-			rewrite        ^ https://${zoneNameArg}$request_uri? permanent;
+			server_name ${hostNameArg};
+			rewrite        ^ https://${hostNameArg}$request_uri? permanent;
 		}
 
 		server {
 			listen *:443 ssl;
-			server_name ${zoneNameArg};
-			ssl_certificate /LE_CERTS/${zoneNameArg}/fullchain.pem;
-			ssl_certificate_key /LE_CERTS/${zoneNameArg}/privkey.pem;
+			server_name ${hostNameArg};
+			ssl_certificate ${paths.nginxHostDirPath}/${hostNameArg}.public.pem;
+			ssl_certificate_key ${paths.nginxHostDirPath}/${hostNameArg}.private.pem;
 
 			location / {
-				proxy_pass http://${zoneNameArg};
-				include /etc/nginx/proxy_params;
+				proxy_set_header Host $http_host;
+				proxy_set_header X-Real-IP $remote_addr;
+				proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+				proxy_set_header X-Forwarded-Proto $scheme;
+				proxy_pass http://${hostNameArg};
 			}
 			location ~ /\.git {
 				deny all;
 			}
 		}
 	`);
-	return zoneConfig;
+  return hostConfig;
 };
-

tslint.json

@@ -0,0 +1,17 @@
+{
+  "extends": ["tslint:latest", "tslint-config-prettier"],
+  "rules": {
+    "semicolon": [true, "always"],
+    "no-console": false,
+    "ordered-imports": false,
+    "object-literal-sort-keys": false,
+    "member-ordering": {
+      "options":{
+        "order": [
+          "static-method"
+        ]
+      }
+    }
+  },
+  "defaultSeverity": "warning"
+}