Browse Source

Specify zeronet config file

Bob Mottram 9 years ago
parent
commit
c60dd95eed
3 changed files with 3 additions and 3 deletions
  1. 1
    1
      src/freedombone
  2. 1
    1
      src/freedombone-meshweb
  3. 1
    1
      src/zeronetavahi

+ 1
- 1
src/freedombone View File

@@ -1860,7 +1860,7 @@ function install_zeronet {
1860 1860
   echo 'User=zeronet' >> /etc/systemd/system/zeronet.service
1861 1861
   echo 'Group=zeronet' >> /etc/systemd/system/zeronet.service
1862 1862
   echo 'WorkingDirectory=/opt/zeronet' >> /etc/systemd/system/zeronet.service
1863
-  echo "ExecStart=/usr/bin/python zeronet.py --ip_external ${DEFAULT_DOMAIN_NAME}.local" >> /etc/systemd/system/zeronet.service
1863
+  echo "ExecStart=/usr/bin/python zeronet.py --ip_external ${DEFAULT_DOMAIN_NAME}.local --config_file /opt/zeronet/zeronet.conf" >> /etc/systemd/system/zeronet.service
1864 1864
   echo '' >> /etc/systemd/system/zeronet.service
1865 1865
   echo 'TimeoutSec=300' >> /etc/systemd/system/zeronet.service
1866 1866
   echo '' >> /etc/systemd/system/zeronet.service

+ 1
- 1
src/freedombone-meshweb View File

@@ -324,7 +324,7 @@ zeronetavahi
324 324
 
325 325
 existing_zeronet=$(ps aux | grep zeronet | wc -l)
326 326
 if [ $existing_zeronet -lt "2" ]; then
327
-    python zeronet.py --ip_external $(hostname).local &
327
+    python zeronet.py --ip_external $(hostname).local --config_file $ZERONET_DIR/zeronet.conf &
328 328
 fi
329 329
 
330 330
 if which firefox > /dev/null; then

+ 1
- 1
src/zeronetavahi View File

@@ -49,7 +49,7 @@ BLOGS_FILE=$ZERONET_INSTALL/freedombone-blogs
49 49
 FORUM_FILE=$ZERONET_INSTALL/freedombone-fora
50 50
 TOX_USERS_FILE=$ZERONET_INSTALL/freedombone-tox-users
51 51
 ZERONET_INDEX=/home/$MY_USERNAME/mesh.html
52
-ZERONET_CONFIG=/home/$MY_USERNAME/.config/zeronet/zeronet.conf
52
+ZERONET_CONFIG=$ZERONET_INSTALL/zeronet.conf
53 53
 
54 54
 function create_index {
55 55
     if [ -f $ZERONET_INDEX ]; then