浏览代码

Restart gogs after restore

Bob Mottram 7 年前
父节点
当前提交
3f5a1bfdd8
共有 1 个文件被更改,包括 17 次插入9 次删除
  1. 17
    9
      src/freedombone-app-gogs

+ 17
- 9
src/freedombone-app-gogs 查看文件

261
         function_check gogs_create_database
261
         function_check gogs_create_database
262
         gogs_create_database
262
         gogs_create_database
263
 
263
 
264
+        GOGS_CONFIG_PATH=/home/${GOGS_USERNAME}/custom/conf
265
+        GOGS_CONFIG_FILE=${GOGS_CONFIG_PATH}/app.ini
266
+
264
         function_check restore_database
267
         function_check restore_database
265
         restore_database gogs ${GIT_DOMAIN_NAME}
268
         restore_database gogs ${GIT_DOMAIN_NAME}
266
         temp_restore_dir=/root/tempgogs
269
         temp_restore_dir=/root/tempgogs
267
         if [ -d ${USB_MOUNT}/backup/gogs ]; then
270
         if [ -d ${USB_MOUNT}/backup/gogs ]; then
268
             echo $"Restoring Gogs settings"
271
             echo $"Restoring Gogs settings"
269
-            if [ ! -d /home/${GOGS_USERNAME}/custom/conf ]; then
270
-                mkdir -p /home/${GOGS_USERNAME}/custom/conf
272
+            if [ ! -d $GOGS_CONFIG_PATH ]; then
273
+                mkdir -p $GOGS_CONFIG_PATH
274
+            fi
275
+            if [ -d /root/tempgogs/home/${GOGS_USERNAME}/custom ]; then
276
+                cp -r /root/tempgogs/home/${GOGS_USERNAME}/custom/* /home/${GOGS_USERNAME}/custom/
277
+            else
278
+                cp -r /root/tempgogs/* /home/${GOGS_USERNAME}/custom/
271
             fi
279
             fi
272
-            cp -r ${temp_restore_dir}/conf/* /home/${GOGS_USERNAME}/custom/conf/
273
             if [ ! "$?" = "0" ]; then
280
             if [ ! "$?" = "0" ]; then
274
                 function_check set_user_permissions
281
                 function_check set_user_permissions
275
                 set_user_permissions
282
                 set_user_permissions
319
             chown -R ${GOGS_USERNAME}:${GOGS_USERNAME} /home/${GOGS_USERNAME}
326
             chown -R ${GOGS_USERNAME}:${GOGS_USERNAME} /home/${GOGS_USERNAME}
320
         fi
327
         fi
321
 
328
 
322
-        GOGS_CONFIG_PATH=/home/${GOGS_USERNAME}/custom/conf
323
-        GOGS_CONFIG_FILE=${GOGS_CONFIG_PATH}/app.ini
324
         MARIADB_PASSWORD=$(${PROJECT_NAME}-pass -u root -a mariadb)
329
         MARIADB_PASSWORD=$(${PROJECT_NAME}-pass -u root -a mariadb)
325
         sed -i "s|PASSWD =.*|PASSWD = $MARIADB_PASSWORD|g" ${GOGS_CONFIG_FILE}
330
         sed -i "s|PASSWD =.*|PASSWD = $MARIADB_PASSWORD|g" ${GOGS_CONFIG_FILE}
326
         MARIADB_PASSWORD=
331
         MARIADB_PASSWORD=
332
+        systemctl restart gogs
327
     fi
333
     fi
328
 }
334
 }
329
 
335
 
363
         function_check gogs_create_database
369
         function_check gogs_create_database
364
         gogs_create_database
370
         gogs_create_database
365
 
371
 
372
+        GOGS_CONFIG_PATH=/home/${GOGS_USERNAME}/custom/conf
373
+        GOGS_CONFIG_FILE=${GOGS_CONFIG_PATH}/app.ini
374
+
366
         function_check restore_database_from_friend
375
         function_check restore_database_from_friend
367
         restore_database_from_friend gogs ${GIT_DOMAIN_NAME}
376
         restore_database_from_friend gogs ${GIT_DOMAIN_NAME}
368
         if [ -d ${SERVER_DIRECTORY}/backup/gogs ]; then
377
         if [ -d ${SERVER_DIRECTORY}/backup/gogs ]; then
369
-            if [ ! -d /home/${GOGS_USERNAME}/custom ]; then
370
-                mkdir -p /home/${GOGS_USERNAME}/custom
378
+            if [ ! -d $GOGS_CONFIG_PATH ]; then
379
+                mkdir -p $GOGS_CONFIG_PATH
371
             fi
380
             fi
372
             if [ -d /root/tempgogs/home/${GOGS_USERNAME}/custom ]; then
381
             if [ -d /root/tempgogs/home/${GOGS_USERNAME}/custom ]; then
373
                 cp -r /root/tempgogs/home/${GOGS_USERNAME}/custom/* /home/${GOGS_USERNAME}/custom/
382
                 cp -r /root/tempgogs/home/${GOGS_USERNAME}/custom/* /home/${GOGS_USERNAME}/custom/
410
             echo $"Restore of Gogs complete"
419
             echo $"Restore of Gogs complete"
411
         fi
420
         fi
412
 
421
 
413
-        GOGS_CONFIG_PATH=/home/${GOGS_USERNAME}/custom/conf
414
-        GOGS_CONFIG_FILE=${GOGS_CONFIG_PATH}/app.ini
415
         MARIADB_PASSWORD=$(${PROJECT_NAME}-pass -u root -a mariadb)
422
         MARIADB_PASSWORD=$(${PROJECT_NAME}-pass -u root -a mariadb)
416
         sed -i "s|PASSWD =.*|PASSWD = $MARIADB_PASSWORD|g" ${GOGS_CONFIG_FILE}
423
         sed -i "s|PASSWD =.*|PASSWD = $MARIADB_PASSWORD|g" ${GOGS_CONFIG_FILE}
417
         MARIADB_PASSWORD=
424
         MARIADB_PASSWORD=
425
+        systemctl restart gogs
418
     fi
426
     fi
419
 }
427
 }
420
 
428