2.0.6

.gitlab-ci.yml

@@ -1,4 +1,4 @@
-image: hosttoday/ht-docker-node:npmts
+image: hosttoday/ht-docker-node:npmci
 
 stages:
 - test
@@ -10,11 +10,13 @@ before_script:
 testSTABLE:
   stage: test
   script:
+    - npmci npm install
     - npmci npm test stable
   only:
     - tags
   tags:
     - docker
+    - notpriv
 
 release:
   stage: release

npmextra.json

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

package.json

@@ -1,6 +1,7 @@
 {
   "name": "@pushrocks/smartnginx",
-  "version": "2.0.0",
+  "version": "2.0.6",
+  "private": false,
   "description": "control nginx from node, TypeScript ready",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -23,18 +24,17 @@
   },
   "homepage": "https://gitlab.com/pushrocks/smartnginx#README",
   "dependencies": {
-    "@pushrocks/smartfile": "^6.0.6",
+    "@pushrocks/smartfile": "^6.0.11",
-    "@pushrocks/smartlog": "^2.0.1",
+    "@pushrocks/smartlog": "^2.0.9",
     "@pushrocks/smartpromise": "^2.0.5",
-    "@pushrocks/smartshell": "^2.0.6",
+    "@pushrocks/smartshell": "^2.0.13",
-    "@pushrocks/smartstring": "^3.0.0"
+    "@pushrocks/smartstring": "^3.0.5"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.0.22",
+    "@gitzone/tsbuild": "^2.1.4",
-    "@gitzone/tsrun": "^1.1.12",
+    "@gitzone/tsrun": "^1.1.17",
-    "@gitzone/tstest": "^1.0.13",
+    "@gitzone/tstest": "^1.0.18",
-    "@pushrocks/tapbundle": "^3.0.5",
+    "@pushrocks/tapbundle": "^3.0.7",
     "qenv": "^1.1.7"
-  },
+  }
-  "private": true
 }

test/test.ts

@@ -30,8 +30,8 @@ tap.test(`should produce an instance of NginxConfig`, async () => {
 });
 
 tap.test('.addZone() should add a zone to NginxConfig Object', async () => {
-  testSmartNginx.addHost(testNginxZone01);
+  testSmartNginx.addHost('test200.bleu.de', '192.192.192.191');
-  testSmartNginx.addHost(testNginxZone02);
+  testSmartNginx.addHost('test201.blue.de', '192.192.192.191');
 });
 
 tap.test('.deploy() should deploy a config from an instance', async () => {

ts/smartnginx.classes.certhandler.ts

@@ -1,5 +1,15 @@
 import * as plugins from './smartnginx.plugins';
 
 export class CertHandler {
+  private _readyDeferred = plugins.smartpromise.defer();
+  certHandlerReady = this._readyDeferred.promise;
+  constructor() {} // nothing to do here for now
+
+  /**
+   * ensure a cert is at the right location
+   * @param hostName
+   */
+  async ensureCertForHost(hostName) {
 
   }
+}

ts/smartnginx.classes.nginxprocess.ts

@@ -37,7 +37,7 @@ export class NginxProcess {
       );
     }
     this.started = true;
-    plugins.smartlog.defaultLogger.info('started Nginx!');
+    plugins.smartlog.defaultLogger.log('info', 'started Nginx!');
     done.resolve();
     return done.promise;
   }
@@ -52,7 +52,7 @@ export class NginxProcess {
     } else {
       this.smartshellInstance.exec('nginx -s reload');
     }
-    plugins.smartlog.defaultLogger.info('NginxProcess has loaded the new config!');
+    plugins.smartlog.defaultLogger.log('info', 'NginxProcess has loaded the new config!');
     done.resolve();
     return done.promise;
   }
@@ -65,9 +65,9 @@ export class NginxProcess {
     if (typeof this.nginxChildProcess != 'undefined') {
       this.smartshellInstance.exec('nginx -s quit');
       this.started = false;
-      plugins.smartlog.defaultLogger.info('stopped Nginx!');
+      plugins.smartlog.defaultLogger.log('info', 'stopped Nginx!');
     } else {
-      plugins.smartlog.defaultLogger.info('nginx already stopped!');
+      plugins.smartlog.defaultLogger.log('info', 'nginx already stopped!');
     }
     done.resolve();
     return done.promise;

ts/smartnginx.classes.smartnginx.ts

@@ -26,10 +26,22 @@ export class SmartNginx {
    * add a host
    * @param nginxHostArg
    */
-  addHost(nginxHostArg: NginxHost) {
+  addHost(hostNameArg: string, destinationIp: string): NginxHost {
-    this.hosts.push(nginxHostArg);
+    const nginxHost = new NginxHost(this, {
+      hostName: hostNameArg,
+      destination: destinationIp
+    })
+    this.hosts.push(nginxHost);
+    return nginxHost;
   }
 
+  getNginxHostByHostName(hostNameArg: string): NginxHost {
+    return this.hosts.find(nginxHost => {
+      return nginxHost.hostName === hostNameArg;
+    })
+  }
+
+
   /**
    * listHosts
    */
@@ -67,7 +79,7 @@ export class SmartNginx {
     let promiseArray = [];
     for (let host of this.hosts) {
       await host.deploy();
-      plugins.smartlog.defaultLogger.info(`Host ${host.hostName} deployed!`);
+      plugins.smartlog.defaultLogger.log('info', `Host ${host.hostName} deployed!`);
       this.nginxProcess.reloadConfig();
     };
   }