Browse Source

Remove proxy entry from main pleroma config

Bob Mottram 6 years ago
parent
commit
adcfed0555
1 changed files with 27 additions and 4 deletions
  1. 27
    4
      src/freedombone-app-pleroma

+ 27
- 4
src/freedombone-app-pleroma View File

@@ -726,6 +726,32 @@ function configure_interactive_pleroma {
726 726
     done
727 727
 }
728 728
 
729
+function pleroma_upgrade_tor {
730
+    pleroma_tor_update=
731
+
732
+    if ! grep -q '9050' $pleroma_secret; then
733
+        pleroma_tor_update=1
734
+    fi
735
+
736
+    if ! grep -q '# config :pleroma, :http, proxy_url:' $PLEROMA_DIR/config/config.exs; then
737
+        pleroma_tor_update=1
738
+    fi
739
+
740
+    if [ ! $pleroma_tor_update ]; then
741
+        return
742
+    fi
743
+
744
+    if ! grep -q '9050' $pleroma_secret; then
745
+        sed -i '/url: /aconfig :pleroma, :http, proxy_url: "127.0.0.1:9050"' $pleroma_secret
746
+    fi
747
+
748
+    if ! grep -q '# config :pleroma, :http, proxy_url:' $PLEROMA_DIR/config/config.exs; then
749
+        sed -i 's|config :pleroma, :http, proxy_url:|# config :pleroma, :http, proxy_url:|g' $PLEROMA_DIR/config/config.exs
750
+    fi
751
+
752
+    pleroma_recompile
753
+}
754
+
729 755
 function upgrade_pleroma {
730 756
     read_config_param PLEROMA_DOMAIN_NAME
731 757
     read_config_param PLEROMA_EXPIRE_MONTHS
@@ -740,10 +766,7 @@ function upgrade_pleroma {
740 766
         create_pleroma_blocklist
741 767
     fi
742 768
 
743
-    if ! grep -q '9050' $pleroma_secret; then
744
-        sed -i '/url: /aconfig :pleroma, :http, proxy_url: "127.0.0.1:9050"' $pleroma_secret
745
-        pleroma_recompile
746
-    fi
769
+    pleroma_upgrade_tor
747 770
 
748 771
     CURR_PLEROMA_COMMIT=$(get_completion_param "pleroma commit")
749 772
     if [[ "$CURR_PLEROMA_COMMIT" == "$PLEROMA_COMMIT" ]]; then