### 1.5.2 (2016-08-27)

* (bluefox) use pure letsencrypt module
ioBroker · Aug 26, 2016 · ab45363 · ab45363
1 parent 3badc91
commit ab45363
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -62,6 +62,9 @@ The topic is rather complex and 1000 things can go wrong. If you cannot get cert
 **Let's encrypt works only from node.js version>=4.5**
 
 ## Changelog
+### 1.5.2 (2016-08-27)
+* (bluefox) use pure letsencrypt module
+
 ### 1.5.1 (2016-08-22)
 * (bluefox) fix error in instances table
 

diff --git a/admin/index.html b/admin/index.html
@@ -49,7 +49,28 @@
         "every 3 days":         {"en": "every 3 days",              "de": "alle 3 Tage",            "ru": "каждые 3 дня"},
         "every week":           {"en": "every week",                "de": "jede Woche",             "ru": "каждую неделю"},
         "every 2 weeks":        {"en": "every 2 weeks",             "de": "alle 2 Wochen",          "ru": "каждые 2 недели"},
-        "monthly":              {"en": "monthly",                   "de": "monatlich",              "ru": "раз в месяц"}
+        "monthly":              {"en": "monthly",                   "de": "monatlich",              "ru": "раз в месяц"},
+        "Login timeout(sec):":  {"en": "Login timeout(sec):",       "de": "Login timeout(Sek):",    "ru": "Logout через(сек):"},
+        "Let's Encrypt settings": {
+            "en": "Let's Encrypt settings",
+            "de": "Einstellungen Let's Encrypt",
+            "ru": "Настройкт Let's Encrypt"
+        },
+        "Use Lets Encrypt certificates:": {
+            "en": "Use Let's Encrypt certificates:",
+            "de": "Benutzen Let's Encrypt Zertifikate:",
+            "ru": "Использовать сертификаты Let's Encrypt:"
+        },
+        "Use this instance for automatic update:": {
+            "en": "Use this instance for automatic update:",
+            "de": "Benutze diese Instanz für automatische Updates:",
+            "ru": "Обновлять сертификаты в этом драйвере:"
+        },
+        "Port to check the domain:": {
+            "en": "Port to check the domain:",
+            "de": "Port um die Domain zu prüfen:",
+            "ru": "Порт для проверки доменного имени:"
+        }
     };
 
     function showHideSettings() {

diff --git a/io-package.json b/io-package.json
@@ -2,8 +2,13 @@
     "common": {
         "name":                     "admin",
         "title":                    "ioBroker Admin",
-        "version": "1.5.1",
+        "version": "1.5.2",
         "news": {
+            "1.5.2": {
+                "en": "use pure letsencrypt module",
+                "de": "Benutze nut letsencrypt module",
+                "ru": "Используется только letsencrypt модуль"
+            },
             "1.5.1": {
                 "en": "fix error in instances table",
                 "de": "fix error in instances table",

diff --git a/lib/letsencrypt.js b/lib/letsencrypt.js
@@ -11,7 +11,7 @@ function createServer(app, settings, certificates, leSettings, log) {
             var tools = require(utils.controllerDir + '/lib/tools');
             var tls   = require('tls');
             var fs    = require('fs');
-            var LEX   = require('letsencrypt-express');
+            var LE    = require('letsencrypt');
             var leDir;
             var logDir;
 
@@ -42,7 +42,7 @@ function createServer(app, settings, certificates, leSettings, log) {
                 }
             }
 
-            var lex = LEX.create({
+            var lex = LE.create({
                 debug:           true,
                 configDir:       leDir,
                 agreeTos:        true,
@@ -53,7 +53,9 @@ function createServer(app, settings, certificates, leSettings, log) {
                     if (debug) {
                         var args = Array.prototype.slice.call(arguments);
                         args.shift(); // remove debug argument
-                        log.info(console, args);
+                        // skip "no match"
+                        if (args[0][0] === 'n' && args[0][1] === 'o') return;
+                        log.info.apply(console, args);
                     }
                 }
             });

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "iobroker.admin",
   "description": "The adapter opens a webserver for the ioBroker admin UI.",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "contributors": [
     "bluefox <[email protected]>",
     "hobbyquaker <[email protected]>"
@@ -22,7 +22,10 @@
     "setup"
   ],
   "optionalDependencies": {
-    "letsencrypt-express": "^2.0.2"
+    "letsencrypt": "^2.1.5",
+    "le-challenge-fs": "^2.0.4",
+    "le-sni-auto": "^2.0.1",
+    "le-store-certbot": "^2.0.3"
   },
   "dependencies": {
     "express": "^4.14.0",