Przeglądaj źródła

Restore config before recompiling pleoma

Bob Mottram 7 lat temu
rodzic
commit
63416610d9
1 zmienionych plików z 5 dodań i 4 usunięć
  1. 5
    4
      src/freedombone-app-pleroma

+ 5
- 4
src/freedombone-app-pleroma Wyświetl plik

@@ -464,6 +464,7 @@ function pleroma_set_background_image {
464 464
                 write_config_param "PLEROMA_BACKGROUND_IMAGE_URL" "$PLEROMA_BACKGROUND_IMAGE_URL"
465 465
                 if [[ $(pleroma_set_background_image_from_url $PLEROMA_DIR "$PLEROMA_DOMAIN_NAME" "$PLEROMA_BACKGROUND_IMAGE_URL" "$PLEROMA_TITLE" | tail -n 1) == "0" ]]; then
466 466
                     pleroma_recompile
467
+
467 468
                     dialog --title $"Set Pleroma login background" \
468 469
                            --msgbox $"The background image has been set" 6 60
469 470
                 fi
@@ -707,16 +708,16 @@ function upgrade_pleroma {
707 708
     set_repo_commit $PLEROMA_DIR "pleroma commit" "$PLEROMA_COMMIT" $PLEROMA_REPO
708 709
     chown -R pleroma:pleroma $PLEROMA_DIR
709 710
 
711
+    # restore the configuration
712
+    cp $PLEROMA_DIR/priv/static/static/config_prev.json $PLEROMA_DIR/priv/static/static/config.json
713
+    chown pleroma:pleroma $PLEROMA_DIR/priv/static/static/config.json
714
+
710 715
     sudo -u pleroma mix deps.get
711 716
     pleroma_recompile
712 717
 
713 718
     expire_pleroma_posts $PLEROMA_DOMAIN_NAME $PLEROMA_EXPIRE_MONTHS
714 719
     create_pleroma_blocklist
715 720
 
716
-    # restore the configuration
717
-    cp $PLEROMA_DIR/priv/static/static/config_prev.json $PLEROMA_DIR/priv/static/static/config.json
718
-    chown pleroma:pleroma $PLEROMA_DIR/priv/static/static/config.json
719
-
720 721
     systemctl restart pleroma
721 722
 }
722 723