From 29a6b78f27ebbfe08f418e2f31754617091dec19 Mon Sep 17 00:00:00 2001 From: Jokob-sk Date: Thu, 2 Feb 2023 18:45:30 +1100 Subject: [PATCH] Cleanup --- back/pialert.py | 6 +- ...eport_sample_2.html => report_sample.html} | 0 ...{report_sample_1.txt => report_sample.txt} | 0 docker-compose.yml | 4 +- docs/report_sample_1.html | 80 ------------------- 5 files changed, 5 insertions(+), 85 deletions(-) rename back/{report_sample_2.html => report_sample.html} (100%) rename back/{report_sample_1.txt => report_sample.txt} (100%) delete mode 100755 docs/report_sample_1.html diff --git a/back/pialert.py b/back/pialert.py index 0487b357..b6736526 100755 --- a/back/pialert.py +++ b/back/pialert.py @@ -2330,7 +2330,7 @@ def send_notifications (): sql.execute ("""UPDATE Events SET eve_PendingAlertEmail = 0 WHERE eve_PendingAlertEmail = 1""") - changedPorts = None + changedPorts_json_struc = None # DEBUG - print number of rows updated file_print(' Notifications: ', sql.rowcount) @@ -3370,10 +3370,10 @@ def handle_test(testType): file_print('[', timeNow(), '] START Test: ', testType) # Open text sample - sample_txt = get_file_content(pialertPath + '/back/report_sample_1.txt') + sample_txt = get_file_content(pialertPath + '/back/report_sample.txt') # Open html sample - sample_html = get_file_content(pialertPath + '/back/report_sample_2.html') + sample_html = get_file_content(pialertPath + '/back/report_sample.html') # Open json sample and get only the payload part sample_json_payload = json.loads(get_file_content(pialertPath + '/back/webhook_json_sample.json'))[0]["body"]["attachments"][0]["text"] diff --git a/back/report_sample_2.html b/back/report_sample.html similarity index 100% rename from back/report_sample_2.html rename to back/report_sample.html diff --git a/back/report_sample_1.txt b/back/report_sample.txt similarity index 100% rename from back/report_sample_1.txt rename to back/report_sample.txt diff --git a/docker-compose.yml b/docker-compose.yml index 2627b339..7ffc77ab 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,13 +7,13 @@ services: network_mode: "host" restart: unless-stopped volumes: - - ${APP_DATA_LOCATION}/pialert/config:/home/pi/pialert/config + - ${APP_DATA_LOCATION}/pialert/config2:/home/pi/pialert/config # - ${APP_DATA_LOCATION}/pialert/db/pialert.db:/home/pi/pialert/db/pialert.db - ${APP_DATA_LOCATION}/pialert/db2:/home/pi/pialert/db # (optional) useful for debugging if you have issues setting up the container - ${LOGS_LOCATION}:/home/pi/pialert/front/log # DELETE START anyone trying to use this file: comment out / delete BELOW lines, they are only for development purposes - - ${DEV_LOCATION}/back:/home/pi/pialert/back + - ${DEV_LOCATION}/back/pialert.py:/home/pi/pialert/back/pialert.py - ${DEV_LOCATION}/pholus:/home/pi/pialert/pholus - ${DEV_LOCATION}/dockerfiles:/home/pi/pialert/dockerfiles - ${APP_DATA_LOCATION}/pialert/php.ini:/etc/php/7.4/fpm/php.ini diff --git a/docs/report_sample_1.html b/docs/report_sample_1.html deleted file mode 100755 index 5d4f7dda..00000000 --- a/docs/report_sample_1.html +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Pi.Alert Report -
- - - - - - -
Report Date: 2021-01-01 08:00 Scan Cycle: Internet Server: pi4
-
- -

Internet:

- - - - - - - - - - - - - - - - -
Event Type Datetime IP Additional Info
Internet IP Changed 2021-01-01 08:00:00 1.1.1.0 Previous Internet IP: 1.1.0.0
- -
- -
- - - - - - -
Puche 2021 Pi.Alert 2.50   /   2021-01-01 GNU GPLv3
-
- - -