From c60dd95eedb8a75a903173c2a8f04aa2386e3f0d Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sat, 12 Sep 2015 09:14:39 +0100 Subject: [PATCH] Specify zeronet config file --- src/freedombone | 2 +- src/freedombone-meshweb | 2 +- src/zeronetavahi | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/freedombone b/src/freedombone index 86c945f4..f7d4923f 100755 --- a/src/freedombone +++ b/src/freedombone @@ -1860,7 +1860,7 @@ function install_zeronet { echo 'User=zeronet' >> /etc/systemd/system/zeronet.service echo 'Group=zeronet' >> /etc/systemd/system/zeronet.service echo 'WorkingDirectory=/opt/zeronet' >> /etc/systemd/system/zeronet.service - echo "ExecStart=/usr/bin/python zeronet.py --ip_external ${DEFAULT_DOMAIN_NAME}.local" >> /etc/systemd/system/zeronet.service + echo "ExecStart=/usr/bin/python zeronet.py --ip_external ${DEFAULT_DOMAIN_NAME}.local --config_file /opt/zeronet/zeronet.conf" >> /etc/systemd/system/zeronet.service echo '' >> /etc/systemd/system/zeronet.service echo 'TimeoutSec=300' >> /etc/systemd/system/zeronet.service echo '' >> /etc/systemd/system/zeronet.service diff --git a/src/freedombone-meshweb b/src/freedombone-meshweb index df7f9bca..38864c21 100755 --- a/src/freedombone-meshweb +++ b/src/freedombone-meshweb @@ -324,7 +324,7 @@ zeronetavahi existing_zeronet=$(ps aux | grep zeronet | wc -l) if [ $existing_zeronet -lt "2" ]; then - python zeronet.py --ip_external $(hostname).local & + python zeronet.py --ip_external $(hostname).local --config_file $ZERONET_DIR/zeronet.conf & fi if which firefox > /dev/null; then diff --git a/src/zeronetavahi b/src/zeronetavahi index f3394101..eafc8551 100755 --- a/src/zeronetavahi +++ b/src/zeronetavahi @@ -49,7 +49,7 @@ BLOGS_FILE=$ZERONET_INSTALL/freedombone-blogs FORUM_FILE=$ZERONET_INSTALL/freedombone-fora TOX_USERS_FILE=$ZERONET_INSTALL/freedombone-tox-users ZERONET_INDEX=/home/$MY_USERNAME/mesh.html -ZERONET_CONFIG=/home/$MY_USERNAME/.config/zeronet/zeronet.conf +ZERONET_CONFIG=$ZERONET_INSTALL/zeronet.conf function create_index { if [ -f $ZERONET_INDEX ]; then