Explorar el Código

Fixing the tahoe daemon

Bob Mottram hace 8 años
padre
commit
32cc9f86da
Se han modificado 1 ficheros con 14 adiciones y 5 borrados
  1. 14
    5
      src/freedombone-app-tahoelafs

+ 14
- 5
src/freedombone-app-tahoelafs Ver fichero

104
     git submodule update --init --recursive
104
     git submodule update --init --recursive
105
     virtualenv venv
105
     virtualenv venv
106
     venv/bin/pip install --editable .
106
     venv/bin/pip install --editable .
107
-    chown -R tahoelafs:tahoelafs /home/tahoelafs
107
+    chown -R tahoelafs:debian-tor /home/tahoelafs
108
     systemctl start tahoelafs
108
     systemctl start tahoelafs
109
 }
109
 }
110
 
110
 
132
         exit 246833
132
         exit 246833
133
     fi
133
     fi
134
     rm -rf /home/tahoelafs/data
134
     rm -rf /home/tahoelafs/data
135
-    chown -R tahoelafs:tahoelafs /home/tahoelafs
135
+    chown -R tahoelafs:debian-tor /home/tahoelafs
136
     systemctl start tahoelafs
136
     systemctl start tahoelafs
137
     echo $"Restore complete"
137
     echo $"Restore complete"
138
 }
138
 }
161
         exit 623925
161
         exit 623925
162
     fi
162
     fi
163
     rm -rf /home/tahoelafs/data-old
163
     rm -rf /home/tahoelafs/data-old
164
-    chown -R tahoelafs:tahoelafs /home/tahoelafs
164
+    chown -R tahoelafs:debian-tor /home/tahoelafs
165
     systemctl start tahoelafs
165
     systemctl start tahoelafs
166
     echo $"Restore complete"
166
     echo $"Restore complete"
167
 }
167
 }
257
     if [ ! -d /home/tahoelafs ]; then
257
     if [ ! -d /home/tahoelafs ]; then
258
         # add a gogs user account
258
         # add a gogs user account
259
         adduser --disabled-login --gecos 'tahoe-lafs' tahoelafs
259
         adduser --disabled-login --gecos 'tahoe-lafs' tahoelafs
260
+        adduser tahoelafs debian-tor
260
     fi
261
     fi
261
 
262
 
262
     if [ -d /home/tahoelafs/Maildir ]; then
263
     if [ -d /home/tahoelafs/Maildir ]; then
289
     rm /home/tahoelafs/.procmailrc
290
     rm /home/tahoelafs/.procmailrc
290
 
291
 
291
     # set permissions
292
     # set permissions
292
-    chown -R tahoelafs:tahoelafs /home/tahoelafs
293
+    chown -R tahoelafs:debian-tor /home/tahoelafs
293
 
294
 
294
     # create the introducer config
295
     # create the introducer config
295
     su -c "$TAHOE_COMMAND create-introducer -C /home/tahoelafs/data --hide-ip --hostname=127.0.0.1" - tahoelafs
296
     su -c "$TAHOE_COMMAND create-introducer -C /home/tahoelafs/data --hide-ip --hostname=127.0.0.1" - tahoelafs
302
     TAHOELAFS_ONION_HOSTNAME=$(add_onion_service tahoelafs ${TAHOELAFS_PORT} ${TAHOELAFS_ONION_PORT})
303
     TAHOELAFS_ONION_HOSTNAME=$(add_onion_service tahoelafs ${TAHOELAFS_PORT} ${TAHOELAFS_ONION_PORT})
303
     tahoelafs_setup_config $TAHOELAFS_CONFIG
304
     tahoelafs_setup_config $TAHOELAFS_CONFIG
304
 
305
 
306
+    su -c '/home/tahoelafs/tahoelafs/venv/bin/python2 /home/tahoelafs/tahoelafs/venv/bin/tahoe start /home/tahoelafs/data' - tahoelafs
307
+    TAHOELAFS_INTRODUCER=/home/tahoelafs/data/tahoe-introducer.tac
308
+    if [ ! -f $TAHOELAFS_INTRODUCER ]; then
309
+        echo $'Introducer file not found'
310
+        exit 782253
311
+    fi
312
+
305
     # create a daemon
313
     # create a daemon
306
     TAHOELAFS_DAEMON_FILE=/etc/systemd/system/tahoelafs.service
314
     TAHOELAFS_DAEMON_FILE=/etc/systemd/system/tahoelafs.service
307
     echo '[Unit]' > $TAHOELAFS_DAEMON_FILE
315
     echo '[Unit]' > $TAHOELAFS_DAEMON_FILE
314
     echo "User=tahoelafs" >> $TAHOELAFS_DAEMON_FILE
322
     echo "User=tahoelafs" >> $TAHOELAFS_DAEMON_FILE
315
     echo "Group=tahoelafs" >> $TAHOELAFS_DAEMON_FILE
323
     echo "Group=tahoelafs" >> $TAHOELAFS_DAEMON_FILE
316
     echo "WorkingDirectory=/home/tahoelafs/tahoelafs" >> $TAHOELAFS_DAEMON_FILE
324
     echo "WorkingDirectory=/home/tahoelafs/tahoelafs" >> $TAHOELAFS_DAEMON_FILE
317
-    echo "ExecStart=/home/tahoelafs/tahoelafs/venv/bin/tahoe start /home/tahoelafs/data; /home/tahoelafs/tahoelafs/venv/bin/tahoe run /home/tahoelafs/data" >> $TAHOELAFS_DAEMON_FILE
325
+    echo "ExecStart=/home/tahoelafs/tahoelafs/venv/bin/tahoe run /home/tahoelafs/data" >> $TAHOELAFS_DAEMON_FILE
318
     echo "ExecStop=/home/tahoelafs/tahoelafs/venv/bin/tahoe stop /home/tahoelafs/data" >> $TAHOELAFS_DAEMON_FILE
326
     echo "ExecStop=/home/tahoelafs/tahoelafs/venv/bin/tahoe stop /home/tahoelafs/data" >> $TAHOELAFS_DAEMON_FILE
319
     echo 'Restart=on-failure' >> $TAHOELAFS_DAEMON_FILE
327
     echo 'Restart=on-failure' >> $TAHOELAFS_DAEMON_FILE
328
+    echo 'RestartSec=10' >> $TAHOELAFS_DAEMON_FILE
320
     echo "Environment=\"USER=tahoelafs\" \"HOME=/home/tahoelafs\"" >> $TAHOELAFS_DAEMON_FILE
329
     echo "Environment=\"USER=tahoelafs\" \"HOME=/home/tahoelafs\"" >> $TAHOELAFS_DAEMON_FILE
321
     echo '' >> $TAHOELAFS_DAEMON_FILE
330
     echo '' >> $TAHOELAFS_DAEMON_FILE
322
     echo '[Install]' >> $TAHOELAFS_DAEMON_FILE
331
     echo '[Install]' >> $TAHOELAFS_DAEMON_FILE