From 69b8782fb4a8f9c61ea209c078cdd30bff54ef03 Mon Sep 17 00:00:00 2001
From: Romain Bazile <gromain.baz@gmail.com>
Date: Sat, 5 Dec 2020 03:04:46 +0100
Subject: [PATCH] flow: icon of monitoring tab and update nginx config

---
 flows/main.json        |  4 ++--
 scripts/bash/update.sh | 16 ++++++++++------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/flows/main.json b/flows/main.json
index e4a79f9..1b78e64 100644
--- a/flows/main.json
+++ b/flows/main.json
@@ -192,7 +192,7 @@
         "type": "ui_tab",
         "z": "",
         "name": "System Monitoring",
-        "icon": "fa-cogs",
+        "icon": "fa-thermometer-full",
         "order": 7,
         "disabled": false,
         "hidden": false
@@ -1851,7 +1851,7 @@
         "order": 1,
         "width": 4,
         "height": 4,
-        "format": "<md-button ng-click=\"send({payload: {tab:'System Monitoring'}})\" style=\"height:100%;\">\n    <i class=\"fa fa-cogs fa-5x\"></i>\n    <div style=\"margin-top:30px;\">System Monitoring</div>\n</md-button>",
+        "format": "<md-button ng-click=\"send({payload: {tab:'System Monitoring'}})\" style=\"height:100%;\">\n    <i class=\"fa fa-thermometer-full fa-5x\"></i>\n    <div style=\"margin-top:30px;\">System Monitoring</div>\n</md-button>",
         "storeOutMessages": true,
         "fwdInMessages": true,
         "resendOnRefresh": false,
diff --git a/scripts/bash/update.sh b/scripts/bash/update.sh
index ff52acc..ae90684 100755
--- a/scripts/bash/update.sh
+++ b/scripts/bash/update.sh
@@ -19,18 +19,22 @@ function special(){
     if [[ -f "/etc/udev/rules.d/99-local.rules" ]]; then
         sudo rm /etc/udev/rules.d/99-local.rules
     fi
-    if ! [[ -f "/etc/nginx/sites-available/gallery.conf" ]]; then
-        ${log} "Nginx config is not installed, doing that now"
-        sudo cp /home/pi/PlanktonScope/scripts/gallery/gallery.conf /etc/nginx/sites-available/gallery.conf
-        sudo ln -s /etc/nginx/sites-available/gallery.conf /etc/nginx/sites-enabled/gallery.conf
-        sudo nginx -t && sudo systemctl reload nginx
-    fi
     if [[ -f "/etc/nginx/sites-available/img.conf" ]]; then
         ${log} "Getting rid of the old nginx config"
         sudo rm /etc/nginx/sites-available/img.conf
         sudo rm /etc/nginx/sites-enabled/img.conf
         sudo nginx -t && sudo systemctl reload nginx
     fi
+    if [[ -f "/etc/nginx/sites-available/gallery.conf" ]]; then
+        ${log} "Updating the old nginx config"
+        sudo rm /etc/nginx/sites-available/gallery.conf
+    fi
+    if ! [[ -f "/etc/nginx/sites-available/gallery.conf" ]]; then
+        ${log} "Nginx config is not installed, doing that now"
+        sudo cp /home/pi/PlanktonScope/scripts/gallery/gallery.conf /etc/nginx/sites-available/gallery.conf
+        sudo ln -s /etc/nginx/sites-available/gallery.conf /etc/nginx/sites-enabled/gallery.conf
+        sudo nginx -t && sudo systemctl reload nginx
+    fi
 }
 
 ${log} "Updating the main repository"