minor changes

4d8077ce · Reto Da Forno · 282c940d · 4d8077ce · 4d8077ce · 4d8077ce
Commit 4d8077ce authored Mar 12, 2020 by Reto Da Forno
--- a/update_server.sh
+++ b/update_server.sh
@@ -15,12 +15,12 @@ sleep 2   # give the user time to abort, just in case

 # testmanagement server files
 # optional to only look for changed files:  | grep '^<fc' | cut -d' ' -f2
-RES=$(rsync ${RSYNCPARAMS} -i --dry-run -e 'ssh -q' testmanagementserver ${USER}@${HOST}:testmanagementserver)
+RES=$(rsync ${RSYNCPARAMS} -i --dry-run -e 'ssh -q' testmanagementserver/ ${USER}@${HOST}:testmanagementserver  2>&1)
 if [ -z "$RES" ]; then
    echo "Testmanagement server files are up to date."
 else
    printf "Updating testmanagement server files... "
-    rsync ${RSYNCPARAMS} -e 'ssh -q' testmanagementserver ${USER}@${HOST}:
+    rsync ${RSYNCPARAMS} -e 'ssh -q' testmanagementserver/ ${USER}@${HOST}:testmanagementserver
    if [ $? -ne 0 ]; then
        printf "Failed to copy files!\n"
        continue
@@ -29,12 +29,13 @@ else
    fi
 fi
 # webserver files
-RES=$(rsync ${RSYNCPARAMS} -i --dry-run -e 'ssh -q' webserver ${USER}@${HOST}:webserver)
+RES=$(rsync ${RSYNCPARAMS} -i --dry-run -e 'ssh -q' webserver/ ${USER}@${HOST}:webserver  2>&1)
 if [ -z "$RES" ]; then
    echo "Webserver files are up to date."
 else
+    echo $RES
    printf "Updating webserver files..."
-    rsync ${RSYNCPARAMS} -e 'ssh -q' webserver ${USER}@${HOST}:
+    rsync ${RSYNCPARAMS} -e 'ssh -q' webserver/ ${USER}@${HOST}:webserver
    if [ $? -ne 0 ]; then
        printf "failed to copy repository files!\n"
        continue
@@ -43,12 +44,13 @@ else
    fi
 fi
 # tools
-RES=$(rsync ${RSYNCPARAMS} -i --dry-run -e 'ssh -q' tools ${USER}@${HOST}:tools)
+RES=$(rsync ${RSYNCPARAMS} -i --dry-run -e 'ssh -q' tools/ ${USER}@${HOST}:tools  2>&1)
 if [ -z "$RES" ]; then
    echo "Tools are up to date."
 else
+    echo $RES
    printf "Updating tools... "
-    rsync ${RSYNCPARAMS} -e 'ssh -q' tools ${USER}@${HOST}:
+    rsync ${RSYNCPARAMS} -e 'ssh -q' tools/ ${USER}@${HOST}:tools
    if [ $? -ne 0 ]; then
        printf "Failed to copy files!\n"
        continue

--- a/webserver/css/flocklab.css
+++ b/webserver/css/flocklab.css
@@ -89,7 +89,7 @@ div.content th, div.content td {
 }

 td:hover {
-    background-color: #F0F0F0;
+    background-color: #DDD;
 }

 div.content th {
@@ -132,7 +132,7 @@ div.content table.tablesorter th.headerSortDown {
 }

 div.content table.tablesorter tr.even {
-    background-color: #f9f9f9;
+    background-color: #F0F0F0;
 }

 div.content table.tablesorter tr.odd {
@@ -179,8 +179,8 @@ div.sidenavigation a {

 /* BEGIN styling of forms, input fields and buttons */
 input {
-    border: 1px solid gray;
-    background-color: #f9f9f9;
+    border: 1px solid #DDD;
+    background-color: #F0F0F0;
    height: 18px;
    padding: 2px;
    color: #666666;
@@ -238,9 +238,9 @@ form span.formfield-extrawide {
 }

 form textarea, form input[type="text"], form select {
-    border: 1px solid gray;
-    background-color: #f9f9f9;
-    height: auto;    
+    border: 1px solid #DDD;
+    background-color: #F0F0F0;
+    height: auto;
    min-height: 18px;
    width: 350px;
    padding: 2px;
@@ -249,9 +249,9 @@ form textarea, form input[type="text"], form select {
 }

 form input[type="password"] {
-    border: 1px solid gray;
-    background-color: #f9f9f9;
-    height: auto;    
+    border: 1px solid #DDD;
+    background-color: #F0F0F0;
+    height: auto;
    min-height: 18px;
    width: 350px;
    padding: 2px;

--- a/webserver/include/libflocklab.php
+++ b/webserver/include/libflocklab.php
@@ -29,6 +29,7 @@ function db_connect()
    mysqli_query($dbh, $sql) or flocklab_die('Cannot init timezone for database connection because: ' . mysqli_error($dbh));
    $sql='SET sql_mode=""';
    mysqli_query($dbh, $sql) or flocklab_die('Cannot set sql mode for database connection because: ' . mysqli_error($dbh));
+    mysqli_set_charset($dbh, "utf8");
    return($dbh);
 }


--- a/webserver/index.php.maintenance
+++ b/webserver/index.php.maintenance
+<?php
+
+echo "
+<html>
+<body style='font-family: arial,helvetica'>
+<center>
+<br />
+<br />
+<br />
+<img src='pics/flocklab_eth_logo.png' border='0px' /><br />
+<br />
+<br />
+<h3>FlockLab is temporarily unavailable. We are currently updating our testbed to a new version, FlockLab 2!</h3>
+The current FlockLab observers will be removed and replaced by new FlockLab 2 observers!<br />
+<!--The new observers come with a built-in <a href='http://rocketlogger.ethz.ch/' target='new' style='color:#28549f'>RocketLogger</a> and <a href='https://www.segger.com/products/debug-probes/j-link/' target='new' style='color:#28549f'>J-Link debugger</a>.<br />-->
+Initially, the new testbed will consist of 10 observers, but we plan to increase the numbers in the near future.<br />
+FlockLab 2 is expected to be online in a few days (with limited functionality).<br />
+<br />
+If you have any questions or concerns, feel free to <a href='mailto:flocklab@tik.ee.ethz.ch' style='color:#28549f'>contact us</a>.<br />
+<br />
+</center>
+</body>
+</html>
+";
+
+?>