Przeglądaj źródła

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

Bob Mottram 7 lat temu
rodzic
commit
5d69970f33

+ 1
- 1
src/freedombone-image-customise Wyświetl plik

1661
         mkdir -p "$rootdir/root/build"
1661
         mkdir -p "$rootdir/root/build"
1662
     fi
1662
     fi
1663
     chroot "$rootdir" apt-get -yq install build-essential curl libgnutls28-dev automake1.11 libconfuse-dev
1663
     chroot "$rootdir" apt-get -yq install build-essential curl libgnutls28-dev automake1.11 libconfuse-dev
1664
-    chroot "$rootdir" apt-get -yq install gnutls-dev libconfuse-dev pkg-config
1664
+    chroot "$rootdir" apt-get -yq install gnutls-dev libconfuse-dev pkg-config libssl-dev
1665
 
1665
 
1666
     if [ -d /repos/inadyn ]; then
1666
     if [ -d /repos/inadyn ]; then
1667
         mkdir "$rootdir/root/build/inadyn"
1667
         mkdir "$rootdir/root/build/inadyn"

+ 1
- 0
src/freedombone-template Wyświetl plik

926
     echo "      echo 'Description=${app_name}';"
926
     echo "      echo 'Description=${app_name}';"
927
     echo "      echo 'After=syslog.target';"
927
     echo "      echo 'After=syslog.target';"
928
     echo "      echo 'After=network.target';"
928
     echo "      echo 'After=network.target';"
929
+    echo "      echo 'Documentation=${app_name_upper}_REPO";
929
     echo "      echo '';"
930
     echo "      echo '';"
930
     echo "      echo '[Service]';"
931
     echo "      echo '[Service]';"
931
     echo "      echo 'Type=simple';"
932
     echo "      echo 'Type=simple';"

+ 15
- 7
src/freedombone-tor-health Wyświetl plik

48
 mv /var/log/tor/notices_new.log /var/log/tor/notices.log
48
 mv /var/log/tor/notices_new.log /var/log/tor/notices.log
49
 chown -R debian-tor:adm /var/log/tor
49
 chown -R debian-tor:adm /var/log/tor
50
 
50
 
51
-if [ $ctr -gt 5 ]; then
52
-    echo $'Failed'
53
-    exit 0
54
-fi
51
+UPTIME=$(awk -F '.' '{print $1}' < "/proc/uptime")
52
+if [ "$UPTIME" -gt 500 ]; then
53
+    if [ $ctr -gt 5 ]; then
54
+        echo $'Failed'
55
+        exit 0
56
+    fi
55
 
57
 
56
-if [ $ctr -gt 0 ]; then
57
-    echo $'Poor'
58
-    exit 0
58
+    if [ $ctr -gt 0 ]; then
59
+        echo $'Poor'
60
+        exit 0
61
+    fi
62
+else
63
+    if [ $ctr -gt 0 ]; then
64
+        echo $'Starting'
65
+        exit 0
66
+    fi
59
 fi
67
 fi
60
 
68
 
61
 echo $'Good'
69
 echo $'Good'

+ 1
- 1
src/freedombone-utils-web Wyświetl plik

525
     # https version 1.99.8
525
     # https version 1.99.8
526
 
526
 
527
     apt-get -yq install build-essential curl libgnutls28-dev automake1.11
527
     apt-get -yq install build-essential curl libgnutls28-dev automake1.11
528
-    apt-get -yq install gnutls-dev libconfuse-dev pkg-config
528
+    apt-get -yq install gnutls-dev libconfuse-dev pkg-config libssl-dev
529
 
529
 
530
     if [ ! -d "$INSTALL_DIR/inadyn" ]; then
530
     if [ ! -d "$INSTALL_DIR/inadyn" ]; then
531
         if [ -d /repos/inadyn ]; then
531
         if [ -d /repos/inadyn ]; then