浏览代码

Move remote mediagoblin restore to app script

Bob Mottram 8 年前
父节点
当前提交
ffb76f5d1d
共有 2 个文件被更改,包括 17 次插入24 次删除
  1. 16
    1
      src/freedombone-app-mediagoblin
  2. 1
    23
      src/freedombone-restore-remote

+ 16
- 1
src/freedombone-app-mediagoblin 查看文件

@@ -71,7 +71,22 @@ function backup_remote_mediagoblin {
71 71
 }
72 72
 
73 73
 function restore_remote_mediagoblin {
74
-	echo -n ''
74
+	if grep -q "Mediagoblin domain" $COMPLETION_FILE; then
75
+		MEDIAGOBLIN_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "Mediagoblin domain" | awk -F ':' '{print $2}')
76
+		if [ -d $SERVER_DIRECTORY/backup/mediagoblin ]; then
77
+			echo $"Restoring Mediagoblin installation"
78
+			temp_restore_dir=/root/tempmediagoblin
79
+			function_check restore_directory_from_friend
80
+			restore_directory_from_friend $temp_restore_dir mediagoblin
81
+			cp -r $temp_restore_dir/* /
82
+			if [ ! "$?" = "0" ]; then
83
+				exit 5626
84
+			fi
85
+			rm -rf $temp_restore_dir
86
+			echo $"Restore of Mediagoblin complete"
87
+		fi
88
+		chown -hR mediagoblin:www-data /var/www/$MEDIAGOBLIN_DOMAIN_NAME/htdocs
89
+	fi
75 90
 }
76 91
 
77 92
 function remove_mediagoblin {

+ 1
- 23
src/freedombone-restore-remote 查看文件

@@ -666,28 +666,6 @@ function restore_mailing_list {
666 666
 	fi
667 667
 }
668 668
 
669
-function restore_mediagoblin {
670
-	if [[ $RESTORE_APP != 'all' ]]; then
671
-		if [[ $RESTORE_APP != 'mediagoblin' ]]; then
672
-			return
673
-		fi
674
-	fi
675
-	if grep -q "Mediagoblin domain" $COMPLETION_FILE; then
676
-		MEDIAGOBLIN_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "Mediagoblin domain" | awk -F ':' '{print $2}')
677
-		if [ -d $SERVER_DIRECTORY/backup/mediagoblin ]; then
678
-			echo $"Restoring Mediagoblin installation"
679
-			temp_restore_dir=/root/tempmediagoblin
680
-			restore_directory_from_friend $temp_restore_dir mediagoblin
681
-			cp -r $temp_restore_dir/* /
682
-			if [ ! "$?" = "0" ]; then
683
-				exit 5626
684
-			fi
685
-			rm -rf $temp_restore_dir
686
-		fi
687
-		chown -hR mediagoblin:www-data /var/www/$MEDIAGOBLIN_DOMAIN_NAME/htdocs
688
-	fi
689
-}
690
-
691 669
 function restore_gogs {
692 670
 	export GVM_ROOT=$GVM_HOME
693 671
 	if [ -d $GVM_ROOT/bin ]; then
@@ -954,8 +932,8 @@ restore_certs
954 932
 restore_personal_settings
955 933
 restore_mailing_list
956 934
 restore_email
935
+#restore_apps remote
957 936
 
958
-restore_mediagoblin
959 937
 restore_gogs
960 938
 restore_wiki
961 939
 restore_blog