cphipps/NetAlertX
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

support for Gotify from https://github.com/Haecky/Pi.Alert-TLS.On-Off

Browse Source 
merge Commit b5cd865a27

merge Commit 4e61e2ee45
This commit is contained in:
leiweibau
2022-07-22 21:43:27 +02:00
parent fec58bf028
commit f372529cdb
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
back/pialert.py
View File

@@ -458,7 +458,7 @@ def execute_arpscan (pRetries):
# arp-scan for larger Networks like /16 # arp-scan for larger Networks like /16
# otherwise the system starts multiple processes. the 15min cronjob isn't necessary. # otherwise the system starts multiple processes. the 15min cronjob isn't necessary.
# the scan is about 4min on a /16 network # the scan is about 4min on a /16 network
arpscan_args = ['sudo', 'arp-scan', '--ignoredups', '--bandwidth=512k', '--retry=2', SCAN_SUBNETS] arpscan_args = ['sudo', 'arp-scan', '--ignoredups', '--bandwidth=512k', '--retry=3', SCAN_SUBNETS]
# Default arp-scan # Default arp-scan
# arpscan_args = ['sudo', 'arp-scan', SCAN_SUBNETS, '--ignoredups', '--retry=' + str(pRetries)] # arpscan_args = ['sudo', 'arp-scan', SCAN_SUBNETS, '--ignoredups', '--retry=' + str(pRetries)]
@@ -1223,11 +1223,11 @@ def email_reporting ():
mail_text = mail_text.replace ('<SERVER_NAME>', socket.gethostname() ) mail_text = mail_text.replace ('<SERVER_NAME>', socket.gethostname() )
mail_html = mail_html.replace ('<SERVER_NAME>', socket.gethostname() ) mail_html = mail_html.replace ('<SERVER_NAME>', socket.gethostname() )
mail_text = mail_text.replace ('<PIALERT_VERSION>', VERSION ) # mail_text = mail_text.replace ('<PIALERT_VERSION>', VERSION )
mail_html = mail_html.replace ('<PIALERT_VERSION>', VERSION ) # mail_html = mail_html.replace ('<PIALERT_VERSION>', VERSION )
mail_text = mail_text.replace ('<PIALERT_VERSION_DATE>', VERSION_DATE ) # mail_text = mail_text.replace ('<PIALERT_VERSION_DATE>', VERSION_DATE )
mail_html = mail_html.replace ('<PIALERT_VERSION_DATE>', VERSION_DATE ) # mail_html = mail_html.replace ('<PIALERT_VERSION_DATE>', VERSION_DATE )
# mail_text = mail_text.replace ('<PIALERT_YEAR>', VERSION_YEAR ) # mail_text = mail_text.replace ('<PIALERT_YEAR>', VERSION_YEAR )
# mail_html = mail_html.replace ('<PIALERT_YEAR>', VERSION_YEAR ) # mail_html = mail_html.replace ('<PIALERT_YEAR>', VERSION_YEAR )
@@ -1474,12 +1474,22 @@ def send_email (pText, pHTML):
# Send mail # Send mail
smtp_connection = smtplib.SMTP (SMTP_SERVER, SMTP_PORT) smtp_connection = smtplib.SMTP (SMTP_SERVER, SMTP_PORT)
smtp_connection.ehlo() smtp_connection.ehlo()
smtp_connection.starttls() # smtp_connection.starttls()
smtp_connection.ehlo() # smtp_connection.ehlo()
smtp_connection.login (SMTP_USER, SMTP_PASS) # smtp_connection.login (SMTP_USER, SMTP_PASS)
if not SafeParseGlobalBool("SMTP_SKIP_TLS"):
smtp_connection.starttls()
smtp_connection.ehlo()
if not SafeParseGlobalBool("SMTP_SKIP_LOGIN"):
smtp_connection.login (SMTP_USER, SMTP_PASS)
smtp_connection.sendmail (REPORT_FROM, REPORT_TO, msg.as_string()) smtp_connection.sendmail (REPORT_FROM, REPORT_TO, msg.as_string())
smtp_connection.quit() smtp_connection.quit()
#-------------------------------------------------------------------------------
def SafeParseGlobalBool(boolVariable):
if boolVariable in globals():
return eval(boolVariable)
return False
#=============================================================================== #===============================================================================
# DB # DB

2
config/pialert.conf
View File

@@ -18,6 +18,8 @@ SMTP_SERVER = 'smtp.gmail.com'
SMTP_PORT = 587 SMTP_PORT = 587
SMTP_USER = 'user@gmail.com' SMTP_USER = 'user@gmail.com'
SMTP_PASS = 'password' SMTP_PASS = 'password'
SMTP_SKIP_TLS = False
SMTP_SKIP_LOGIN = False
REPORT_MAIL = False REPORT_MAIL = False
REPORT_FROM = 'Pi.Alert <' + SMTP_USER +'>' REPORT_FROM = 'Pi.Alert <' + SMTP_USER +'>'