diff --git a/back/app.conf b/back/app.conf
index b966ea84..4507083b 100755
--- a/back/app.conf
+++ b/back/app.conf
@@ -20,7 +20,7 @@
DISCOVER_PLUGINS=True
SCAN_SUBNETS=['--localnet']
TIMEZONE='Europe/Berlin'
-LOADED_PLUGINS=['ARPSCAN','CSVBCKP','DBCLNP', 'DIGSCAN', 'INTRNT','MAINT','NEWDEV', 'NBTSCAN', 'NSLOOKUP','NTFPRCS', 'AVAHISCAN', 'SETPWD','SMTP', 'SYNC', 'VNDRPDT', 'WORKFLOWS', 'UI']
+LOADED_PLUGINS=['ARPSCAN', 'AVAHISCAN', 'CSVBCKP','DBCLNP', 'DIGSCAN', 'INTRNT', 'MAINT', 'NEWDEV', 'NBTSCAN', 'NSLOOKUP','NTFPRCS', 'SETPWD', 'SMTP', 'SYNC', 'VNDRPDT', 'WORKFLOWS', 'UI']
DAYS_TO_KEEP_EVENTS=90
# Used for generating links in emails. Make sure not to add a trailing slash!
@@ -30,6 +30,8 @@ REPORT_DASHBOARD_URL='http://127.0.0.1'
INTRNT_RUN='schedule'
ARPSCAN_RUN='schedule'
NSLOOKUP_RUN='before_name_updates'
+AVAHISCAN_RUN='before_name_updates'
+NBTSCAN_RUN='before_name_updates'
# Email
#-------------------------------------
diff --git a/docker-compose.yml b/docker-compose.yml
index cea90d25..2d572369 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -67,7 +67,6 @@ services:
- ${DEV_LOCATION}/front/appEventsCore.php:/app/front/appEventsCore.php
- ${DEV_LOCATION}/front/multiEditCore.php:/app/front/multiEditCore.php
- ${DEV_LOCATION}/front/plugins:/app/front/plugins
-
# DELETE END anyone trying to use this file: comment out / delete ABOVE lines, they are only for development purposes
# ---------------------------------------------------------------------------
environment:
diff --git a/front/plugins/avahi_scan/config.json b/front/plugins/avahi_scan/config.json
index 2a827f29..66c02c91 100755
--- a/front/plugins/avahi_scan/config.json
+++ b/front/plugins/avahi_scan/config.json
@@ -52,7 +52,7 @@
{ "elementType": "select", "elementOptions": [], "transformers": [] }
]
},
- "default_value": "before_name_updates",
+ "default_value": "disabled",
"options": [
"disabled",
"before_name_updates",
diff --git a/front/plugins/dig_scan/config.json b/front/plugins/dig_scan/config.json
index 8e64cf3a..71cd67dc 100755
--- a/front/plugins/dig_scan/config.json
+++ b/front/plugins/dig_scan/config.json
@@ -178,15 +178,15 @@
"description": [
{
"language_code": "en_us",
- "string": "Only enabled if you select schedule in the NBTSCAN_RUN setting. Make sure you enter the schedule in the correct cron-like format (e.g. validate at crontab.guru). For example entering 0 4 * * * will run the scan after 4 am in the TIMEZONE you set above. Will be run NEXT time the time passes."
+ "string": "Only enabled if you select schedule in the DIGSCAN_RUN setting. Make sure you enter the schedule in the correct cron-like format (e.g. validate at crontab.guru). For example entering 0 4 * * * will run the scan after 4 am in the TIMEZONE you set above. Will be run NEXT time the time passes."
},
{
"language_code": "es_es",
- "string": "Solo está habilitado si selecciona schedule en la configuración NBTSCAN_RUN. Asegúrese de ingresar la programación en el formato similar a cron correcto (por ejemplo, valide en crontab.guru). Por ejemplo, ingresar 0 4 * * * ejecutará el escaneo después de las 4 a.m. en el TIMEZONE que configuró arriba. Se ejecutará la PRÓXIMA vez que pase el tiempo."
+ "string": "Solo está habilitado si selecciona schedule en la configuración DIGSCAN_RUN. Asegúrese de ingresar la programación en el formato similar a cron correcto (por ejemplo, valide en crontab.guru). Por ejemplo, ingresar 0 4 * * * ejecutará el escaneo después de las 4 a.m. en el TIMEZONE que configuró arriba. Se ejecutará la PRÓXIMA vez que pase el tiempo."
},
{
"language_code": "de_de",
- "string": "Nur aktiviert, wenn Sie schedule in der NBTSCAN_RUN-Einstellung auswählen. Stellen Sie sicher, dass Sie den Zeitplan im richtigen Cron-ähnlichen Format eingeben (z. B. validieren unter crontab.guru). Wenn Sie beispielsweise 0 4 * * * eingeben, wird der Scan nach 4 Uhr morgens in der TIMEZONE den Sie oben festgelegt haben. Wird das NÄCHSTE Mal ausgeführt, wenn die Zeit vergeht."
+ "string": "Nur aktiviert, wenn Sie schedule in der DIGSCAN_RUN-Einstellung auswählen. Stellen Sie sicher, dass Sie den Zeitplan im richtigen Cron-ähnlichen Format eingeben (z. B. validieren unter crontab.guru). Wenn Sie beispielsweise 0 4 * * * eingeben, wird der Scan nach 4 Uhr morgens in der TIMEZONE den Sie oben festgelegt haben. Wird das NÄCHSTE Mal ausgeführt, wenn die Zeit vergeht."
}
]
},
diff --git a/front/plugins/nbtscan_scan/config.json b/front/plugins/nbtscan_scan/config.json
index 50691f12..51fd3a13 100755
--- a/front/plugins/nbtscan_scan/config.json
+++ b/front/plugins/nbtscan_scan/config.json
@@ -52,7 +52,7 @@
{ "elementType": "select", "elementOptions": [], "transformers": [] }
]
},
- "default_value": "before_name_updates",
+ "default_value": "disabled",
"options": [
"disabled",
"before_name_updates",
diff --git a/front/plugins/unifi_import/script.py b/front/plugins/unifi_import/script.py
index 7f7f75d8..eaadf616 100755
--- a/front/plugins/unifi_import/script.py
+++ b/front/plugins/unifi_import/script.py
@@ -12,7 +12,7 @@ import sys
import requests
from requests import Request, Session, packages
from requests.packages.urllib3.exceptions import InsecureRequestWarning
-from pyunifi.controller import Controller
+from nax_pyunifi.controller import Controller
# Register NetAlertX directories
@@ -52,7 +52,7 @@ def main():
# init global variables
- global UNIFI_USERNAME, UNIFI_PASSWORD, UNIFI_HOST, UNIFI_SITES, PORT, VERIFYSSL, VERSION, FULL_IMPORT, API_KEY
+ global UNIFI_USERNAME, UNIFI_PASSWORD, UNIFI_HOST, UNIFI_SITES, PORT, VERIFYSSL, VERSION, FULL_IMPORT
# parse output
plugin_objects = Plugin_Objects(RESULT_FILE)
@@ -65,10 +65,6 @@ def main():
VERIFYSSL = get_setting_value("UNFIMP_verifyssl")
VERSION = get_setting_value("UNFIMP_version")
FULL_IMPORT = get_setting_value("UNFIMP_fullimport")
- API_KEY = get_setting_value("UNFIMP_api_key")
-
- if API_KEY == '':
- API_KEY = None
plugin_objects = get_entries(plugin_objects)
@@ -100,19 +96,6 @@ def get_entries(plugin_objects: Plugin_Objects) -> Plugin_Objects:
mylog('verbose', [f'[{pluginName}] site: {site}'])
-
- # def __init__(
- # self,
- # host,
- # username=None,
- # password=None,
- # port=8443,
- # version="v5",
- # site_id="default",
- # ssl_verify=True,
- # api_key=None
- # ):
-
c = Controller(
UNIFI_HOST,
UNIFI_USERNAME,
@@ -120,8 +103,7 @@ def get_entries(plugin_objects: Plugin_Objects) -> Plugin_Objects:
port=PORT,
version=VERSION,
ssl_verify=VERIFYSSL,
- site_id=site,
- api_key=API_KEY)
+ site_id=site)
online_macs = set()
processed_macs = []
diff --git a/front/plugins/website_monitor/script.py b/front/plugins/website_monitor/script.py
index ce275169..f3f35568 100755
--- a/front/plugins/website_monitor/script.py
+++ b/front/plugins/website_monitor/script.py
@@ -3,6 +3,7 @@
import argparse
import requests
+from requests.exceptions import SSLError, Timeout, RequestException
import pathlib
import sys
import os