Merge pull request 'change default allow_relay to false' (#309) from nocebo/akkoma...

Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/309

diff --combined config/config.exs
index 04fcd4964754058904b39fc462e9d7349ac8c065,301c2b05cc74e2c175fb3e48868485a72703396c..c98a18d39115a32b90d058d8df613f7d00284300
--- 1/config/config.exs
--- 2/config/config.exs
+++ b/config/config.exs
@@@ -180,8 -180,6 +180,8 @@@ config :tesla, :adapter, {Tesla.Adapter
  
  # Configures http settings, upstream proxy etc.
  config :pleroma, :http,
 +  pool_timeout: :timer.seconds(5),
 +  receive_timeout: :timer.seconds(15),
    proxy_url: nil,
    user_agent: :default,
    adapter: []
@@@ -217,7 -215,7 +217,7 @@@ config :pleroma, :instance
    federation_publisher_modules: [
      Pleroma.Web.ActivityPub.Publisher
    ],
-   allow_relay: true,
+   allow_relay: false,
    public: true,
    static_dir: "instance/static/",
    allowed_post_formats: [
@@@ -314,19 -312,19 +314,19 @@@ config :pleroma, :frontend_configuratio
      logo: "/static/logo.svg",
      logoMargin: ".1em",
      logoMask: true,
 -    minimalScopesMode: false,
      noAttachmentLinks: false,
      nsfwCensorImage: "",
      postContentType: "text/plain",
      redirectRootLogin: "/main/friends",
 -    redirectRootNoLogin: "/main/all",
 +    redirectRootNoLogin: "/main/public",
      scopeCopy: true,
      sidebarRight: false,
      showFeaturesPanel: true,
      showInstanceSpecificPanel: false,
      subjectLineBehavior: "email",
      theme: "pleroma-dark",
 -    webPushNotifications: false
 +    webPushNotifications: false,
 +    conversationDisplay: "linear"
    },
    masto_fe: %{
      showInstanceSpecificPanel: true
@@@ -489,7 -487,8 +489,7 @@@ config :pleroma, Pleroma.Web.Preload
  config :pleroma, :http_security,
    enabled: true,
    sts: false,
 -  sts_max_age: 31_536_000,
 -  ct_max_age: 2_592_000,
 +  sts_max_age: 63_072_000,
    referrer_policy: "same-origin"
  
  config :cors_plug,
@@@ -585,27 -584,6 +585,27 @@@ config :pleroma, :workers
      federator_incoming: 5,
      federator_outgoing: 5,
      search_indexing: 2
 +  ],
 +  timeout: [
 +    activity_expiration: :timer.seconds(5),
 +    token_expiration: :timer.seconds(5),
 +    filter_expiration: :timer.seconds(5),
 +    backup: :timer.seconds(900),
 +    federator_incoming: :timer.seconds(10),
 +    federator_outgoing: :timer.seconds(10),
 +    ingestion_queue: :timer.seconds(5),
 +    web_push: :timer.seconds(5),
 +    mailer: :timer.seconds(5),
 +    transmogrifier: :timer.seconds(5),
 +    scheduled_activities: :timer.seconds(5),
 +    poll_notifications: :timer.seconds(5),
 +    background: :timer.seconds(5),
 +    remote_fetcher: :timer.seconds(10),
 +    attachments_cleanup: :timer.seconds(900),
 +    new_users_digest: :timer.seconds(10),
 +    mute_expire: :timer.seconds(5),
 +    search_indexing: :timer.seconds(5),
 +    nodeinfo_fetcher: :timer.seconds(10)
    ]
  
  config :pleroma, Pleroma.Formatter,