From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Fri, 11 Nov 2022 16:12:04 +0000 (+0000)
Subject: Chores for 2022.11
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=89dbc7177b55c7f49632e75915fdcc77f737f20e;p=akkoma

Chores for 2022.11
---

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0e71b2127..ac6695c36 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
-## Unreleased
+## 2022.11
 
 ## Added
 - Officially supported docker release
@@ -20,6 +20,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## Fixed
 - Registrations via ldap are now compatible with the latest OTP24
 
+## Update notes
+- If you use LDAP and run from source, please update your elixir/erlang
+  to the latest. The changes in OTP24.3 are breaking.
+- You can now remove the leading `*.` from domain blocks, but you do not have to.
+
 ## 2022.10
 
 ### Added
diff --git a/README.md b/README.md
index 212f99c60..8d35212aa 100644
--- a/README.md
+++ b/README.md
@@ -46,15 +46,13 @@ If your platform is not supported, or you just want to be able to edit the sourc
 - [Alpine Linux](https://docs.akkoma.dev/stable/installation/alpine_linux_en/)
 - [Arch Linux](https://docs.akkoma.dev/stable/installation/arch_linux_en/)
 - [Debian-based](https://docs.akkoma.dev/stable/installation/debian_based_en/)
-- [Debian-based (jp)](https://docs.akkoma.dev/stable/installation/debian_based_jp/)
 - [FreeBSD](https://docs.akkoma.dev/stable/installation/freebsd_en/)
 - [Gentoo Linux](https://docs.akkoma.dev/stable/installation/gentoo_en/)
 - [NetBSD](https://docs.akkoma.dev/stable/installation/netbsd_en/)
 - [OpenBSD](https://docs.akkoma.dev/stable/installation/openbsd_en/)
-- [OpenBSD (fi)](https://docs.akkoma.dev/stable/installation/openbsd_fi/)
 
 ### Docker
-While we don’t provide docker files, other people have written very good ones. Take a look at <https://github.com/angristan/docker-pleroma> or <https://glitch.sh/sn0w/pleroma-docker>.
+Docker installation is supported via [this setup](https://docs.akkoma.dev/stable/installation/docker_en/)
 
 ### Compilation Troubleshooting
 If you ever encounter compilation issues during the updating of Akkoma, you can try these commands and see if they fix things:
@@ -66,3 +64,4 @@ If you ever encounter compilation issues during the updating of Akkoma, you can
 
 ## Documentation
 - https://docs.akkoma.dev/stable
+- https://docs.akkoma.dev/develop
diff --git a/lib/pleroma/web/plugs/http_security_plug.ex b/lib/pleroma/web/plugs/http_security_plug.ex
index 43b075447..fc2f7b268 100644
--- a/lib/pleroma/web/plugs/http_security_plug.ex
+++ b/lib/pleroma/web/plugs/http_security_plug.ex
@@ -104,12 +104,13 @@ defmodule Pleroma.Web.Plugs.HTTPSecurityPlug do
         {[img_src, " https:"], [media_src, " https:"]}
       end
 
-    connect_src = if Config.get([:media_proxy, :enabled]) do
-      sources = build_csp_multimedia_source_list()
-      ["connect-src 'self' blob: ", static_url, ?\s, websocket_url, ?\s, sources]
-    else
-      ["connect-src 'self' blob: ", static_url, ?\s, websocket_url]
-    end
+    connect_src =
+      if Config.get([:media_proxy, :enabled]) do
+        sources = build_csp_multimedia_source_list()
+        ["connect-src 'self' blob: ", static_url, ?\s, websocket_url, ?\s, sources]
+      else
+        ["connect-src 'self' blob: ", static_url, ?\s, websocket_url]
+      end
 
     script_src =
       if Config.get(:env) == :dev do
diff --git a/mix.exs b/mix.exs
index d95cc1778..201299aa5 100644
--- a/mix.exs
+++ b/mix.exs
@@ -4,7 +4,7 @@ defmodule Pleroma.Mixfile do
   def project do
     [
       app: :pleroma,
-      version: version("3.3.1"),
+      version: version("3.4.0"),
       elixir: "~> 1.12",
       elixirc_paths: elixirc_paths(Mix.env()),
       compilers: [:phoenix, :gettext] ++ Mix.compilers(),