Merge branch 'master' into dev

simatec · Nov 1, 2023 · 0cb0215 · 0cb0215
2 parents df62bd9 + 029d8c6
commit 0cb0215
Show file tree

Hide file tree

Showing 27 changed files with 470 additions and 420 deletions.
diff --git a/README.md b/README.md
@@ -52,6 +52,28 @@ When the adapter crashes or another Code error happens, this error message that
 
 ## Changelog
 <!-- ### **WORK IN PROGRESS** -->
+### 2.8.7 (2023-10-19)
+* (buanet) fix restore in docker v9
+
+### 2.8.6 (2023-10-13)
+* (simatec) Fix node-red restore
+* (simatec) dependencies updated
+
+### 2.8.5 (2023-10-13)
+* (simatec) Fix mount errors
+
+### 2.8.4 (2023-10-11)
+* (simatec) Fix mysql Backup
+* (simatec) Fix pgsql Backup
+* (simatec) Fix InfluxDB Backup
+
+### 2.8.3 (2023-10-10)
+* (simatec) Wake on LAN Advanced Settings added
+* (simatec) dependencies updated
+
+### 2.8.2 (2023-09-28)
+* (simatec) Fix redis backup
+
 ### 2.8.1 (2023-09-12)
 * (simatec) Fix roles
 * (simatec) help-links added

diff --git a/admin/i18n/de/translations.json b/admin/i18n/de/translations.json
diff --git a/admin/i18n/en/translations.json b/admin/i18n/en/translations.json
@@ -237,9 +237,10 @@
   "Username": "Username",
   "Username of the CCU": "Username of the CCU",
   "Version": "Version",
-  "WOL wait time": "WOL wait time",
+  "WOL wait time in seconds": "WOL wait time in seconds",
   "Waiting for the send (seconds)": "Wait before sending (seconds)",
   "Wake on LAN": "Wake on LAN",
+  "Wake on LAN Advanced Settings": "Wake on LAN Advanced Settings",
   "WebDAV": "WebDAV",
   "WebDAV URL": "WebDAV URL",
   "WebDAV: Yes": "WebDAV: Yes",

diff --git a/admin/i18n/es/translations.json b/admin/i18n/es/translations.json
@@ -237,9 +237,10 @@
   "Username": "nombre de usuario",
   "Username of the CCU": "Nombre de usuario de la CCU",
   "Version": "Versión",
-  "WOL wait time": "Tiempo de espera wol",
+  "WOL wait time in seconds": "WOL espera tiempo en segundos",
   "Waiting for the send (seconds)": "Esperando el envío (segundos)",
   "Wake on LAN": "Activación de la LAN",
+  "Wake on LAN Advanced Settings": "Activación de la LAN Ajustes avanzados",
   "WebDAV": "WebDAV",
   "WebDAV URL": "URL de WebDAV",
   "WebDAV: Yes": "WebDAV: Sí",

diff --git a/admin/i18n/fr/translations.json b/admin/i18n/fr/translations.json
@@ -237,9 +237,10 @@
   "Username": "nom d'utilisateur",
   "Username of the CCU": "Nom d'utilisateur du CCU",
   "Version": "Version",
-  "WOL wait time": "WOL temps d'attente",
+  "WOL wait time in seconds": "Temps d'attente WOL en quelques secondes",
   "Waiting for the send (seconds)": "En attente de l'envoi (secondes)",
   "Wake on LAN": "Wake on LAN",
+  "Wake on LAN Advanced Settings": "Wake on LAN Paramètres avancés",
   "WebDAV": "WebDAV",
   "WebDAV URL": "URL WebDAV",
   "WebDAV: Yes": "WebDAV: Oui",

diff --git a/admin/i18n/it/translations.json b/admin/i18n/it/translations.json
@@ -237,9 +237,10 @@
   "Username": "nome utente",
   "Username of the CCU": "Nome utente del CCU",
   "Version": "Versione",
-  "WOL wait time": "Tempo di attesa WOL",
+  "WOL wait time in seconds": "WOL tempo di attesa in secondi",
   "Waiting for the send (seconds)": "In attesa dell'invio (secondi)",
   "Wake on LAN": "Wake on LAN",
+  "Wake on LAN Advanced Settings": "Wake on LAN Impostazioni avanzate",
   "WebDAV": "WebDAV",
   "WebDAV URL": "URL WebDAV",
   "WebDAV: Yes": "WebDAV: Sì",

diff --git a/admin/i18n/nl/translations.json b/admin/i18n/nl/translations.json
@@ -237,9 +237,10 @@
   "Username": "Gebruikersnaam",
   "Username of the CCU": "Gebruikersnaam van de CCU",
   "Version": "Versie",
-  "WOL wait time": "WOL wachttijd",
+  "WOL wait time in seconds": "WOL wacht in seconden",
   "Waiting for the send (seconds)": "Wachten op het verzenden (seconden)",
   "Wake on LAN": "Wake on LAN",
+  "Wake on LAN Advanced Settings": "Wake on LAN Vervoegde Setting",
   "WebDAV": "WebDAV",
   "WebDAV URL": "WebDAV-URL",
   "WebDAV: Yes": "WebDAV: Ja",

diff --git a/admin/i18n/pl/translations.json b/admin/i18n/pl/translations.json
@@ -237,9 +237,10 @@
   "Username": "nazwa uzytkownika",
   "Username of the CCU": "Nazwa uzytkownika CCU",
   "Version": "Wersja",
-  "WOL wait time": "Czas oczekiwania WOL",
+  "WOL wait time in seconds": "WOL czeka na czas w drugim",
   "Waiting for the send (seconds)": "Oczekiwanie na wysłanie (sekundy)",
   "Wake on LAN": "Obudź się w sieci LAN",
+  "Wake on LAN Advanced Settings": "Obudź się w sieci LAN Advanced Settings (ang.)",
   "WebDAV": "WebDAV",
   "WebDAV URL": "URL WebDAV",
   "WebDAV: Yes": "WebDAV: tak",

diff --git a/admin/i18n/pt/translations.json b/admin/i18n/pt/translations.json
@@ -237,9 +237,10 @@
   "Username": "nome de usuário",
   "Username of the CCU": "Nome de usuário da CCU",
   "Version": "Versão",
-  "WOL wait time": "WOL wait time",
+  "WOL wait time in seconds": "WOL tempo de espera em segundos",
   "Waiting for the send (seconds)": "Aguardando o envio (segundos)",
   "Wake on LAN": "Wake on LAN",
+  "Wake on LAN Advanced Settings": "Wake on LAN Configurações avançadas",
   "WebDAV": "WebDAV",
   "WebDAV URL": "URL WebDAV",
   "WebDAV: Yes": "WebDAV: Sim",

diff --git a/admin/i18n/ru/translations.json b/admin/i18n/ru/translations.json
@@ -237,9 +237,10 @@
   "Username": "Имя пользователя",
   "Username of the CCU": "Имя пользователя",
   "Version": "Версия",
-  "WOL wait time": "WOL wait time",
+  "WOL wait time in seconds": "WOL время ожидания за считанные секунды",
   "Waiting for the send (seconds)": "Подождать перед отправкой (секунд)",
   "Wake on LAN": "Wake On LAN",
+  "Wake on LAN Advanced Settings": "Wake On LAN Продвинутые настройки",
   "WebDAV": "WebDAV",
   "WebDAV URL": "URL-адрес WebDAV",
   "WebDAV: Yes": "WebDAV: Да",

diff --git a/admin/i18n/uk/translations.json b/admin/i18n/uk/translations.json
@@ -237,9 +237,10 @@
   "Username": "Ім'я користувача",
   "Username of the CCU": "Ім'я користувача ЦКУ",
   "Version": "Версія",
-  "WOL wait time": "WOL час очікування",
+  "WOL wait time in seconds": "Час очікування WOL в секундах",
   "Waiting for the send (seconds)": "Зачекайте перед надсиланням (секунди)",
   "Wake on LAN": "Пробудження по локальній мережі",
+  "Wake on LAN Advanced Settings": "Пробудження по локальній мережі Розширені налаштування",
   "WebDAV": "WebDAV",
   "WebDAV URL": "WebDAV URL",
   "WebDAV: Yes": "WebDAV: Так",

diff --git a/admin/i18n/zh-cn/translations.json b/admin/i18n/zh-cn/translations.json
@@ -237,9 +237,10 @@
   "Username": "用户名",
   "Username of the CCU": "CCU 的用户名",
   "Version": "版本",
-  "WOL wait time": "WOL 等待时间",
+  "WOL wait time in seconds": "WOL等待第二期会议时间",
   "Waiting for the send (seconds)": "发送前等待（秒）",
   "Wake on LAN": "局域网唤醒",
+  "Wake on LAN Advanced Settings": "局域网唤醒 预先规定",
   "WebDAV": "WebDAV",
   "WebDAV URL": "WebDAV 网址",
   "WebDAV: Yes": "WebDAV：是的",

diff --git a/admin/index_m.html b/admin/index_m.html
@@ -1112,16 +1112,21 @@ <h6 class="translate title" style="background-color:#174475; font-size: 0.9rem;
                         <input class="value" id="macAd" type="text">
                         <label for="macAd" class="translate">MAC address</label>
                     </div>
-                    <div class="input-field col s12 m4 l2 wol">
+                    <div class="input-field col s12 m6 l4 wol">
+                        <input type="number" class="value" id="wolWait" min="25" max="180"/>
+                        <label for="wolWait" class="translate">WOL wait time in seconds</label>
+                    </div>
+                </div>
+                <div class="row cifs">
+                    <div class="input-field col s6 l4 wol">
+                        <input class="value" id="wolExtra" type="checkbox"/>
+                        <label for="wolExtra" class="translate">Wake on LAN Advanced Settings</label>
+                    </div>
+                    <div class="input-field col s12 m6 l4 wolExtended">
                         <input type="number" class="value" id="wolPort" min="1" max="65535"/>
                         <label for="wolPort" class="translate">port</label>
                         <span class="translate">port</span>
                     </div>
-                    <div class="input-field col s12 m4 l2 wol">
-                        <input type="number" class="value" id="wolWait" min="25" max="180"/>
-                        <label for="wolWait" class="translate">seconds</label>
-                        <span class="translate">WOL wait time</span>
-                    </div>
                 </div>
                 <div class="row cifs cifs-extra">
                     <div class="input-field col s12 m6 l4">

diff --git a/admin/index_m.js b/admin/index_m.js
@@ -1342,6 +1342,11 @@ function showHideSettings(settings) {
     } else {
         $('.wol').hide();
     }
+    if ($('#wakeOnLAN').prop('checked') && $('#wolExtra').prop('checked')) {
+        $('.wolExtended').show();
+    } else {
+        $('.wolExtended').hide();
+    }
 
     if ($('#dropboxOwnDir').prop('checked')) {
         $('.dropbox-extra').show();

diff --git a/admin/words.js b/admin/words.js
diff --git a/docs/de/backitup.md b/docs/de/backitup.md
@@ -372,7 +372,9 @@ _[Zurück zum Anfang](#top)_
     * info.iobrokerNextTime -> zeigt die nächste Ausführungszeit des ioBroker-Backups
     * info.latestBackup -> zeigt als json das letzte beim Start ermittelte Backup
 
-2. History-Log in Vis anzeigen
+2. Backup History-Log in Vis anzeigen
+   - Der Backup History-Log zeigt die letzten x Backups an
+   - Die Anzahl der anzuzeigenen History-Einträge kann in den Extra-Einstellungen festgelegt werden.
    - Es ist möglich, den History-Log bspw. in einem Html-Widget durch eintragen folgender Zeile in HTML darzustellen:
 ```
 {backitup.0.history.html}
@@ -459,7 +461,7 @@ Wer seine Backups lieber manuell wiederherstellen möchte, sollte folgende Punkt
     - Es kann über die Konsole mit Hilfe des Befehls: `iobroker restore <Backupdateiname>` wieder hergestellt werden.
     - Nach dem Restore ist ein `iobroker upload all` nötig
 
-Eine detailierte Anleitung zum Restore mit ioBroker.backitup und auch zum manuellen Restore ist [hier](https://forum.iobroker.net/topic/27271/howto-iobroker-restore-unter-linux-durchf%C3%BChren) zu finden.
+Eine detailierte Anleitung zum Restore mit ioBroker.backitup und auch zum manuellen Restore ist [hier](https://github.com/simatec/ioBroker.backitup/wiki/%5BHowTo%5D-Restore-auf-Linux-Distributionen) zu finden.
 
 **Das CCU-Backup muss weiterhin über das Webinterface der CCU wiederhergestellt werden.**
 

diff --git a/docs/en/backitup.md b/docs/en/backitup.md
@@ -373,7 +373,9 @@ _[Back to top](#top)_
     * info.iobrokerNextTime -> shows the next execution time of the ioBroker backup
     * info.latestBackup -> shows as json the last backup determined at the start
 
-2. Show history log in Vis
+2. show backup history log in Vis
+   - The backup history log shows the last x backups.
+   - The number of history entries displayed can be set in the Extra settings.
    - It is possible to display the history log e.g. in an HTML widget by entering the following line in HTML:
 ```
 {backitup.0.history.html}
@@ -460,7 +462,7 @@ If you prefer to restore your backups manually, you should do the following:
     - It can be restored via the console using the command: `iobroker restore <Backupfilename>`.
     - After the restore an `iobroker upload all` is necessary
 
-Detailed instructions for restoring with Backup and also for manual restoring can be found [here] (https://forum.iobroker.net/topic/27271/howto-iobroker-restore-unter-linux-durchf%C3%BChren).
+Detailed instructions for restoring with Backup and also for manual restoring can be found [here] (https://github.com/simatec/ioBroker.backitup/wiki/%5BHowTo%5D-Restore-auf-Linux-Distributionen).
 
 **The CCU backup must still be restored via the CCU's web interface.**