free
/
freedombone
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Bob Mottram 2018-05-13 16:19:28 +01:00
parent 00244a05db 15f0e0c28d
commit 5d69970f33
4 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/freedombone-image-customise
View File

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

1
src/freedombone-template
View File

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

8
src/freedombone-tor-health
View File

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

2
src/freedombone-utils-web
View File

@ -525,7 +525,7 @@ function install_dynamicdns {
# https version 1.99.8 # https version 1.99.8
apt-get -yq install build-essential curl libgnutls28-dev automake1.11 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 "$INSTALL_DIR/inadyn" ]; then
if [ -d /repos/inadyn ]; then if [ -d /repos/inadyn ]; then