Fixed config files, added wlan0 conf file

Author: Federico Turco

ModBusServerConfigurator/LinuxInstaller/dnsmasq.conf

@@ -5,4 +5,4 @@
 # ------------------------
 interface=wlan0
 dhcp-range=10.0.0.2,10.0.0.254,255.255.255.0,24h
-domain=wlan
+domain=wlan

ModBusServerConfigurator/LinuxInstaller/hostapd.conf

@@ -12,4 +12,4 @@ wpa=2
 wpa_passphrase=pimodbus
 wpa_key_mgmt=WPA-PSK
 wpa_pairwise=TKIP
-rsn_pairwise=CCMP
+rsn_pairwise=CCMP

ModBusServerConfigurator/LinuxInstaller/installer.sh

@@ -1,29 +1,64 @@
 
-sudo su
+# root access
+PATH_GIT_PROJECT="https://github.com/Fedex1515/ModBusServerConfigurator"
 
-PATH_GIT_PROJECT="https://github.com/Fedex1515/ModBusServerConfigurator/settings"
+# Installing required packages
+sudo apt-get install -y python3-pip
+sudo apt-get install -y git
+sudo apt-get install -y hostapd
+sudo apt-get install -y dnsmasq
 
-apt-get install -y python3-pip
-apt-get install -y git
-apt-get install -y hostapd
-apt-get install -y dnsmasq
+# Installing python libs for root (used by systemd)
+sudo pip3 install pymodbus
+sudo pip3 install pyserial
 
+# Installing python libs for pi user (if you need to launch server manually from the shell)
 pip3 install pymodbus
 pip3 install pyserial
 
-git clone $PATH_GIT_PROJECT
+# Cloning git repo in temporary directory
+git clone $PATH_GIT_PROJECT tmp/
 
-cp ModBusServerConfigurator/LinuxInstaller/hostapd.conf /etc/hostapd/hostapd.conf
-cp ModBusServerConfigurator/LinuxInstaller/dnsmasq.conf /etc/dnsmasq.conf
-
-cp ModBusServerConfigurator/PythonEngine /home/pi/ModBusServerConfigurator
+# Copying config files for hostapd (hotspot wifi) and dnsmasq (dhcp server wlan side)
+sudo cp tmp/ModBusServerConfigurator/LinuxInstaller/hostapd.conf /etc/hostapd/hostapd.conf
+sudo cp tmp/ModBusServerConfigurator/LinuxInstaller/dnsmasq.conf /etc/dnsmasq.conf
+sudo cp tmp/ModBusServerConfigurator/LinuxInstaller/wlan0 /etc/network/interfaces.d/wlan0
 
+# Copying python server in home directory
+cp -r tmp/ModBusServerConfigurator/PythonEngine /home/pi/ModBusServerConfigurator
 chown pi /home/pi/ModBusServerConfigurator/config.json
 
-ln -s /home/pi/ModBusServerConfigurator/modbus.service /etc/systemd/system/modbus.service
-systemctl enable modbus.service
+# Creating symlink for systemd service file
+sudo rm /etc/systemd/system/modbus.service
+sudo ln -s /home/pi/ModBusServerConfigurator/modbus.service /etc/systemd/system/modbus.service
+sudo systemctl enable modbus.service
 
-exit
+# Removing temporary files
+rm -r -f tmp/
 
-pip3 install pymodbus
-pip3 install pyserial
+# Sometimes the hostapd service is masked after the installation so i solve this checking the actual status
+if sudo service hostapd status | grep "Loaded: masked" -q;
+then
+        echo "Hostapd status masked, it needs to be unmasked, ..."
+        sudo systemctl unmask hostapd.service
+        sudo systemctl enable hostapd.service
+        #sudo service hostapd status
+        sudo service hostapd status | grep "Loaded: masked"
+        sudo service hostapd start
+        #sudo service hostapd status
+        sudo service hostapd status | grep "Loaded: masked"
+
+        if sudo service hostapd status | grep "Loaded: masked" -q;
+        then
+                echo "Error running unmask command on hostapd.service"
+        else
+                echo "Hostapd status OK"
+        fi
+else
+        echo "Hostapd status OK"
+fi
+
+# Now i configure wlan0 manually
+sudo ifconfig wlan0 10.0.0.1 netmask 255.255.255.0
+
+# But i also add the config entry in th network file

ModBusServerConfigurator/LinuxInstaller/wlan0

@@ -0,0 +1,9 @@
+#/etc/network/interfaces.d/wlan0
+
+# ------------------------
+# ------ WIFI WLAN0 ------
+# ------------------------
+auto wlan0
+iface wlan0 inet static
+address 10.0.0.1
+netmask 255.255.255.0

ModBusServerConfigurator/ModBusServerConfigurator.csproj

@@ -117,6 +117,7 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <None Include="LinuxInstaller\wlan0" />
     <None Include="LinuxInstaller\dnsmasq.conf" />
     <None Include="LinuxInstaller\hostapd.conf" />
     <None Include="LinuxInstaller\installer.sh" />