diff --git a/docker-compose.yml b/docker-compose.yml index b363fe78..709dbe90 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_dev/config:/home/pi/pialert/config - - ${APP_DATA_LOCATION}/pialert/config:/home/pi/pialert/config - # - ${APP_DATA_LOCATION}/pialert/db/pialert.db:/home/pi/pialert/db/pialert.db - # - ${APP_DATA_LOCATION}/pialert_dev/db:/home/pi/pialert/db - - ${APP_DATA_LOCATION}/pialert/db:/home/pi/pialert/db + - ${APP_DATA_LOCATION}/pialert_dev/config:/home/pi/pialert/config + # - ${APP_DATA_LOCATION}/pialert/config:/home/pi/pialert/config + - ${APP_DATA_LOCATION}/pialert_dev/db:/home/pi/pialert/db + # - ${APP_DATA_LOCATION}/pialert/db:/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 - ${APP_DATA_LOCATION}/pialert/dhcp_samples/dhcp1.leases:/mnt/dhcp1.leases - ${APP_DATA_LOCATION}/pialert/dhcp_samples/dhcp2.leases:/mnt/dhcp2.leases @@ -42,6 +42,7 @@ services: - ${DEV_LOCATION}/front/settings.php:/home/pi/pialert/front/settings.php - ${DEV_LOCATION}/front/plugins:/home/pi/pialert/front/plugins # DELETE END anyone trying to use this file: comment out / delete ABOVE lines, they are only for development purposes + # --------------------------------------------------------------------------- environment: - TZ=${TZ} - PORT=${PORT} diff --git a/pialert/networkscan.py b/pialert/networkscan.py index 54f818c0..bf3fa658 100755 --- a/pialert/networkscan.py +++ b/pialert/networkscan.py @@ -57,7 +57,7 @@ def scan_network (db): -def process_scan (db, arpscan_devices = conf.arpscan_devices ): +def process_scan (db, arpscan_devices): # Query ScanCycle properties diff --git a/pialert/reporting.py b/pialert/reporting.py index 7a078dc0..53ab1bd6 100755 --- a/pialert/reporting.py +++ b/pialert/reporting.py @@ -89,7 +89,7 @@ def construct_notifications(db, sqlQuery, tableTitle, skipText = False, supplied -def send_notifications (db, INCLUDED_SECTIONS = conf.INCLUDED_SECTIONS): +def send_notifications (db): sql = db.sql #TO-DO global mail_text, mail_html, json_final, changedPorts_json_struc, partial_html, partial_txt, partial_json @@ -223,9 +223,9 @@ def send_notifications (db, INCLUDED_SECTIONS = conf.INCLUDED_SECTIONS): portsTxt = "Ports \n---------\n Ports changed! Check PiAlert for details!\n" mail_text = mail_text.replace ('', portsTxt ) - mylog('verbose', ['[Notification] Ports sections done.']) + mylog('verbose', ['[Notification] Ports sections done.']) - if 'plugins' in INCLUDED_SECTIONS and conf.ENABLE_PLUGINS: + if 'plugins' in conf.INCLUDED_SECTIONS and conf.ENABLE_PLUGINS: # Compose Plugins Section sqlQuery = """SELECT Plugin, Object_PrimaryId, Object_SecondaryId, DateTimeChanged, Watched_Value1, Watched_Value2, Watched_Value3, Watched_Value4, Status from Plugins_Events"""