Skip to content
Snippets Groups Projects
Commit adcfed05 authored by Bob Mottram's avatar Bob Mottram
Browse files

Remove proxy entry from main pleroma config

parent 21d54bc2
No related branches found
No related tags found
No related merge requests found
...@@ -726,6 +726,32 @@ function configure_interactive_pleroma { ...@@ -726,6 +726,32 @@ function configure_interactive_pleroma {
done done
} }
function pleroma_upgrade_tor {
pleroma_tor_update=
if ! grep -q '9050' $pleroma_secret; then
pleroma_tor_update=1
fi
if ! grep -q '# config :pleroma, :http, proxy_url:' $PLEROMA_DIR/config/config.exs; then
pleroma_tor_update=1
fi
if [ ! $pleroma_tor_update ]; then
return
fi
if ! grep -q '9050' $pleroma_secret; then
sed -i '/url: /aconfig :pleroma, :http, proxy_url: "127.0.0.1:9050"' $pleroma_secret
fi
if ! grep -q '# config :pleroma, :http, proxy_url:' $PLEROMA_DIR/config/config.exs; then
sed -i 's|config :pleroma, :http, proxy_url:|# config :pleroma, :http, proxy_url:|g' $PLEROMA_DIR/config/config.exs
fi
pleroma_recompile
}
function upgrade_pleroma { function upgrade_pleroma {
read_config_param PLEROMA_DOMAIN_NAME read_config_param PLEROMA_DOMAIN_NAME
read_config_param PLEROMA_EXPIRE_MONTHS read_config_param PLEROMA_EXPIRE_MONTHS
...@@ -740,10 +766,7 @@ function upgrade_pleroma { ...@@ -740,10 +766,7 @@ function upgrade_pleroma {
create_pleroma_blocklist create_pleroma_blocklist
fi fi
if ! grep -q '9050' $pleroma_secret; then pleroma_upgrade_tor
sed -i '/url: /aconfig :pleroma, :http, proxy_url: "127.0.0.1:9050"' $pleroma_secret
pleroma_recompile
fi
CURR_PLEROMA_COMMIT=$(get_completion_param "pleroma commit") CURR_PLEROMA_COMMIT=$(get_completion_param "pleroma commit")
if [[ "$CURR_PLEROMA_COMMIT" == "$PLEROMA_COMMIT" ]]; then if [[ "$CURR_PLEROMA_COMMIT" == "$PLEROMA_COMMIT" ]]; then
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment