瀏覽代碼

Move location of onion routing setup for pleroma

Bob Mottram 7 年之前
父節點
當前提交
a6b4cede0a
共有 1 個檔案被更改,包括 4 行新增3 行删除
  1. 4
    3
      src/freedombone-app-pleroma

+ 4
- 3
src/freedombone-app-pleroma 查看文件

@@ -446,9 +446,6 @@ function pleroma_create_database {
446 446
     fi
447 447
     sed -i 's|import_config|# import_config|g' $pleroma_secret
448 448
 
449
-    sed -i '/url:/a config :pleroma, :http, proxy_url: {:socks5, :localhost, 9050}' $pleroma_secret
450
-    sed -i 's|config :pleroma, :http, proxy_url:|# config :pleroma, :http, proxy_url:|g' $PLEROMA_DIR/config/config.exs
451
-
452 449
     cd "$PLEROMA_DIR" || exit 678245245724
453 450
     chown -R pleroma:pleroma $PLEROMA_DIR/*
454 451
     if ! sudo -u pleroma mix local.rebar --force; then
@@ -1295,6 +1292,10 @@ function install_pleroma {
1295 1292
     sed -i 's|redirect_on_failure:.*|redirect_on_failure: false|g' $PLEROMA_DIR/config/config.exs
1296 1293
     sed -i 's|:chat, enabled:.*|:chat, enabled: false|g' $PLEROMA_DIR/config/config.exs
1297 1294
 
1295
+    # onion routing
1296
+    sed -i '/url:/a config :pleroma, :http, proxy_url: {:socks5, :localhost, 9050}' $pleroma_secret
1297
+    sed -i 's|config :pleroma, :http, proxy_url:|# config :pleroma, :http, proxy_url:|g' $PLEROMA_DIR/config/config.exs
1298
+
1298 1299
     # set registrations open initially
1299 1300
     sed -i 's|registrations_open:.*|registrations_open: true,|g' $PLEROMA_DIR/config/config.exs
1300 1301
     sed -i 's|"registrationOpen":.*|"registrationOpen": true,|g' $PLEROMA_DIR/priv/static/static/config.json