Browse Source

Introducer directory

Bob Mottram 8 years ago
parent
commit
22c6850300
1 changed files with 13 additions and 18 deletions
  1. 13
    18
      src/freedombone-app-tahoelafs

+ 13
- 18
src/freedombone-app-tahoelafs View File

108
 }
108
 }
109
 
109
 
110
 function backup_local_tahoelafs {
110
 function backup_local_tahoelafs {
111
-    source_directory=/home/tahoelafs/.tahoe-introducer
111
+    source_directory=/home/tahoelafs/data
112
     if [ ! -d $source_directory ]; then
112
     if [ ! -d $source_directory ]; then
113
         return
113
         return
114
     fi
114
     fi
124
     systemctl stop tahoelafs
124
     systemctl stop tahoelafs
125
     temp_restore_dir=/root/temptahoelafs
125
     temp_restore_dir=/root/temptahoelafs
126
     restore_directory_from_usb $temp_restore_dir tahoelafs
126
     restore_directory_from_usb $temp_restore_dir tahoelafs
127
-    mv /home/tahoelafs/.tahoe-introducer /home/tahoelafs/.tahoe-introducer-old
128
-    cp -r $temp_restore_dir/home/tahoelafs/.tahoe-introducer /home/tahoelafs/
127
+    mv /home/tahoelafs/data /home/tahoelafs/data-old
128
+    cp -r $temp_restore_dir/home/tahoelafs/data /home/tahoelafs/data
129
     if [ ! "$?" = "0" ]; then
129
     if [ ! "$?" = "0" ]; then
130
-        mv /home/tahoelafs/.tahoe-introducer-old /home/tahoelafs/.tahoe-introducer
130
+        mv /home/tahoelafs/data-old /home/tahoelafs/data
131
         exit 246833
131
         exit 246833
132
     fi
132
     fi
133
-    rm -rf /home/tahoelafs/.tahoe-introducer
133
+    rm -rf /home/tahoelafs/data
134
     chown -R tahoelafs:tahoelafs /home/tahoelafs
134
     chown -R tahoelafs:tahoelafs /home/tahoelafs
135
     systemctl start tahoelafs
135
     systemctl start tahoelafs
136
     echo $"Restore complete"
136
     echo $"Restore complete"
137
 }
137
 }
138
 
138
 
139
 function backup_remote_tahoelafs {
139
 function backup_remote_tahoelafs {
140
-    source_directory=/home/tahoelafs/.tahoe-introducer
140
+    source_directory=/home/tahoelafs/data
141
     if [ ! -d $source_directory ]; then
141
     if [ ! -d $source_directory ]; then
142
         return
142
         return
143
     fi
143
     fi
153
     systemctl stop tahoelafs
153
     systemctl stop tahoelafs
154
     temp_restore_dir=/root/temptahoelafs
154
     temp_restore_dir=/root/temptahoelafs
155
     restore_directory_from_friend $temp_restore_dir tahoelafs
155
     restore_directory_from_friend $temp_restore_dir tahoelafs
156
-    mv /home/tahoelafs/.tahoe-introducer /home/tahoelafs/.tahoe-introducer-old
157
-    cp -r $temp_restore_dir/home/tahoelafs/.tahoe-introducer /home/tahoelafs/
156
+    mv /home/tahoelafs/data /home/tahoelafs/data-old
157
+    cp -r $temp_restore_dir/home/tahoelafs/data /home/tahoelafs/data
158
     if [ ! "$?" = "0" ]; then
158
     if [ ! "$?" = "0" ]; then
159
-        mv /home/tahoelafs/.tahoe-introducer-old /home/tahoelafs/.tahoe-introducer
159
+        mv /home/tahoelafs/data-old /home/tahoelafs/data
160
         exit 623925
160
         exit 623925
161
     fi
161
     fi
162
-    rm -rf /home/tahoelafs/.tahoe-introducer-old
162
+    rm -rf /home/tahoelafs/data-old
163
     chown -R tahoelafs:tahoelafs /home/tahoelafs
163
     chown -R tahoelafs:tahoelafs /home/tahoelafs
164
     systemctl start tahoelafs
164
     systemctl start tahoelafs
165
     echo $"Restore complete"
165
     echo $"Restore complete"
213
         rm -rf /home/tahoelafs/Maildir
213
         rm -rf /home/tahoelafs/Maildir
214
     fi
214
     fi
215
 
215
 
216
-    if [ ! -d /home/tahoelafs/.tahoe-introducer ]; then
217
-        mkdir /home/tahoelafs/.tahoe-introducer
218
-    fi
219
-
220
     git_clone $TAHOELAFS_REPO /home/tahoelafs/tahoelafs
216
     git_clone $TAHOELAFS_REPO /home/tahoelafs/tahoelafs
221
     cd /home/tahoelafs/tahoelafs
217
     cd /home/tahoelafs/tahoelafs
222
     git checkout $TAHOELAFS_COMMIT -b $TAHOELAFS_COMMIT
218
     git checkout $TAHOELAFS_COMMIT -b $TAHOELAFS_COMMIT
246
 
242
 
247
     # create the introducer config
243
     # create the introducer config
248
     su -c "$TAHOE_COMMAND create-introducer -C /home/tahoelafs/data --hide-ip --hostname=127.0.0.1" - tahoelafs
244
     su -c "$TAHOE_COMMAND create-introducer -C /home/tahoelafs/data --hide-ip --hostname=127.0.0.1" - tahoelafs
249
-    TAHOELAFS_CONFIG=/home/tahoelafs/.tahoe-introducer/tahoe.cfg
245
+    TAHOELAFS_CONFIG=/home/tahoelafs/data/tahoe.cfg
250
     if [ ! -f $TAHOELAFS_CONFIG ]; then
246
     if [ ! -f $TAHOELAFS_CONFIG ]; then
251
         exit 62831
247
         exit 62831
252
     fi
248
     fi
267
     echo "User=tahoelafs" >> $TAHOELAFS_DAEMON_FILE
263
     echo "User=tahoelafs" >> $TAHOELAFS_DAEMON_FILE
268
     echo "Group=tahoelafs" >> $TAHOELAFS_DAEMON_FILE
264
     echo "Group=tahoelafs" >> $TAHOELAFS_DAEMON_FILE
269
     echo "WorkingDirectory=/home/tahoelafs/tahoelafs" >> $TAHOELAFS_DAEMON_FILE
265
     echo "WorkingDirectory=/home/tahoelafs/tahoelafs" >> $TAHOELAFS_DAEMON_FILE
270
-    echo "ExecStart=/home/tahoelafs/tahoelafs/venv/bin/tahoe start /home/tahoelafs/data/.tahoe-introducer" >> $TAHOELAFS_DAEMON_FILE
271
-    echo "ExecStop=/home/tahoelafs/tahoelafs/venv/bin/tahoe stop /home/tahoelafs/data/.tahoe-introducer" >> $TAHOELAFS_DAEMON_FILE
266
+    echo "ExecStart=/home/tahoelafs/tahoelafs/venv/bin/tahoe start /home/tahoelafs/data" >> $TAHOELAFS_DAEMON_FILE
267
+    echo "ExecStop=/home/tahoelafs/tahoelafs/venv/bin/tahoe stop /home/tahoelafs/data" >> $TAHOELAFS_DAEMON_FILE
272
     echo 'Restart=on-failure' >> $TAHOELAFS_DAEMON_FILE
268
     echo 'Restart=on-failure' >> $TAHOELAFS_DAEMON_FILE
273
     echo "Environment=\"USER=tahoelafs\" \"HOME=/home/tahoelafs\"" >> $TAHOELAFS_DAEMON_FILE
269
     echo "Environment=\"USER=tahoelafs\" \"HOME=/home/tahoelafs\"" >> $TAHOELAFS_DAEMON_FILE
274
     echo '' >> $TAHOELAFS_DAEMON_FILE
270
     echo '' >> $TAHOELAFS_DAEMON_FILE
279
     systemctl start tahoelafs
275
     systemctl start tahoelafs
280
 
276
 
281
     set_completion_param "tahoelafs commit" "$TAHOELAFS_COMMIT"
277
     set_completion_param "tahoelafs commit" "$TAHOELAFS_COMMIT"
282
-    install_completed tahoelafs
283
 
278
 
284
     APP_INSTALLED=1
279
     APP_INSTALLED=1
285
 }
280
 }