Specify zeronet config file

This commit is contained in:
Bob Mottram 2015-09-12 09:14:39 +01:00
parent 1828af3a99
commit c60dd95eed
3 changed files with 3 additions and 3 deletions

View File

@ -1860,7 +1860,7 @@ function install_zeronet {
echo 'User=zeronet' >> /etc/systemd/system/zeronet.service echo 'User=zeronet' >> /etc/systemd/system/zeronet.service
echo 'Group=zeronet' >> /etc/systemd/system/zeronet.service echo 'Group=zeronet' >> /etc/systemd/system/zeronet.service
echo 'WorkingDirectory=/opt/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 '' >> /etc/systemd/system/zeronet.service
echo 'TimeoutSec=300' >> /etc/systemd/system/zeronet.service echo 'TimeoutSec=300' >> /etc/systemd/system/zeronet.service
echo '' >> /etc/systemd/system/zeronet.service echo '' >> /etc/systemd/system/zeronet.service

View File

@ -324,7 +324,7 @@ zeronetavahi
existing_zeronet=$(ps aux | grep zeronet | wc -l) existing_zeronet=$(ps aux | grep zeronet | wc -l)
if [ $existing_zeronet -lt "2" ]; then 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 fi
if which firefox > /dev/null; then if which firefox > /dev/null; then

View File

@ -49,7 +49,7 @@ BLOGS_FILE=$ZERONET_INSTALL/freedombone-blogs
FORUM_FILE=$ZERONET_INSTALL/freedombone-fora FORUM_FILE=$ZERONET_INSTALL/freedombone-fora
TOX_USERS_FILE=$ZERONET_INSTALL/freedombone-tox-users TOX_USERS_FILE=$ZERONET_INSTALL/freedombone-tox-users
ZERONET_INDEX=/home/$MY_USERNAME/mesh.html 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 { function create_index {
if [ -f $ZERONET_INDEX ]; then if [ -f $ZERONET_INDEX ]; then