Skip to content

Commit

Permalink
v2.55
Browse files Browse the repository at this point in the history
  • Loading branch information
pucherot committed Jan 14, 2021
1 parent dbe0a05 commit 0e3f14d
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 29 deletions.
50 changes: 26 additions & 24 deletions back/pialert.conf
Original file line number Diff line number Diff line change
@@ -1,29 +1,31 @@
VERSION = '2.54'
VERSION_YEAR = '2021'
VERSION_DATE = '2021-01-13'
VERSION = '2.55'
VERSION_YEAR = '2021'
VERSION_DATE = '2021-01-13'

DB_PATH = '/home/pi/pialert/db/pialert.db'
LOG_PATH = '/home/pi/pialert/log'
VENDORS_DB = '/usr/share/arp-scan/ieee-oui.txt'
PA_FRONT_URL = 'http://pi.alert/deviceDetails.php?mac='
PRINT_LOG = False
DB_PATH = '/home/pi/pialert/db/pialert.db'
LOG_PATH = '/home/pi/pialert/log'
VENDORS_DB = '/usr/share/arp-scan/ieee-oui.txt'
PA_FRONT_URL = 'http://pi.alert/deviceDetails.php?mac='
PRINT_LOG = False

SMTP_SERVER = 'smtp.gmail.com'
SMTP_PORT = 587
SMTP_USER = '[email protected]'
SMTP_PASS = 'password'
SMTP_SERVER = 'smtp.gmail.com'
SMTP_PORT = 587
SMTP_USER = '[email protected]'
SMTP_PASS = 'password'

REPORT_MAIL = False
REPORT_FROM = 'Pi.Alert <' + SMTP_USER +'>'
REPORT_TO = '[email protected]'
REPORT_MAIL = False
REPORT_FROM = 'Pi.Alert <' + SMTP_USER +'>'
REPORT_TO = '[email protected]'

DDNS_ACTIVE = False
DDNS_DOMAIN = 'your_domain.freeddns.org'
DDNS_USER = 'dynu_user'
DDNS_PASSWORD = 'A0000000B0000000C0000000D0000000'
DDNS_UPDATE_URL = 'https://api.dynu.com/nic/update?'
# QUERY_MYIP_SERVER = 'https://diagnostic.opendns.com/myip'
QUERY_MYIP_SERVER = 'http://ipv4.icanhazip.com'
DDNS_ACTIVE = False
DDNS_DOMAIN = 'your_domain.freeddns.org'
DDNS_USER = 'dynu_user'
DDNS_PASSWORD = 'A0000000B0000000C0000000D0000000'
DDNS_UPDATE_URL = 'https://api.dynu.com/nic/update?'

PIHOLE_ACTIVE = False
PIHOLE_DB = '/etc/pihole/pihole-FTL.db'
DHCP_ACTIVE = False
DHCP_LEASES = '/etc/pihole/dhcp.leases'
PIHOLE_ACTIVE = False
PIHOLE_DB = '/etc/pihole/pihole-FTL.db'
DHCP_ACTIVE = False
DHCP_LEASES = '/etc/pihole/dhcp.leases'
6 changes: 4 additions & 2 deletions back/pialert.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
# Pi.Alert v2.54 / 2021-01-13
# Pi.Alert v2.55 / 2021-01-13
# Puche 2020
# GNU GPLv3

Expand Down Expand Up @@ -159,8 +159,10 @@ def get_internet_IP ():
# dig_args = ['dig', '+short', 'myip.opendns.com',
# '@resolver1.opendns.com']

# BUGFIX #12 - Query IPv4 address (not IPv6)
# Using 'curl' instead of 'dig'
curl_args = ['curl', '-s', 'https://diagnostic.opendns.com/myip']
# curl_args = ['curl', '-s', 'https://diagnostic.opendns.com/myip']
curl_args = ['curl', '-s', QUERY_MYIP_SERVER]
curl_output = subprocess.check_output (curl_args, universal_newlines=True)

# Check result is an IP
Expand Down
Binary file modified db/pialert.db
Binary file not shown.
2 changes: 1 addition & 1 deletion front/php/templates/footer.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
&copy; 2021 Puche
<!-- To the right -->
<div class="pull-right no-hidden-xs">
Pi.alert&nbsp&nbsp2.54&nbsp&nbsp<small>(2021-01-13)</small>
Pi.alert&nbsp&nbsp2.55&nbsp&nbsp<small>(2021-01-13)</small>
</div>
</footer>
Expand Down
4 changes: 2 additions & 2 deletions install/create_tar.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#
PIALERT_VERSION=2.54
PIALERT_VERSION=2.55
PIALERT_DEV_PATH=/media/WD_4TB/dev

cd $PIALERT_DEV_PATH

tar tvf pialert/install/pialert_$PIALERT_VERSION.tar | wc -l
tar tvf pialert/install/pialert_latest.tar | wc -l
rm pialert/install/pialert_*.tar

tar cvf pialert/install/pialert_$PIALERT_VERSION.tar --exclude="pialert/install" --exclude="pialert/.git" pialert | wc -l
Expand Down
Binary file not shown.
Binary file modified install/pialert_latest.tar
Binary file not shown.

0 comments on commit 0e3f14d

Please sign in to comment.