Merge branch 'stretch' of https://github.com/bashrc/freedombone

src/freedombone-image-customise

@@ -1661,7 +1661,7 @@ image_install_inadyn() {
         mkdir -p "$rootdir/root/build"
     fi
     chroot "$rootdir" apt-get -yq install build-essential curl libgnutls28-dev automake1.11 libconfuse-dev
-    chroot "$rootdir" apt-get -yq install gnutls-dev libconfuse-dev pkg-config
+    chroot "$rootdir" apt-get -yq install gnutls-dev libconfuse-dev pkg-config libssl-dev
 
     if [ -d /repos/inadyn ]; then
         mkdir "$rootdir/root/build/inadyn"

src/freedombone-template

@@ -926,6 +926,7 @@ if [ $app_daemon ]; then
     echo "      echo 'Description=${app_name}';"
     echo "      echo 'After=syslog.target';"
     echo "      echo 'After=network.target';"
+    echo "      echo 'Documentation=${app_name_upper}_REPO";
     echo "      echo '';"
     echo "      echo '[Service]';"
     echo "      echo 'Type=simple';"

src/freedombone-tor-health

@@ -48,14 +48,22 @@ done < /var/log/tor/notices.log
 mv /var/log/tor/notices_new.log /var/log/tor/notices.log
 chown -R debian-tor:adm /var/log/tor
 
-if [ $ctr -gt 5 ]; then
-    echo $'Failed'
-    exit 0
-fi
+UPTIME=$(awk -F '.' '{print $1}' < "/proc/uptime")
+if [ "$UPTIME" -gt 500 ]; then
+    if [ $ctr -gt 5 ]; then
+        echo $'Failed'
+        exit 0
+    fi
 
-if [ $ctr -gt 0 ]; then
-    echo $'Poor'
-    exit 0
+    if [ $ctr -gt 0 ]; then
+        echo $'Poor'
+        exit 0
+    fi
+else
+    if [ $ctr -gt 0 ]; then
+        echo $'Starting'
+        exit 0
+    fi
 fi
 
 echo $'Good'

src/freedombone-utils-web

@@ -525,7 +525,7 @@ function install_dynamicdns {
     # https version 1.99.8
 
     apt-get -yq install build-essential curl libgnutls28-dev automake1.11
-    apt-get -yq install gnutls-dev libconfuse-dev pkg-config
+    apt-get -yq install gnutls-dev libconfuse-dev pkg-config libssl-dev
 
     if [ ! -d "$INSTALL_DIR/inadyn" ]; then
         if [ -d /repos/inadyn ]; then