This commit is contained in:
pucherot
2021-01-14 12:45:11 +01:00
parent 2cd0e7a796
commit 121a378259
6 changed files with 33 additions and 29 deletions

View File

@@ -1,4 +1,4 @@
VERSION = '2.54' VERSION = '2.55'
VERSION_YEAR = '2021' VERSION_YEAR = '2021'
VERSION_DATE = '2021-01-13' VERSION_DATE = '2021-01-13'
@@ -17,6 +17,8 @@ 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'
# QUERY_MYIP_SERVER = 'https://diagnostic.opendns.com/myip'
QUERY_MYIP_SERVER = 'http://ipv4.icanhazip.com'
DDNS_ACTIVE = False DDNS_ACTIVE = False
DDNS_DOMAIN = 'your_domain.freeddns.org' DDNS_DOMAIN = 'your_domain.freeddns.org'
DDNS_USER = 'dynu_user' DDNS_USER = 'dynu_user'

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

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.