From 1daf58fcd2f4538ae9a91dece8274fe6d412ab20 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sun, 13 May 2018 12:39:07 +0100 Subject: [PATCH 1/3] Report tor status as starting if uptime is small --- src/freedombone-tor-health | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/src/freedombone-tor-health b/src/freedombone-tor-health index e7dc427e..f96a83b5 100755 --- a/src/freedombone-tor-health +++ b/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' From 935efed5046111dfd812cba8584424ec36d26f3b Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sun, 13 May 2018 13:36:09 +0100 Subject: [PATCH 2/3] Link to repo within daemon --- src/freedombone-template | 1 + 1 file changed, 1 insertion(+) diff --git a/src/freedombone-template b/src/freedombone-template index faffd9b9..1f023834 100755 --- a/src/freedombone-template +++ b/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';" From 15f0e0c28d56e348ba4a1e9c67ae07527fafcf49 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sun, 13 May 2018 16:18:37 +0100 Subject: [PATCH 3/3] Include openssl development library --- src/freedombone-image-customise | 2 +- src/freedombone-utils-web | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise index 58630e45..dc9e1a5a 100755 --- a/src/freedombone-image-customise +++ b/src/freedombone-image-customise @@ -1657,7 +1657,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" diff --git a/src/freedombone-utils-web b/src/freedombone-utils-web index d4a45a87..66edd235 100755 --- a/src/freedombone-utils-web +++ b/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