This commit is contained in:
pucherot
2021-01-14 12:45:11 +01:00
parent dbe0a0548b
commit 0e3f14dd9d
7 changed files with 33 additions and 29 deletions

View File

@@ -1,29 +1,31 @@
VERSION = '2.54' VERSION = '2.55'
VERSION_YEAR = '2021' VERSION_YEAR = '2021'
VERSION_DATE = '2021-01-13' VERSION_DATE = '2021-01-13'
DB_PATH = '/home/pi/pialert/db/pialert.db' DB_PATH = '/home/pi/pialert/db/pialert.db'
LOG_PATH = '/home/pi/pialert/log' LOG_PATH = '/home/pi/pialert/log'
VENDORS_DB = '/usr/share/arp-scan/ieee-oui.txt' VENDORS_DB = '/usr/share/arp-scan/ieee-oui.txt'
PA_FRONT_URL = 'http://pi.alert/deviceDetails.php?mac=' PA_FRONT_URL = 'http://pi.alert/deviceDetails.php?mac='
PRINT_LOG = False PRINT_LOG = False
SMTP_SERVER = 'smtp.gmail.com' 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'
REPORT_MAIL = False REPORT_MAIL = False
REPORT_FROM = 'Pi.Alert <' + SMTP_USER +'>' REPORT_FROM = 'Pi.Alert <' + SMTP_USER +'>'
REPORT_TO = 'user@gmail.com' REPORT_TO = 'user@gmail.com'
DDNS_ACTIVE = False # QUERY_MYIP_SERVER = 'https://diagnostic.opendns.com/myip'
DDNS_DOMAIN = 'your_domain.freeddns.org' QUERY_MYIP_SERVER = 'http://ipv4.icanhazip.com'
DDNS_USER = 'dynu_user' DDNS_ACTIVE = False
DDNS_PASSWORD = 'A0000000B0000000C0000000D0000000' DDNS_DOMAIN = 'your_domain.freeddns.org'
DDNS_UPDATE_URL = 'https://api.dynu.com/nic/update?' DDNS_USER = 'dynu_user'
DDNS_PASSWORD = 'A0000000B0000000C0000000D0000000'
DDNS_UPDATE_URL = 'https://api.dynu.com/nic/update?'
PIHOLE_ACTIVE = False PIHOLE_ACTIVE = False
PIHOLE_DB = '/etc/pihole/pihole-FTL.db' PIHOLE_DB = '/etc/pihole/pihole-FTL.db'
DHCP_ACTIVE = False DHCP_ACTIVE = False
DHCP_LEASES = '/etc/pihole/dhcp.leases' DHCP_LEASES = '/etc/pihole/dhcp.leases'

View File

@@ -1,6 +1,6 @@
#!/usr/bin/env python #!/usr/bin/env python
# #
# Pi.Alert v2.54 / 2021-01-13 # Pi.Alert v2.55 / 2021-01-13
# Puche 2020 # Puche 2020
# GNU GPLv3 # GNU GPLv3
@@ -159,8 +159,10 @@ def get_internet_IP ():
# dig_args = ['dig', '+short', 'myip.opendns.com', # dig_args = ['dig', '+short', 'myip.opendns.com',
# '@resolver1.opendns.com'] # '@resolver1.opendns.com']
# BUGFIX #12 - Query IPv4 address (not IPv6)
# Using 'curl' instead of 'dig' # 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) curl_output = subprocess.check_output (curl_args, universal_newlines=True)
# Check result is an IP # Check result is an IP

Binary file not shown.

View File

@@ -4,7 +4,7 @@
&copy; 2021 Puche &copy; 2021 Puche
<!-- To the right --> <!-- To the right -->
<div class="pull-right no-hidden-xs"> <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> </div>
</footer> </footer>

View File

@@ -1,10 +1,10 @@
# #
PIALERT_VERSION=2.54 PIALERT_VERSION=2.55
PIALERT_DEV_PATH=/media/WD_4TB/dev PIALERT_DEV_PATH=/media/WD_4TB/dev
cd $PIALERT_DEV_PATH 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 rm pialert/install/pialert_*.tar
tar cvf pialert/install/pialert_$PIALERT_VERSION.tar --exclude="pialert/install" --exclude="pialert/.git" pialert | wc -l tar cvf pialert/install/pialert_$PIALERT_VERSION.tar --exclude="pialert/install" --exclude="pialert/.git" pialert | wc -l

Binary file not shown.