Update INSTALL.md

BUGFIX #23

README.md

@@ -36,16 +36,18 @@ Up to three scanning methods are used:
 ## Components
 The system consists of two parts:
 
-- **Back**, in charge of:
+### Back
+In charge of:
   - Scan the network searching connected devices using the scanning methods
-        described
+    described
   - Store the information in the DB
   - Report the changes detected by e-mail
 
   | ![Report 1][report1] | ![Report 2][report2] |
   | -------------------- | -------------------- |
 
-- **Front**, a web frontal that allows:
+### Front
+A web frontal that allows:
   - Manage the devices inventory and the characteristics
   - Display in a visual way all the information collected by the back
     - Sessions
@@ -68,7 +70,7 @@ The system consists of two parts:
 Initially designed to run on a Raspberry PI, probably it can run on many other
 Linux distributions.
 
-  - [Installation instructions](docs/INSTALL.md)
+  - [Installation Guide](docs/INSTALL.md)
 
 
 ## Device Management
@@ -77,9 +79,12 @@ Linux distributions.
   - [Device Management instructions](docs/DEVICE_MANAGEMENT.md)
 
 
+
 ## Other useful info
 <!--- --------------------------------------------------------------------- --->
 
+### [Versions History](docs/VERSIONS_HISTORY.md)
+
 ### Powered by:
   | Product      | Objetive                               |
   | ------------ | -------------------------------------- |
@@ -97,7 +102,7 @@ Linux distributions.
 
 ### License
   GPL 3.0
-  [Read more here](docs/LICENSE.txt)
+  [Read more here](LICENSE.txt)
 
 ### Contact
   pi.alert.application@gmail.com

back/pialert.conf

@@ -1,29 +0,0 @@
-VERSION         = '2.51'
-VERSION_YEAR    = '2021'
-VERSION_DATE    = '2021-01-11'
-
-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       = 'user@gmail.com'
-SMTP_PASS       = 'password'
-
-REPORT_MAIL     = False
-REPORT_FROM     = 'Pi.Alert <' + SMTP_USER +'>'
-REPORT_TO       = 'user@gmail.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'

back/pialert.cron

@@ -1,7 +0,0 @@
-#
-# Pi.Alert cron
-#
-0 3 * * 1      python ~/pialert/back/pialert.py update_vendors >~/pialert/log/pialert.vendors.log  2>&1
-*/1 * * * *    python ~/pialert/back/pialert.py internet_IP    >~/pialert/log/pialert.IP.log       2>&1
-*/5 * * * *    python ~/pialert/back/pialert.py 1              >~/pialert/log/pialert.1.log        2>&1
-*/15 * * * *   python ~/pialert/back/pialert.py 15             >~/pialert/log/pialert.15.log       2>&1

back/pialert.py

@@ -1,8 +1,13 @@
 #!/usr/bin/env python
 #
-# Pi.Alert v2.51  /  2021-01-11
+#-------------------------------------------------------------------------------
-# Puche 2020
+#  Pi.Alert  v2.60  /  2021-01-20
-# GNU GPLv3
+#  Open Source Network Guard / WIFI & LAN intrusion detector 
+#
+#  pialert.py - Back module. Network scanner
+#-------------------------------------------------------------------------------
+#  Puche 2021        pi.alert.application@gmail.com        GNU GPLv3
+#-------------------------------------------------------------------------------
 
 
 #===============================================================================
@@ -27,8 +32,15 @@ import csv
 #===============================================================================
 # CONFIG CONSTANTS
 #===============================================================================
-PIALERT_PATH = os.path.dirname(os.path.abspath(__file__))
+PIALERT_BACK_PATH = os.path.dirname(os.path.abspath(__file__))
-execfile (PIALERT_PATH + "/pialert.conf")
+PIALERT_PATH = PIALERT_BACK_PATH + "/.."
+
+if (sys.version_info > (3,0)):
+    exec(open(PIALERT_PATH + "/config/version.conf").read())
+    exec(open(PIALERT_PATH + "/config/pialert.conf").read())
+else:
+    execfile (PIALERT_PATH + "/config/version.conf")
+    execfile (PIALERT_PATH + "/config/pialert.conf")
 
 
 #===============================================================================
@@ -46,7 +58,6 @@ def main ():
     print ('---------------------------------------------------------')
 
     # Initialize global variables
-    # PIALERT_PATH   = os.path.dirname(os.path.abspath(__file__))
     log_timestamp  = datetime.datetime.now()
 
     # DB
@@ -156,8 +167,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
@@ -244,7 +257,7 @@ def update_devices_MAC_vendors ():
 
     # Update vendors DB (iab oui)
     print ('\nUpdating vendors DB (iab & oui)...')
-    update_args = ['sh', PIALERT_PATH + '/vendors_db_update.sh']
+    update_args = ['sh', PIALERT_BACK_PATH + '/vendors_db_update.sh']
     update_output = subprocess.check_output (update_args)
     # DEBUG
         # update_args = ['./vendors_db_update.sh']
@@ -292,9 +305,12 @@ def update_devices_MAC_vendors ():
 #-------------------------------------------------------------------------------
 def query_MAC_vendor (pMAC):
     try :
+        # BUGFIX #6 - Fix pMAC parameter as numbers
+        pMACstr = str(pMAC)
+        
         # Check MAC parameter
-        mac = pMAC.replace (':','')
+        mac = pMACstr.replace (':','')
-        if len(pMAC) != 17 or len(mac) != 12 :
+        if len(pMACstr) != 17 or len(mac) != 12 :
             return -2
 
         # Search vendor in HW Vendors DB
@@ -447,8 +463,28 @@ def execute_arpscan (pRetries):
     devices_list = [device.groupdict()
         for device in re.finditer (re_pattern, arpscan_output)]
 
+    # Bugfix #5 - Delete duplicated MAC's with different IP's
+    # TEST - Force duplicated device
+        # devices_list.append(devices_list[0])
+    # Delete duplicate MAC
+    unique_mac = [] 
+    unique_devices = [] 
+
+    for device in devices_list :
+        if device['mac'] not in unique_mac: 
+            unique_mac.append(device['mac'])
+            unique_devices.append(device)
+
+    # DEBUG
+        # print (devices_list)
+        # print (unique_mac)
+        # print (unique_devices)
+        # print (len(devices_list))
+        # print (len(unique_mac))
+        # print (len(unique_devices))
+
     # return list
-    return devices_list
+    return unique_devices
 
 #-------------------------------------------------------------------------------
 def copy_pihole_network ():
@@ -645,11 +681,12 @@ def create_new_devices ():
 
     # Pi-hole - Insert events for new devices
     # NOT STRICYLY NECESARY (Devices can be created through Current_Scan)
+    # Bugfix #2 - Pi-hole devices w/o IP
     print_log ('New devices - 3 Pi-hole Events')
     sql.execute ("""INSERT INTO Events (eve_MAC, eve_IP, eve_DateTime,
                         eve_EventType, eve_AdditionalInfo,
                         eve_PendingAlertEmail)
-                    SELECT PH_MAC, PH_IP, ?, 'New Device',
+                    SELECT PH_MAC, IFNULL (PH_IP,'-'), ?, 'New Device',
                         '(Pi-Hole) ' || PH_Vendor, 1
                     FROM PiHole_Network
                     WHERE NOT EXISTS (SELECT 1 FROM Devices
@@ -657,13 +694,14 @@ def create_new_devices ():
                     (startTime, ) ) 
 
     # Pi-hole - Create New Devices
+    # Bugfix #2 - Pi-hole devices w/o IP
     print_log ('New devices - 4 Pi-hole Create devices')
     sql.execute ("""INSERT INTO Devices (dev_MAC, dev_name, dev_Vendor,
                         dev_LastIP, dev_FirstConnection, dev_LastConnection,
                         dev_ScanCycle, dev_AlertEvents, dev_AlertDeviceDown,
                         dev_PresentLastScan)
-                    SELECT PH_MAC, PH_Name, PH_Vendor, PH_IP, ?, ?,
+                    SELECT PH_MAC, PH_Name, PH_Vendor, IFNULL (PH_IP,'-'),
-                        1, 1, 0, 1
+                        ?, ?, 1, 1, 0, 1
                     FROM PiHole_Network
                     WHERE NOT EXISTS (SELECT 1 FROM Devices
                                       WHERE dev_MAC = PH_MAC) """,
@@ -682,16 +720,39 @@ def create_new_devices ():
 
     # DHCP Leases - Create New Devices
     print_log ('New devices - 6 DHCP Leases Create devices')
-    sql.execute ("""INSERT INTO Devices (dev_MAC, dev_name, dev_Vendor,
+    # BUGFIX #23 - Duplicated MAC in DHCP.Leases
-                        dev_LastIP, dev_FirstConnection, dev_LastConnection,
+    # TEST - Force Duplicated MAC
+        # sql.execute ("""INSERT INTO DHCP_Leases VALUES
+        #                 (1610700000, 'TEST1', '10.10.10.1', 'Test 1', '*')""")
+        # sql.execute ("""INSERT INTO DHCP_Leases VALUES
+        #                 (1610700000, 'TEST2', '10.10.10.2', 'Test 2', '*')""")
+    sql.execute ("""INSERT INTO Devices (dev_MAC, dev_name, dev_LastIP, 
+                        dev_Vendor, dev_FirstConnection, dev_LastConnection,
                         dev_ScanCycle, dev_AlertEvents, dev_AlertDeviceDown,
                         dev_PresentLastScan)
-                    SELECT DHCP_MAC, DHCP_Name, '(unknown)', DHCP_IP, ?, ?,
+                    SELECT DISTINCT DHCP_MAC,
-                        1, 1, 0, 1
+                        (SELECT DHCP_Name FROM DHCP_Leases AS D2
-                    FROM DHCP_Leases
+                         WHERE D2.DHCP_MAC = D1.DHCP_MAC
+                         ORDER BY DHCP_DateTime DESC LIMIT 1),
+                        (SELECT DHCP_IP FROM DHCP_Leases AS D2
+                         WHERE D2.DHCP_MAC = D1.DHCP_MAC
+                         ORDER BY DHCP_DateTime DESC LIMIT 1),
+                        '(unknown)', ?, ?, 1, 1, 0, 1
+                    FROM DHCP_Leases AS D1
                     WHERE NOT EXISTS (SELECT 1 FROM Devices
                                       WHERE dev_MAC = DHCP_MAC) """,
                     (startTime, startTime) ) 
+
+    # sql.execute ("""INSERT INTO Devices (dev_MAC, dev_name, dev_Vendor,
+    #                     dev_LastIP, dev_FirstConnection, dev_LastConnection,
+    #                     dev_ScanCycle, dev_AlertEvents, dev_AlertDeviceDown,
+    #                     dev_PresentLastScan)
+    #                 SELECT DHCP_MAC, DHCP_Name, '(unknown)', DHCP_IP, ?, ?,
+    #                     1, 1, 0, 1
+    #                 FROM DHCP_Leases
+    #                 WHERE NOT EXISTS (SELECT 1 FROM Devices
+    #                                   WHERE dev_MAC = DHCP_MAC) """,
+    #                 (startTime, startTime) ) 
     print_log ('New Devices end')
 
 #-------------------------------------------------------------------------------
@@ -991,12 +1052,12 @@ def email_reporting ():
     openDB()
 
     # Open text Template
-    template_file = open(PIALERT_PATH + '/report_template.txt', 'r') 
+    template_file = open(PIALERT_BACK_PATH + '/report_template.txt', 'r') 
     mail_text = template_file.read() 
     template_file.close() 
 
     # Open html Template
-    template_file = open(PIALERT_PATH + '/report_template.html', 'r') 
+    template_file = open(PIALERT_BACK_PATH + '/report_template.html', 'r') 
     mail_html = template_file.read() 
     template_file.close() 
 
@@ -1041,7 +1102,7 @@ def email_reporting ():
             eventAlert['eve_EventType'], eventAlert['eve_DateTime'],
             eventAlert['eve_IP'], eventAlert['eve_AdditionalInfo'])
         mail_html_Internet += html_line_template.format (
-            PA_FRONT_URL, eventAlert['eve_MAC'],
+            REPORT_DEVICE_URL, eventAlert['eve_MAC'],
             eventAlert['eve_EventType'], eventAlert['eve_DateTime'],
             eventAlert['eve_IP'], eventAlert['eve_AdditionalInfo'])
 
@@ -1069,7 +1130,7 @@ def email_reporting ():
             eventAlert['eve_IP'], eventAlert['dev_Name'],
             eventAlert['eve_AdditionalInfo'])
         mail_html_new_devices += html_line_template.format (
-            PA_FRONT_URL, eventAlert['eve_MAC'], eventAlert['eve_MAC'],
+            REPORT_DEVICE_URL, eventAlert['eve_MAC'], eventAlert['eve_MAC'],
             eventAlert['eve_DateTime'], eventAlert['eve_IP'],
             eventAlert['dev_Name'], eventAlert['eve_AdditionalInfo'])
 
@@ -1096,7 +1157,7 @@ def email_reporting ():
             eventAlert['eve_MAC'], eventAlert['eve_DateTime'],
             eventAlert['eve_IP'], eventAlert['dev_Name'])
         mail_html_devices_down += html_line_template.format (
-            PA_FRONT_URL, eventAlert['eve_MAC'], eventAlert['eve_MAC'],
+            REPORT_DEVICE_URL, eventAlert['eve_MAC'], eventAlert['eve_MAC'],
             eventAlert['eve_DateTime'], eventAlert['eve_IP'],
             eventAlert['dev_Name'])
 
@@ -1126,7 +1187,7 @@ def email_reporting ():
             eventAlert['eve_IP'], eventAlert['eve_EventType'],
             eventAlert['dev_Name'], eventAlert['eve_AdditionalInfo'])
         mail_html_events += html_line_template.format (
-            PA_FRONT_URL, eventAlert['eve_MAC'], eventAlert['eve_MAC'],
+            REPORT_DEVICE_URL, eventAlert['eve_MAC'], eventAlert['eve_MAC'],
             eventAlert['eve_DateTime'], eventAlert['eve_IP'],
             eventAlert['eve_EventType'], eventAlert['dev_Name'],
             eventAlert['eve_AdditionalInfo'])
@@ -1208,7 +1269,7 @@ def write_file (pPath, pText):
         file.close() 
     else:
         file = open (pPath, 'w', encoding='utf-8') 
-        file.write (ptext) 
+        file.write (pText) 
         file.close() 
 
 #-------------------------------------------------------------------------------

back/report_template.html

@@ -1,3 +1,12 @@
+<!-- ---------------------------------------------------------------------------
+#  Pi.Alert
+#  Open Source Network Guard / WIFI & LAN intrusion detector 
+#
+#  repot_template.html - Back module. Template to email reporting in HTML format
+#-------------------------------------------------------------------------------
+#  Puche 2021        pi.alert.application@gmail.com        GNU GPLv3
+#--------------------------------------------------------------------------- -->
+
 <html>
 
 <head>
@@ -101,9 +110,9 @@
         <td>
             <table width=100% border=0 bgcolor=#70AD47 cellpadding=5px cellspacing=0 style="border-collapse: collapse; font-size: 12px; font-weight: bold; color:#385723">
                <tr>
-                    <td width=25% style="text-align:Left">   Puche <PIALERT_YEAR></td>
+                    <td width=25% style="text-align:Left"> <span style="display:inline-block; transform: rotate(180deg)">&copy;</span> <PIALERT_YEAR> Puche</td>
-                    <td width=50% style="text-align:center"> Pi.Alert <PIALERT_VERSION> &nbsp; / &nbsp; <PIALERT_VERSION_DATE>  </td>
+                    <td width=50% style="text-align:center"> Pi.Alert <PIALERT_VERSION> &nbsp; &nbsp; (<PIALERT_VERSION_DATE>)  </td>
-                    <td width=25% style="text-align:right">  GNU GPLv3</td>
+                    <td width=25% style="text-align:right"> GNU GPLv3</td>
                 </tr>
             </table>
         </td>

back/report_template.txt

@@ -24,4 +24,4 @@ Events
 <TABLE_EVENTS>
 </SECTION_EVENTS>
 ----------------------------------------------------------------------
-Puche <PIALERT_YEAR>            Pi.Alert <PIALERT_VERSION> / <PIALERT_VERSION_DATE>             GNU GPLv3
+(?) <PIALERT_YEAR> Puche          Pi.Alert <PIALERT_VERSION> (<PIALERT_VERSION_DATE>)           GNU GPLv3

back/vendors_db_update.sh

@@ -1,10 +1,18 @@
 #!/bin/sh
+# ------------------------------------------------------------------------------
+#  Pi.Alert
+#  Open Source Network Guard / WIFI & LAN intrusion detector 
 #
-# Update MAC Vendor DB
+#  vendors_db_update.sh - Back module. IEEE Vendors db update
-#
+# ------------------------------------------------------------------------------
-# /usr/share/arp-scan
+#  Puche 2021        pi.alert.application@gmail.com        GNU GPLv3
-# /usr/share/ieee-data
+# ------------------------------------------------------------------------------
-# /var/lib/ieee-data
+
+# ----------------------------------------------------------------------
+#  Main directories to update:
+#    /usr/share/arp-scan
+#    /usr/share/ieee-data
+#    /var/lib/ieee-data
 # ----------------------------------------------------------------------
 
 

config/pialert.conf

@@ -0,0 +1,37 @@
+#-------------------------------------------------------------------------------
+#  Pi.Alert
+#  Open Source Network Guard / WIFI & LAN intrusion detector 
+#
+#  pialert.conf - Back module. Configuration file
+#-------------------------------------------------------------------------------
+#  Puche 2021        pi.alert.application@gmail.com        GNU GPLv3
+#-------------------------------------------------------------------------------
+
+PIALERT_PATH      = '/home/pi/pialert'
+DB_PATH           = PIALERT_PATH + '/db/pialert.db'
+LOG_PATH          = PIALERT_PATH + '/log'
+VENDORS_DB        = '/usr/share/arp-scan/ieee-oui.txt'
+PRINT_LOG         = False
+
+SMTP_SERVER       = 'smtp.gmail.com'
+SMTP_PORT         = 587
+SMTP_USER         = 'user@gmail.com'
+SMTP_PASS         = 'password'
+
+REPORT_MAIL       = False
+REPORT_FROM       = 'Pi.Alert <' + SMTP_USER +'>'
+REPORT_TO         = 'user@gmail.com'
+REPORT_DEVICE_URL = 'http://pi.alert/deviceDetails.php?mac='
+
+# 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'

config/version.conf

@@ -0,0 +1,3 @@
+VERSION           = '2.60'
+VERSION_YEAR      = '2021'
+VERSION_DATE      = '2021-01-20'

docs/DEVICE_MANAGEMENT.md

@@ -79,7 +79,7 @@ decides to change the MAC).
   
 ### License
   GPL 3.0
-  [Read more here](LICENSE.txt)
+  [Read more here](../LICENSE.txt)
 
 ### Contact
   pi.alert.application@gmail.com

docs/INSTALL.md

@@ -1,9 +1,9 @@
-# Pi.Alert Installation
+# Pi.Alert Installation Guide
 <!--- --------------------------------------------------------------------- --->
 Initially designed to run on a Raspberry PI, probably it can run on many other
 Linux distributions.
 
-Stimated time: 20'
+Estimated time: 20'
 
 ### Dependencies
   | Dependency | Comments                                                 |
@@ -17,174 +17,272 @@ Stimated time: 20'
 # Installation process
 <!--- --------------------------------------------------------------------- --->
 
+
 ## Raspberry Setup
 <!--- --------------------------------------------------------------------- --->
-1 - Install 'Raspberry Pi OS'
+1.1 - Install 'Raspberry Pi OS'
   - Instructions https://www.raspberrypi.org/documentation/installation/installing-images/
   - *Lite version (without Descktop) is enough for Pi.Alert*
 
-2 - Activate ssh
+1.2 - Activate ssh
   - Create a empty file with name 'ssh' in the boot partition of the SD
 
-3 - Start the raspberry
+1.3 - Start the raspberry
 
-4 - Login to the system with pi user
+1.4 - Login to the system with pi user
-```
+  ```
   user: pi
   password: raspberry
-```
+  ```
 
-5 - Change de default password of pi user
+1.5 - Change the default password of pi user
-```
+  ```
   passwd
-```
+  ```
 
-6 - Setup the basic configuration
+1.6 - Setup the basic configuration
-```
+  ```
   sudo raspi-config
-```
+  ```
 
-7 - Optionally, configure a static IP in raspi-config
+1.7 - Optionally, configure a static IP in raspi-config
 
-8 - Update the OS
+1.8 - Update the OS
-```
+  ```
   sudo apt-get update
   sudo apt-get upgrade
-  sudo reboot
+  sudo shutdown -r now
-```
+  ```
 
-## Pi-hole Setup
+
+## Pi-hole Setup (optional)
 <!--- --------------------------------------------------------------------- --->
-1- Links & Doc
+2.1 - Links & Doc
   - https://pi-hole.net/
   - https://github.com/pi-hole/pi-hole
   - https://github.com/pi-hole/pi-hole/#one-step-automated-install
 
-2 - Login to the system with pi user
+2.2 - Login to the system with pi user
 
-3 - Install Pi-hole
+2.3 - Install Pi-hole
-```
+  ```
-    curl -sSL https://install.pi-hole.net | bash
+  curl -sSL https://install.pi-hole.net | bash
-```
+  ```
-  - Mark "Install web admin interface"
+  - Select "Install web admin interface"
-  - Mark "Install web server lighttpd"
+  - Select "Install web server lighttpd"
 
-4 - Configure Pi-hole admin password
+2.4 - Configure Pi-hole admin password
-```
+  ```
-    pihole -a -p PASSWORD
+  pihole -a -p PASSWORD
-```
+  ```
 
-5 - Connect to web admin panel
+2.5 - Connect to web admin panel
+  ```
+  hostname -I
+  ```
   - http://192.168.1.x/admin/
-  - (*replace the 192.168.1.x with your Raspberry IP*)
+  - (*replace 192.168.1.x with your Raspberry IP*)
 
-6 - Activate DHCP server
+2.6 - Activate DHCP server
-  - Pi-hole -> Settings -> DHCP -> Mark "DHCP server enabled"
+  - Pi-hole admin portal -> Settings -> DHCP -> Mark "DHCP server enabled"
 
-7 - Add pi.alert DNS Record
+2.7 - Add pi.alert DNS Record
-  - Pi-hole -> Local DNS -> DNS Records -> Add new domain /IP
+  ```
+  hostname -I
+  ```
+  - Pi-hole admin portal -> Local DNS -> DNS Records -> Add new domain /IP
     - pi.alert    192.168.1.x
-    - (*replace the 192.168.1.x with your Raspberry IP*)
+    - (*replace 192.168.1.x with your Raspberry IP*)
 
-8 - Deactivate your current DHCP Server (*Normaly at your router or AP*)
+2.8 - Deactivate your current DHCP Server (*Normaly at your router or AP*)
 
-9 - Renew your computer IP to unsure you are using the new DHCP and DNS server
+2.9 - Renew your computer IP to unsure you are using the new DHCP and DNS server
   - Windows: cmd -> ipconfig /renew
   - Linux: shell -> sudo dhclient -r; sudo dhclient
-  - Mac: Apple menu -> System Preferences -> Network -> Select the network ->
+  - Mac: Apple menu -> System Preferences -> Network -> Select the network
-    Advanced -> TCP/IP -> Renew DHCP Lease
+    -> Advanced -> TCP/IP -> Renew DHCP Lease
+
+
+## Lighttpd & PHP
+<!--- --------------------------------------------------------------------- --->
+If you have installed Pi.hole, lighttpd and PHP are already installed and this
+block is not necessary
+
+3.1 - Install lighttpd
+  ```
+  sudo apt-get install lighttpd -y
+  ```
+
+3.2 - If Pi.Alert will be the only site available in this webserver, you can
+  redirect the default server page to pialert subfolder
+  ```
+  sudo mv /var/www/html/index.lighttpd.html /var/www/html/index.lighttpd.html.old
+  sudo ln -s ~/pialert/install/index.html /var/www/html/index.html
+  ```
+
+3.3 - Install PHP
+  ```
+  sudo apt-get install php php-cgi php-fpm php-sqlite3 -y     
+  ```
+
+3.4 - Activate PHP
+  ```
+  sudo lighttpd-enable-mod fastcgi-php
+  sudo /etc/init.d/lighttpd restart
+  ```
+
 
 ## arp-scan & Python
 <!--- --------------------------------------------------------------------- --->
-1 - Install arp-scan utility and test
+4.1 - Install arp-scan utility and test
-```
+  ```
-  sudo apt-get install arp-scan
+  sudo apt-get install arp-scan -y
   sudo arp-scan -l
-```
+  ```
 
-2 - Install Python & packages
+4.2 - Test Python
-```
-  sudo apt-get install python-setuptools
-  sudo apt install python-pip
 
-  pip install netaddr
+  New versions of 'Raspberry Pi OS' includes Python. You can check that 
-  pip install dpkt
+  Python is installed with the command:
-  pip install MacLookup
+  ```
-```
+  python -V
+  ```
 
+  New versions of Ubuntu includes Python 3. You can choose between use `python3`
+  command or to install Python 2 (that includes `python` command).
+  
+  
+  If you prefer to use Python 3, in the next installation block, you must update
+  `pialert.cron` file with the correct command: `python3` instead of `python`.
+  ```
+  python3 -V
+  ```
+
+4.3 - If Python is not installed in your system, you can install it with this
+  command:
+  ```
+  sudo apt-get install python
+  ```
+  Or this one if you prefer Python 3:
+  ```
+  sudo apt-get install python3
+  ```
 
 ## Pi.Alert
 <!--- --------------------------------------------------------------------- --->
-1- Download Pi.Alert and uncmompress
+5.1 - Download Pi.Alert and uncompress
-```
+  ```
-  curl -LO https://github.com/pucherot/Pi.Alert/raw/main/install/pialert_latest.tar
+  cd
+  curl -LO https://github.com/pucherot/Pi.Alert/raw/main/tar/pialert_latest.tar
   tar xvf pialert_latest.tar
   rm pialert_latest.tar
-```
+  ```
 
-2 - Public the front portal
+5.2 - Public the front portal
-```
+  ```
-  sudo ln -s /home/pi/pialert/front /var/www/html/pialert
+  sudo ln -s ~/pialert/front /var/www/html/pialert
-```
+  ```
 
-3 - Update lighttp config
+5.3 - Configure web server redirection
-```
+
-  sudo sh -c "printf '\n\n\$HTTP[\"host\"] == \"pi.alert\" {\n  server.document-root = \"/var/www/html/pialert/\"\n}\n' >> /etc/lighttpd/external.conf"
+  If you have configured your DNS server (Pi.hole or other) to resolve pi.alert
+  with the IP of your raspberry, youy must configure lighttpd to redirect these 
+  requests to the correct pialert web folder
+  ```
+  sudo cp ~/pialert/install/pialert_front.conf /etc/lighttpd/conf-available
+  sudo ln -s ../conf-available/pialert_front.conf /etc/lighttpd/conf-enabled/pialert_front.conf
   sudo /etc/init.d/lighttpd restart
-```
+  ```
 
-4 - If you want to use email reporting with gmail
+5.4 - If you want to use email reporting with gmail
   - Go to your Google Account https://myaccount.google.com/
   - On the left navigation panel, click Security
   - On the bottom of the page, in the Less secure app access panel,
     click Turn on access
   - Click Save button
 
-5 - Config Pialert parameters
+5.5 - Config Pialert parameters
-```
+  ```
-  nano  ~/pialert/back/pialert.conf
+  sed -i "s,'/home/pi/pialert','$HOME/pialert'," ~/pialert/config/pialert.conf          
-```
+  nano  ~/pialert/config/pialert.conf
-  - if you want to use email reporting, configure this parameters
+  ```
-```
+  - If you want to use email reporting, configure this parameters
-  REPORT_MAIL     = True
+    ```ini
-  SMTP_USER       = 'user@gmail.com'
+    REPORT_MAIL     = True
-  SMTP_PASS       = 'password'
+    SMTP_USER       = 'user@gmail.com'
-  REPORT_TO       = 'user@gmail.com'
+    SMTP_PASS       = 'password'
-```
+    REPORT_TO       = 'user@gmail.com'
+    ```
 
-  - if you want to update yout Dynamic DNS, configure this parameters
+  - If you want to update your Dynamic DNS, configure this parameters
-```
+    ```ini
-  DDNS_ACTIVE     = True
+    DDNS_ACTIVE     = True
-  DDNS_DOMAIN     = 'your_domain.freeddns.org'
+    DDNS_DOMAIN     = 'your_domain.freeddns.org'
-  DDNS_USER       = 'dynu_user'
+    DDNS_USER       = 'dynu_user'
-  DDNS_PASSWORD   = 'A0000000B0000000C0000000D0000000'
+    DDNS_PASSWORD   = 'A0000000B0000000C0000000D0000000'
-  DDNS_UPDATE_URL = 'https://api.dynu.com/nic/update?'
+    DDNS_UPDATE_URL = 'https://api.dynu.com/nic/update?'
-```
+    ```
 
-  - if you have installed Pi.hole and DHCP, activate this parameters
+  - If you have installed Pi.hole and DHCP, activate this parameters
-```
+    ```ini
-  PIHOLE_ACTIVE   = True
+    PIHOLE_ACTIVE   = True
-  DHCP_ACTIVE     = True
+    DHCP_ACTIVE     = True
-```
+    ```
 
-6 - Update vendors DB
+5.6 - Update vendors DB
-```
+  ```
   python ~/pialert/back/pialert.py update_vendors
-```
+  ```
+  or
+  ```
+  python3 ~/pialert/back/pialert.py update_vendors
+  ```
 
-7 - Test Pi.Alert Scan
+5.7 - Test Pi.Alert Scan
-```
+  ```
   python ~/pialert/back/pialert.py internet_IP
   python ~/pialert/back/pialert.py 1
-```
+  ```
+  or
+  ```
+  python3 ~/pialert/back/pialert.py internet_IP
+  python3 ~/pialert/back/pialert.py 1
+  ```
 
-8 - Add crontab jobs
+5.8 - Update crontab template with python3
-```
-  (crontab -l 2>/dev/null; cat ~/pialert/back/pialert.cron) | crontab -
-```
 
-9 - Use admin panel to configure the devices
+  If you prefer to use Python 3 (installed in the previous block), you must
+  update `pialert.cron` file with the correct command: `python3` instead of
+  `python`
+  ```
+  sed -i 's/python/python3/g' ~/pialert/install/pialert.cron
+  ```
+
+5.9 - Add crontab jobs
+  ```
+  (crontab -l 2>/dev/null; cat ~/pialert/install/pialert.cron) | crontab -
+  ```
+
+5.10 - Add permissions to the web-server user
+  ```
+  sudo chgrp -R www-data ~/pialert/db
+  chmod -R 770 ~/pialert/db
+  ```
+
+5.11 - Check DNS record for pi.alert (explained in point 2.7 of Pi.hole
+  installation)
+  - Add pi.alert DNS Record
+    ```
+    hostname -I
+    ```
+    - Pi-hole admin portal -> Local DNS -> DNS Records -> Add new domain /IP
+      - pi.alert    192.168.1.x
+      - (*replace 192.168.1.x with your Raspberry IP*)
+
+5.12 - Use admin panel to configure the devices
   - http://pi.alert/
+  - http://192.168.1.x/pialert/
+    - (*replace 192.168.1.x with your Raspberry IP*)
 
 
 ## Device Management
@@ -195,7 +293,7 @@ Stimated time: 20'
 
 ### License
   GPL 3.0
-  [Read more here](LICENSE.txt)
+  [Read more here](../LICENSE.txt)
 
 ### Contact
   pi.alert.application@gmail.com

docs/RAMDOM_MAC.md

@@ -16,12 +16,12 @@ WIFI's**, in this way, Pi.Alert will be able to identify the device, and it
 will not identify it as a new device every so often (every time IOS or Android
 decides to change the MAC).
 
-### IOS
+## IOS
 ![ios][ios]
 
   - [Use private Wi-Fi addresses in iOS 14](https://support.apple.com/en-us/HT211227)
 
-### Android
+## Android
 ![Android][Android]
 
   - [How to Disable MAC Randomization in Android 10](https://support.boingo.com/s/article/How-to-Disable-MAC-Randomization-in-Android-10-Android-Q)
@@ -30,7 +30,7 @@ decides to change the MAC).
 
 ### License
   GPL 3.0
-  [Read more here](LICENSE.txt)
+  [Read more here](../LICENSE.txt)
 
 ### Contact
   pi.alert.application@gmail.com

docs/VERSIONS_HISTORY.md

@@ -0,0 +1,28 @@
+# Pi.Alert Version History
+<!--- --------------------------------------------------------------------- --->
+
+  | Version | Description                                                     |
+  | ------- | --------------------------------------------------------------- |
+  |  v2.60  | Improved the compability of installation process (Ubuntu)       |
+  |  v2.56  | Bug fixing                                                      |
+  |  v2.55  | Bug fixing                                                      |
+  |  v2.52  | Bug fixing                                                      |
+  |  v2.51  | Bug fixing                                                      |
+  |  v2.50  | First public release                                            |
+
+
+## Pi.Alert v2.60
+<!--- --------------------------------------------------------------------- --->
+  - `pialert.conf` moved from `back` to `config` folder
+  - `pialert.conf` splitted in two files: `pialert.conf` and `version.conf`
+  - Added compatibility with Python 3 (default version installed with Ubuntu)
+  - Added compatibility in the Installation guide with Ubuntu server
+  - Eliminated some unnecessary packages from the installation
+
+
+### License
+  GPL 3.0
+  [Read more here](../LICENSE.txt)
+
+### Contact
+  pi.alert.application@gmail.com

docs/report_sample_1.html

@@ -1,3 +1,12 @@
+<!-- ---------------------------------------------------------------------------
+#  Pi.Alert
+#  Open Source Network Guard / WIFI & LAN intrusion detector 
+#
+#  repot_sample.html - Back module. Sample email reporting in HTML format
+#-------------------------------------------------------------------------------
+#  Puche 2021        pi.alert.application@gmail.com        GNU GPLv3
+#--------------------------------------------------------------------------- -->
+
 <html>
 
 <head>
@@ -16,7 +25,7 @@
         <td>
             <table width=100% border=0 bgcolor=#FFD966 cellpadding=5px cellspacing=0 style="border-collapse: collapse; font-size: 16px; text-align:center; color:#5F5000">
             <tr>
-                <td width=33%> Report Date: <b>2021-01-11 08:00</b> </td>
+                <td width=33%> Report Date: <b>2021-01-01 08:00</b> </td>
                 <td width=34%> Scan Cycle: <b>Internet</b> </td>
                 <td width=33%> Server: <b>pi4</b> </td>
             </tr>
@@ -39,7 +48,7 @@
 
                 <tr>
   <td> Internet IP Changed </td>
-  <td> 2021-01-02 08:20:00 </td>
+  <td> 2021-01-01 08:00:00 </td>
   <td style="font-size: 24px; color:#D02020"> 1.1.1.0 </td>
   <td> Previous Internet IP: 1.1.0.0 </td>
 </tr>
@@ -59,7 +68,7 @@
             <table width=100% border=0 bgcolor=#70AD47 cellpadding=5px cellspacing=0 style="border-collapse: collapse; font-size: 12px; font-weight: bold; color:#385723">
                <tr>
                     <td width=25% style="text-align:Left">   Puche 2021</td>
-                    <td width=50% style="text-align:center"> Pi.Alert 2.51 &nbsp; / &nbsp; 2021-01-11  </td>
+                    <td width=50% style="text-align:center"> Pi.Alert 2.50 &nbsp; / &nbsp; 2021-01-01  </td>
                     <td width=25% style="text-align:right">  GNU GPLv3</td>
                 </tr>
             </table>

docs/report_sample_2.html

@@ -1,3 +1,12 @@
+<!-- ---------------------------------------------------------------------------
+#  Pi.Alert
+#  Open Source Network Guard / WIFI & LAN intrusion detector 
+#
+#  repot_sample.html - Back module. Sample email reporting in HTML format
+#-------------------------------------------------------------------------------
+#  Puche 2021        pi.alert.application@gmail.com        GNU GPLv3
+#--------------------------------------------------------------------------- -->
+
 <html>
 
 <head>
@@ -16,7 +25,7 @@
         <td>
             <table width=100% border=0 bgcolor=#FFD966 cellpadding=5px cellspacing=0 style="border-collapse: collapse; font-size: 16px; text-align:center; color:#5F5000">
             <tr>
-                <td width=33%> Report Date: <b>2021-01-11 08:00</b> </td>
+                <td width=33%> Report Date: <b>2021-01-01 08:00</b> </td>
                 <td width=34%> Scan Cycle: <b>1</b> </td>
                 <td width=33%> Server: <b>pi4</b> </td>
             </tr>
@@ -43,13 +52,13 @@
 
                 <tr>
   <td> f8:d0:27:00:00:00 </td>
-  <td> 2021-01-02 08:20:00 </td>
+  <td> 2021-01-01 08:00:00 </td>
   <td> 192.168.1.20 </td>
   <td> Seiko Epson Corporation </td>
 </tr>
 <tr>
   <td> c8:6c:3d:00:00:00 </td>
-  <td> 2021-01-02 08:20:00 </td>
+  <td> 2021-01-01 08:00:00 </td>
   <td> 192.168.1.181 </td>
   <td> Amazon Technologies Inc. </td>
 </tr>
@@ -72,7 +81,7 @@
 
 <tr>
   <td> 0c:ee:99:00:00:00 </td>
-  <td> 2021-01-02 08:20:00 </td>
+  <td> 2021-01-01 08:00:00 </td>
   <td> 192.168.1.171 </td>
   <td> Alexa - Echo </td>
 </tr>
@@ -97,7 +106,7 @@
 
                 <tr>
   <td> 94:0c:98:00:00:00 </td>
-  <td> 2021-01-02 08:20:00 </td>
+  <td> 2021-01-01 08:00:00 </td>
   <td> 192.168.1.132 </td>
   <td> Connected </td>
   <td> Person 1 - iPhone 11 </td>
@@ -105,7 +114,7 @@
 </tr>
 <tr>
   <td> 5c:41:5a:00:00:00 </td>
-  <td> 2021-01-02 08:20:00 </td>
+  <td> 2021-01-01 08:00:00 </td>
   <td> 192.168.1.170 </td>
   <td> IP Changed </td>
   <td> Alexa Dot </td>
@@ -122,7 +131,7 @@
             <table width=100% border=0 bgcolor=#70AD47 cellpadding=5px cellspacing=0 style="border-collapse: collapse; font-size: 12px; font-weight: bold; color:#385723">
                <tr>
                     <td width=25% style="text-align:Left">   Puche 2021</td>
-                    <td width=50% style="text-align:center"> Pi.Alert 2.51 &nbsp; / &nbsp; 2021-01-11  </td>
+                    <td width=50% style="text-align:center"> Pi.Alert 2.50 &nbsp; / &nbsp; 2021-01-01  </td>
                     <td width=25% style="text-align:right">  GNU GPLv3</td>
                 </tr>
             </table>

front/php/templates/footer.php

@@ -1,10 +1,36 @@
+<!-- ---------------------------------------------------------------------------
+#  Pi.Alert
+#  Open Source Network Guard / WIFI & LAN intrusion detector 
+#
+#  footer.php - Front module. Common footer to all the front pages 
+#-------------------------------------------------------------------------------
+#  Puche 2021        pi.alert.application@gmail.com        GNU GPLv3
+#--------------------------------------------------------------------------- -->
+
   <!-- Main Footer -->
   <footer class="main-footer">
     <!-- Default to the left -->
-    &copy; 2021 Puche
+
+    <!-- 
+    &copy; 2020 Puche
+    -->
+    <?php
+      $conf_file = '../config/version.conf';
+      $conf_data = parse_ini_file($conf_file);
+      echo '<span style="display:inline-block; transform: rotate(180deg)">&copy;</span> '. $conf_data['VERSION_YEAR'] .' Puche';
+    ?>
+
     <!-- To the right -->
     <div class="pull-right no-hidden-xs">
-      Pi.alert&nbsp&nbsp2.51&nbsp&nbsp<small>(2021-01-11)</small>
+
+    <!-- 
+      Pi.Alert&nbsp&nbsp2.50&nbsp&nbsp<small>(2019-12-30)</small>
+    -->
+    <?php
+      $conf_file = '../config/version.conf';
+      $conf_data = parse_ini_file($conf_file);
+      echo 'Pi.Alert&nbsp&nbsp'. $conf_data['VERSION'] .'&nbsp&nbsp<small>('. $conf_data['VERSION_DATE'] .')</small>';
+    ?>
     </div>
   </footer>
 

front/php/templates/header.php

@@ -1,9 +1,18 @@
+<!-- ---------------------------------------------------------------------------
+#  Pi.Alert
+#  Open Source Network Guard / WIFI & LAN intrusion detector 
+#
+#  header.php - Front module. Common header to all the front pages 
+#-------------------------------------------------------------------------------
+#  Puche 2021        pi.alert.application@gmail.com        GNU GPLv3
+#--------------------------------------------------------------------------- -->
+
 <!DOCTYPE html> 
 <html>
 <head>
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <title>Pi.alert</title>
+  <title>Pi.Alert</title>
   <!-- Tell the browser to be responsive to screen width -->
   <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
   <!-- Bootstrap 3.3.7 -->
@@ -21,7 +30,7 @@
   <link rel="stylesheet" href="lib/AdminLTE/dist/css/skins/skin-yellow-light.min.css">
 
   
-  <!-- Pi.alert CSS -->
+  <!-- Pi.Alert CSS -->
   <link rel="stylesheet" href="css/pialert.css">
 
   <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
@@ -40,7 +49,7 @@
 </head>
 
 <!-- Layout Boxed Yellow -->
-<body class="hold-transition skin-yellow-light layout-boxed sidebar-mini" style="background-image: url('img/backgroud.png');">
+<body class="hold-transition skin-yellow-light layout-boxed sidebar-mini" style="background-image: url('img/background.png');">
 <!-- Site wrapper -->
 <div class="wrapper">
 
@@ -52,7 +61,7 @@
       <!-- mini logo for sidebar mini 50x50 pixels -->
       <span class="logo-mini">P<b>a</b></span>
       <!-- logo for regular state and mobile devices -->
-      <span class="logo-lg">Pi<b>.alert</b></span>
+      <span class="logo-lg">Pi<b>.Alert</b></span>
     </a>
 
     <!-- Header Navbar -->
@@ -73,14 +82,14 @@
             <!-- Menu Toggle Button -->
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">
               <!-- The user image in the navbar-->
-              <img src="img/pialertLogoWhite.png" class="user-image" style="border-radius: initial" alt="Pi.alert Logo">
+              <img src="img/pialertLogoWhite.png" class="user-image" style="border-radius: initial" alt="Pi.Alert Logo">
               <!-- hidden-xs hides the username on small devices so only the image appears. -->
-              <span class="hidden-xs">Pi.alert</span>
+              <span class="hidden-xs">Pi.Alert</span>
             </a>
             <ul class="dropdown-menu">
               <!-- The user image in the menu -->
               <li class="user-header">
-                <img src="img/pialertLogoWhite.png" class="img-circle" alt="Pi.alert Logo" style="border-color:transparent">
+                <img src="img/pialertLogoWhite.png" class="img-circle" alt="Pi.Alert Logo" style="border-color:transparent">
 
                 <p>
                   Open Source Network Guard
@@ -91,15 +100,19 @@
               <li class="user-body">
                 <div class="row">
                   <div class="col-xs-4 text-center">
-                    <a href="https://github.com/pucherot/Pi.Alert">GitHub</a>
+                    <a target="_blank" href="https://github.com/pucherot/Pi.Alert">GitHub Pi.Alert</a>
                   </div>
                   <div class="col-xs-4 text-center">
-                    <a href="https://github.com/pucherot/Pi.Alert">Pi.Alert</a>
+                    <a href="mailto:pi.alert.application@gmail.com">email Support</a>
-                    <!-- <a href="#">Website</a> -->
                   </div>
+                  <div class="col-xs-4 text-center">
+                    <a target="_blank" href="https://github.com/pucherot/Pi.Alert/blob/main/LICENSE.txt">GNU GPLv3</a>
+                  </div>
+                  <!--
                   <div class="col-xs-4 text-center">
                     <a href="#">Updates</a>
                   </div>
+                  -->
                 </div>
                 <!-- /.row -->
               </li>
@@ -118,11 +131,11 @@
       <!-- Sidebar user panel (optional) -->
       <div class="user-panel">
         <a href="/" class="logo">
-          <img src="img/pialertLogoGray80.png" class="img-responsive" alt="Pi.alert Logo"/>
+          <img src="img/pialertLogoGray80.png" class="img-responsive" alt="Pi.Alert Logo"/>
         </a>
         <div class="pull-left image">
 <!--
-          <br><img src="img/pialertLogoBlack.png" class="img-responsive" alt="Pi.alert Logo" style="display: table; table-layout: fixed;" />
+          <br><img src="img/pialertLogoBlack.png" class="img-responsive" alt="Pi.Alert Logo" style="display: table; table-layout: fixed;" />
 -->
         </div>
 

install/create_tar.sh

@@ -1,9 +0,0 @@
-#
-PIALERT_VERSION=2.50
-PIALERT_DEV_PATH=/media/WD_4TB/dev
-
-cd $PIALERT_DEV_PATH
-tar tvf pialert/install/pialert_$PIALERT_VERSION.tar | wc -l
-rm pialert/install/pialert_$PIALERT_VERSION.tar
-tar cvf pialert/install/pialert_$PIALERT_VERSION.tar --exclude="pialert/install" --exclude="pialert/.git" pialert | wc -l
-

install/index.html

@@ -0,0 +1,11 @@
+<!-- ---------------------------------------------------------------------------
+#  Pi.Alert
+#  Open Source Network Guard / WIFI & LAN intrusion detector 
+#
+#  index.html - Redirect file to pialert subdirectory
+#-------------------------------------------------------------------------------
+#  Puche 2021        pi.alert.application@gmail.com        GNU GPLv3
+#--------------------------------------------------------------------------- -->
+
+<meta http-equiv="refresh" content="0; url=pialert"/>
+<meta http-equiv="Cache-Control" content="no-store" />

install/pialert.cron

@@ -0,0 +1,13 @@
+#-------------------------------------------------------------------------------
+#  Pi.Alert
+#  Open Source Network Guard / WIFI & LAN intrusion detector 
+#
+#  pialert.cron - Back module. Crontab jobs
+#-------------------------------------------------------------------------------
+#  Puche 2021        pi.alert.application@gmail.com        GNU GPLv3
+#-------------------------------------------------------------------------------
+
+0 3 * * 1      python ~/pialert/back/pialert.py update_vendors >~/pialert/log/pialert.vendors.log  2>&1
+*/1 * * * *    python ~/pialert/back/pialert.py internet_IP    >~/pialert/log/pialert.IP.log       2>&1
+*/5 * * * *    python ~/pialert/back/pialert.py 1              >~/pialert/log/pialert.1.log        2>&1
+*/15 * * * *   python ~/pialert/back/pialert.py 15             >~/pialert/log/pialert.15.log       2>&1

install/pialert_front.conf

@@ -0,0 +1,12 @@
+# ------------------------------------------------------------------------------
+#  Pi.Alert
+#  Open Source Network Guard / WIFI & LAN intrusion detector 
+#
+#  index.html - Redirect file to pialert subdirectory
+# ------------------------------------------------------------------------------
+#  Puche 2021        pi.alert.application@gmail.com        GNU GPLv3
+# ------------------------------------------------------------------------------
+
+$HTTP["host"] == "pi.alert" {
+  server.document-root = "/var/www/html/pialert/"
+}

log/IP_changes.log

@@ -1 +1,10 @@
+#-------------------------------------------------------------------------------
+#  Pi.Alert
+#  Open Source Network Guard / WIFI & LAN intrusion detector 
+#
+#  IP_changes.log - Back module. Logfile for Internet IP changes
+#-------------------------------------------------------------------------------
+#  Puche 2021        pi.alert.application@gmail.com        GNU GPLv3
+#-------------------------------------------------------------------------------
+
 2021-01-01 00:00:00	0.0.0.0

log/report_output.html

@@ -1,3 +1,12 @@
+<!-- ---------------------------------------------------------------------------
+#  Pi.Alert
+#  Open Source Network Guard / WIFI & LAN intrusion detector 
+#
+#  repot_template.html - Back module. Template to email reporting in HTML format
+#-------------------------------------------------------------------------------
+#  Puche 2021        pi.alert.application@gmail.com        GNU GPLv3
+#--------------------------------------------------------------------------- -->
+
 <html>
 
 <head>
@@ -16,7 +25,7 @@
         <td>
             <table width=100% border=0 bgcolor=#FFD966 cellpadding=5px cellspacing=0 style="border-collapse: collapse; font-size: 16px; text-align:center; color:#5F5000">
             <tr>
-                <td width=33%> Report Date: <b>2021-01-04 18:08</b> </td>
+                <td width=33%> Report Date: <b>2021-01-01 08:00</b> </td>
                 <td width=34%> Scan Cycle: <b>1</b> </td>
                 <td width=33%> Server: <b>pi4</b> </td>
             </tr>
@@ -35,7 +44,7 @@
             <table width=100% border=0 bgcolor=#70AD47 cellpadding=5px cellspacing=0 style="border-collapse: collapse; font-size: 12px; font-weight: bold; color:#385723">
                <tr>
                     <td width=25% style="text-align:Left">   Puche 2021</td>
-                    <td width=50% style="text-align:center"> Pi.Alert DEV 2.51 &nbsp; / &nbsp; 2021-01-11  </td>
+                    <td width=50% style="text-align:center"> Pi.Alert 2.50 &nbsp; / &nbsp; 2021-01-01  </td>
                     <td width=25% style="text-align:right">  GNU GPLv3</td>
                 </tr>
             </table>

log/report_output.txt

@@ -2,7 +2,7 @@
             Pi.Alert Report
 ========================================
 
-  Report Date: 2021-01-11 00:00
+  Report Date: 2021-01-01 08:00
   Scan Cycle:  1
   Server:      pi4
 
@@ -12,4 +12,4 @@ Events
 
 
 ----------------------------------------------------------------------
-Puche 2021            Pi.Alert 2.51 / 2021-01-11             GNU GPLv3
+Puche 2021            Pi.Alert 2.50 / 2021-01-01             GNU GPLv3

tar/create_tar.sh

@@ -0,0 +1,28 @@
+#!/bin/sh
+# ------------------------------------------------------------------------------
+#  Pi.Alert
+#  Open Source Network Guard / WIFI & LAN intrusion detector 
+#
+#  create_tar.sh - Create the installation file
+# ------------------------------------------------------------------------------
+#  Puche 2021        pi.alert.application@gmail.com        GNU GPLv3
+# ------------------------------------------------------------------------------
+
+PIALERT_VERSION=`awk '$1=="VERSION" { print $3 }' ../config/version.conf | tr -d \'`
+PIALERT_DEV_PATH=/media/WD_4TB/dev
+
+# ------------------------------------------------------------------------------
+cd $PIALERT_DEV_PATH
+pwd
+
+# ------------------------------------------------------------------------------
+ls -l pialert/tar/pialert*.tar
+tar tvf pialert/tar/pialert_latest.tar | wc -l
+rm pialert/tar/pialert_*.tar
+
+# ------------------------------------------------------------------------------
+tar cvf pialert/tar/pialert_$PIALERT_VERSION.tar --exclude="pialert/tar" --exclude="pialert/.git" pialert | wc -l
+
+ln -s pialert_$PIALERT_VERSION.tar pialert/tar/pialert_latest.tar
+ls -l pialert/tar/pialert*.tar
+