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

Remove references to config.exs

parent 2cd3bbef
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/freedombone-app-pleroma
+ 10
− 54
View file @ 9ca8018a
......@@ -333,8 +333,6 @@ function pleroma_setting_registration {
sed -i 's|registrations_open:| registrations_open:|g' $pleroma_secret
sed -i 's|registrationOpen:.*|registrationOpen: true,|g' $pleroma_secret
fi
sed -i 's|registrations_open: false|registrations_open: true|g' $PLEROMA_DIR/config/config.exs
sed -i 's|registrations_open: False|registrations_open: true|g' $PLEROMA_DIR/config/config.exs
sed -i 's|registrations_open: false|registrations_open: true|g' $pleroma_secret
sed -i 's|registrations_open: False|registrations_open: true|g' $pleroma_secret
sed -i 's|"registrationOpen": false|"registrationOpen": true|g' $PLEROMA_DIR/priv/static/static/config.json
......@@ -349,8 +347,6 @@ function pleroma_setting_registration {
sed -i 's|registrations_open:| registrations_open:|g' $pleroma_secret
sed -i 's|registrationOpen:.*|registrationOpen: false,|g' $pleroma_secret
fi
sed -i 's|registrations_open: true|registrations_open: false|g' $PLEROMA_DIR/config/config.exs
sed -i 's|registrations_open: True|registrations_open: false|g' $PLEROMA_DIR/config/config.exs
sed -i 's|registrations_open: true|registrations_open: false|g' $pleroma_secret
sed -i 's|registrations_open: True|registrations_open: false|g' $pleroma_secret
sed -i 's|"registrationOpen": true|"registrationOpen": false|g' $PLEROMA_DIR/priv/static/static/config.json
......@@ -363,10 +359,10 @@ function pleroma_setting_registration {
function pleroma_enable_chat {
if [[ "$1" == 't'* || "$1" == 'y'* || "$1" == 'T'* || "$1" == 'Y'* ]]; then
sed -i 's|"chatDisabled":.*|"chatDisabled": false,|g' $PLEROMA_DIR/priv/static/static/config.json
sed -i 's|:chat, enabled:.*|:chat, enabled: true|g' $PLEROMA_DIR/config/config.exs
sed -i 's|:chat, enabled:.*|:chat, enabled: true|g' $pleroma_secret
else
sed -i 's|"chatDisabled":.*|"chatDisabled": true,|g' $PLEROMA_DIR/priv/static/static/config.json
sed -i 's|:chat, enabled:.*|:chat, enabled: false|g' $PLEROMA_DIR/config/config.exs
sed -i 's|:chat, enabled:.*|:chat, enabled: false|g' $pleroma_secret
fi
pleroma_recompile
}
......@@ -989,7 +985,7 @@ function pleroma_set_title {
write_config_param "PLEROMA_TITLE" "$PLEROMA_TITLE"
sed -i "s|\"name\":.*|\"name\": \"${PLEROMA_TITLE}\",|g" $PLEROMA_DIR/static/config.json
sed -i "s|\"name\":.*|\"name\": \"${PLEROMA_TITLE}\",|g" $PLEROMA_DIR/priv/static/static/config.json
sed -i "s|name: .*|name: \"${PLEROMA_TITLE}\",|g" $PLEROMA_DIR/config/config.exs
sed -i "s|name: .*|name: \"${PLEROMA_TITLE}\",|g" $pleroma_secret
systemctl restart pleroma
dialog --title $"Set Pleroma title" \
--msgbox $"The title has been set" 6 60
......@@ -1045,15 +1041,11 @@ function pleroma_disable_registrations {
--yesno $"\\nDo you wish to disable new registrations?" 10 60
sel=$?
case $sel in
0) sed -i 's|registrations_open: true|registrations_open: false|g' $PLEROMA_DIR/config/config.exs
sed -i 's|registrations_open: True|registrations_open: false|g' $PLEROMA_DIR/config/config.exs
sed -i 's|registrationOpen:.*|registrationOpen: false,|g' $pleroma_secret
0) sed -i 's|registrationOpen:.*|registrationOpen: false,|g' $pleroma_secret
sed -i 's|"registrationOpen": true|"registrationOpen": false|g' $PLEROMA_DIR/priv/static/static/config.json
sed -i 's|"registrationOpen": True|"registrationOpen": false|g' $PLEROMA_DIR/priv/static/static/config.json
;;
1) sed -i 's|registrations_open: false|registrations_open: true|g' $PLEROMA_DIR/config/config.exs
sed -i 's|registrations_open: False|registrations_open: true|g' $PLEROMA_DIR/config/config.exs
sed -i 's|registrationOpen:.*|registrationOpen: true,|g' $pleroma_secret
1) sed -i 's|registrationOpen:.*|registrationOpen: true,|g' $pleroma_secret
sed -i 's|"registrationOpen": false|"registrationOpen": true|g' $PLEROMA_DIR/priv/static/static/config.json
sed -i 's|"registrationOpen": False|"registrationOpen": true|g' $PLEROMA_DIR/priv/static/static/config.json
;;
......@@ -1220,7 +1212,7 @@ function configure_interactive_pleroma {
do
chatenabled=
enablechatstr=$'Enable chat system'
if grep -q ':chat, enabled: true' $PLEROMA_DIR/config/config.exs; then
if grep -q ':chat, enabled: true' $pleroma_secret; then
chatenabled=1
enablechatstr=$'Disable chat system'
fi
......@@ -1272,7 +1264,6 @@ function configure_interactive_pleroma {
function pleroma_disable_tor {
if grep -q '9050' $pleroma_secret; then
sed -i '/9050/d' $pleroma_secret
sed -i 's|# config :pleroma, :http, proxy_url:|config :pleroma, :http, proxy_url:|g' $PLEROMA_DIR/config/config.exs
pleroma_recompile
fi
}
......@@ -1284,10 +1275,6 @@ function pleroma_enable_tor {
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
......@@ -1296,10 +1283,6 @@ function pleroma_enable_tor {
sed -i '/url:/a config :pleroma, :http, proxy_url: {:socks5, :localhost, 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
}
......@@ -1335,14 +1318,6 @@ function upgrade_pleroma {
fi
fi
# if there is disagreement in the registrations state then
# default to the value used in config.json
if grep -q '"registrationOpen": false' $PLEROMA_DIR/priv/static/static/config.json; then
if grep -q 'registrations_open: true' $PLEROMA_DIR/config/config.exs; then
pleroma_setting_registration 0
fi
fi
#pleroma_enable_tor
CURR_PLEROMA_COMMIT=$(get_completion_param "pleroma commit")
......@@ -1351,12 +1326,9 @@ function upgrade_pleroma {
fi
pleroma_registrations=open
if grep -q 'registrations_open: false' $PLEROMA_DIR/config/config.exs; then
pleroma_registrations=
fi
pleroma_chat_enabled=1
if grep -q ':chat, enabled: false' $PLEROMA_DIR/config/config.exs; then
if grep -q ':chat, enabled: false' $pleroma_secret; then
pleroma_chat_enabled=
fi
......@@ -1470,16 +1442,14 @@ function upgrade_pleroma {
fi
if [ ! $pleroma_registrations ]; then
sed -i 's|registrations_open: true|registrations_open: false|g' $PLEROMA_DIR/config/config.exs
sed -i 's|registrations_open: True|registrations_open: false|g' $PLEROMA_DIR/config/config.exs
sed -i 's|registrationOpen: true|registrationOpen: false|g' $pleroma_secret
sed -i 's|registrationOpen: True|registrationOpen: false|g' $pleroma_secret
fi
if [ ! $pleroma_chat_enabled ]; then
sed -i 's|config :pleroma, :chat.*|config :pleroma, :chat, enabled: false|g' $PLEROMA_DIR/config/config.exs
sed -i 's|config :pleroma, :chat.*|config :pleroma, :chat, enabled: false|g' $pleroma_secret
else
sed -i 's|config :pleroma, :chat.*|config :pleroma, :chat, enabled: true|g' $PLEROMA_DIR/config/config.exs
sed -i 's|config :pleroma, :chat.*|config :pleroma, :chat, enabled: true|g' $pleroma_secret
fi
if ! grep -q ":http_security," $pleroma_secret; then
......@@ -1521,16 +1491,6 @@ function upgrade_pleroma {
pleroma_enable_web_push_encryption
# if there is a difference between registrations state then default to the one in the secret config
if grep -q 'registrations_open: false' "$pleroma_secret"; then
if grep -q 'registrations_open: true' $PLEROMA_DIR/config/config.exs; then
sed -i 's|registrations_open: true|registrations_open: false|g' $PLEROMA_DIR/config/config.exs
fi
if grep -q 'registrations_open: True' $PLEROMA_DIR/config/config.exs; then
sed -i 's|registrations_open: True|registrations_open: false|g' $PLEROMA_DIR/config/config.exs
fi
fi
pleroma_deprecate_fe
if ! grep -q ':frontend_configurations' "$pleroma_secret"; then
......@@ -2071,18 +2031,14 @@ function install_pleroma {
# avoid mixed content warnings
sed -i 's|config :pleroma, :media_proxy.*|config :pleroma, :media_proxy, enabled: false|g' $PLEROMA_DIR/config/config.exs
sed -i 's|redirect_on_failure:.*|redirect_on_failure: false|g' $PLEROMA_DIR/config/config.exs
sed -i 's|:chat, enabled:.*|:chat, enabled: false|g' $PLEROMA_DIR/config/config.exs
sed -i 's|:chat, enabled:.*|:chat, enabled: false|g' $pleroma_secret
# onion routing
if ! grep -q '9050' $pleroma_secret; then
sed -i '/url:/a config :pleroma, :http, proxy_url: {:socks5, :localhost, 9050}' $pleroma_secret
fi
sed -i 's|config :pleroma, :http, proxy_url:|# config :pleroma, :http, proxy_url:|g' $PLEROMA_DIR/config/config.exs
# set registrations closed initially
sed -i 's|registrations_open:.*|registrations_open: false,|g' $PLEROMA_DIR/config/config.exs
sed -i 's|registrationOpen:.*|registrationOpen: false,|g' $pleroma_secret
sed -i 's|"registrationOpen":.*|"registrationOpen": false,|g' $PLEROMA_DIR/priv/static/static/config.json
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment