Procházet zdrojové kódy

Specify zeronet config file

Bob Mottram před 9 roky
rodič
revize
c60dd95eed
3 změnil soubory, kde provedl 3 přidání a 3 odebrání
  1. 1
    1
      src/freedombone
  2. 1
    1
      src/freedombone-meshweb
  3. 1
    1
      src/zeronetavahi

+ 1
- 1
src/freedombone Zobrazit soubor

1860
   echo 'User=zeronet' >> /etc/systemd/system/zeronet.service
1860
   echo 'User=zeronet' >> /etc/systemd/system/zeronet.service
1861
   echo 'Group=zeronet' >> /etc/systemd/system/zeronet.service
1861
   echo 'Group=zeronet' >> /etc/systemd/system/zeronet.service
1862
   echo 'WorkingDirectory=/opt/zeronet' >> /etc/systemd/system/zeronet.service
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
   echo '' >> /etc/systemd/system/zeronet.service
1864
   echo '' >> /etc/systemd/system/zeronet.service
1865
   echo 'TimeoutSec=300' >> /etc/systemd/system/zeronet.service
1865
   echo 'TimeoutSec=300' >> /etc/systemd/system/zeronet.service
1866
   echo '' >> /etc/systemd/system/zeronet.service
1866
   echo '' >> /etc/systemd/system/zeronet.service

+ 1
- 1
src/freedombone-meshweb Zobrazit soubor

324
 
324
 
325
 existing_zeronet=$(ps aux | grep zeronet | wc -l)
325
 existing_zeronet=$(ps aux | grep zeronet | wc -l)
326
 if [ $existing_zeronet -lt "2" ]; then
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
 fi
328
 fi
329
 
329
 
330
 if which firefox > /dev/null; then
330
 if which firefox > /dev/null; then

+ 1
- 1
src/zeronetavahi Zobrazit soubor

49
 FORUM_FILE=$ZERONET_INSTALL/freedombone-fora
49
 FORUM_FILE=$ZERONET_INSTALL/freedombone-fora
50
 TOX_USERS_FILE=$ZERONET_INSTALL/freedombone-tox-users
50
 TOX_USERS_FILE=$ZERONET_INSTALL/freedombone-tox-users
51
 ZERONET_INDEX=/home/$MY_USERNAME/mesh.html
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
 function create_index {
54
 function create_index {
55
     if [ -f $ZERONET_INDEX ]; then
55
     if [ -f $ZERONET_INDEX ]; then