diff options
| -rw-r--r-- | installation/pleroma-apache.conf | 27 | ||||
| -rw-r--r-- | installation/pleroma.nginx | 35 | ||||
| -rw-r--r-- | lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 17 | ||||
| -rw-r--r-- | lib/pleroma/web/router.ex | 7 |
4 files changed, 73 insertions, 13 deletions
diff --git a/installation/pleroma-apache.conf b/installation/pleroma-apache.conf new file mode 100644 index 000000000..e45ebf107 --- /dev/null +++ b/installation/pleroma-apache.conf @@ -0,0 +1,27 @@ +<VirtualHost *:80> +#Example configuration for when Apache httpd and Pleroma are on the same host. +#Needed modules: proxy proxy_http proxy_wstunnel rewrite +#This assumes a Debian style Apache config. Put this in /etc/apache2/sites-available +#Doesn't include SSL, just run certbot and let it take care of that. + + +#Change this: +ServerName pleroma.example.com + +RewriteEngine On +RewriteCond %{HTTP:Connection} Upgrade [NC] +RewriteCond %{HTTP:Upgrade} websocket [NC] +RewriteRule /(.*) ws://localhost:4000/$1 [P,L] + +ProxyRequests off +ProxyPass / http://localhost:4000/ +ProxyPassReverse / http://localhost:4000/ + +#Change this too: +RequestHeader set Host "pleroma.example.com" +ProxyPreserveHost On + + ErrorLog ${APACHE_LOG_DIR}/error.log + CustomLog ${APACHE_LOG_DIR}/access.log combined + +</VirtualHost> diff --git a/installation/pleroma.nginx b/installation/pleroma.nginx index 11dc6456c..61e40c508 100644 --- a/installation/pleroma.nginx +++ b/installation/pleroma.nginx @@ -1,10 +1,18 @@ +# default nginx site config for Pleroma +# +# Simple installation instructions: +# 1. Install your TLS certificate, possibly using Let's Encrypt. +# 2. Replace 'example.tld' with your instance's domain wherever it appears. +# 3. Copy this file to /etc/nginx/sites-available/ and then add a symlink to it +# in /etc/nginx/sites-enabled/ and restart nginx. + proxy_cache_path /tmp/pleroma-media-cache levels=1:2 keys_zone=pleroma_media_cache:10m max_size=10g inactive=720m use_temp_path=off; server { - listen 80; - server_name example.tld; - return 301 https://$server_name$request_uri; + listen 80; + server_name example.tld; + return 301 https://$server_name$request_uri; } server { @@ -12,7 +20,7 @@ server { ssl on; ssl_session_timeout 5m; - ssl_certificate /etc/letsencrypt/live/exmaple.tld/fullchain.pem; + ssl_certificate /etc/letsencrypt/live/example.tld/fullchain.pem; ssl_certificate_key /etc/letsencrypt/live/example.tld/privkey.pem; ssl_protocols TLSv1 TLSv1.1 TLSv1.2; @@ -21,12 +29,16 @@ server { server_name example.tld; - gzip_vary on; - gzip_proxied any; - gzip_comp_level 6; - gzip_buffers 16 8k; - gzip_http_version 1.1; - gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript application/activity+json application/atom+xml; + gzip_vary on; + gzip_proxied any; + gzip_comp_level 6; + gzip_buffers 16 8k; + gzip_http_version 1.1; + gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript application/activity+json application/atom+xml; + + # the nginx default is 1m, not enough for large media uploads + client_max_body_size 16m; + location / { # if you do not want remote frontends to be able to access your Pleroma backend # server, remove these lines. @@ -44,6 +56,8 @@ server { proxy_set_header Host $http_host; proxy_pass http://localhost:4000; + + client_max_body_size 16m; } location /proxy { @@ -51,5 +65,4 @@ server { proxy_cache_lock on; proxy_pass http://localhost:4000; } - } diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex index 6339704a2..b00f1e15c 100644 --- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex @@ -102,13 +102,14 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do end @instance Application.get_env(:pleroma, :instance) + @mastodon_api_level "2.3.3" def masto_instance(conn, _params) do response = %{ uri: Web.base_url(), title: Keyword.get(@instance, :name), description: "A Pleroma instance, an alternative fediverse server", - version: Keyword.get(@instance, :version), + version: "#{@mastodon_api_level} (compatible; #{Keyword.get(@instance, :version)})", email: Keyword.get(@instance, :email), urls: %{ streaming_api: String.replace(Web.base_url(), ["http", "https"], "wss") @@ -604,7 +605,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do "video\/mp4" ] }, - settings: %{ + settings: Map.get(user.info, "settings") || %{ onboarded: true, home: %{ shows: %{ @@ -649,6 +650,18 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do end end + def put_settings(%{assigns: %{user: user}} = conn, %{"data" => settings} = _params) do + with new_info <- Map.put(user.info, "settings", settings), + change <- User.info_changeset(user, %{info: new_info}), + {:ok, _user} <- User.update_and_set_cache(change) do + conn + |> json(%{}) + else e -> + conn + |> json(%{error: inspect(e)}) + end + end + def login(conn, _) do conn |> render(MastodonView, "login.html", %{error: false}) diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index 5f27f3caa..8ee27e63c 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -100,6 +100,7 @@ defmodule Pleroma.Web.Router do get("/domain_blocks", MastodonAPIController, :empty_array) get("/follow_requests", MastodonAPIController, :empty_array) get("/mutes", MastodonAPIController, :empty_array) + get("/lists", MastodonAPIController, :empty_array) get("/timelines/home", MastodonAPIController, :home_timeline) @@ -120,6 +121,12 @@ defmodule Pleroma.Web.Router do post("/media", MastodonAPIController, :upload) end + scope "/api/web", Pleroma.Web.MastodonAPI do + pipe_through(:authenticated_api) + + put("/settings", MastodonAPIController, :put_settings) + end + scope "/api/v1", Pleroma.Web.MastodonAPI do pipe_through(:api) get("/instance", MastodonAPIController, :masto_instance) |