Commit graph

206 commits

Author SHA1 Message Date
Henry Jameson
8d82808d7a Merge remote-tracking branch 'origin/develop' into shigusegubu 2026-01-03 02:01:33 +02:00
Lain Soykaf
2b8a366f9b Nginx example: Add headers and use same paths we use in other places 2025-12-22 16:10:02 +04:00
Lain Soykaf
0f32134ea5 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into nginx-config-update 2025-12-22 13:51:25 +04:00
Phantasm
ed7ad7d96a
OpenBSD relayd: Fix IPv6 example
relayd has problems loading certs when IPv4 and IPv6 listens are in the
same relay block.
2025-12-17 19:11:20 +01:00
Henry Jameson
63b82091d9 Merge remote-tracking branch 'origin/develop' into shigusegubu 2025-06-25 14:23:41 +03:00
feld
f38123ad2d Merge branch 'openbsd-docs' into 'develop'
Update OpenBSD documentation and installation files

See merge request pleroma/pleroma!4258
2025-06-06 00:59:58 +00:00
Mark Felder
f60a1e7d44 Set PATH in the FreeBSD rc script to avoid failures starting the service 2025-03-31 20:17:18 -07:00
Henry Jameson
4e05e7a989 Merge remote-tracking branch 'origin/develop' into shigusegubu 2024-12-18 11:34:33 +02:00
Phantasm
accdefb8db
openbsd httpd: use more appropriate HTTP response code for redirect 2024-11-27 21:46:50 +01:00
Phantasm
3b5b3ba4fc
openbsd: properly set daemon workdir, use default rc_start, set MIX_ENV in login.conf
Setting the MIX_ENV variable in rc_pre() isn't possible, because the
environment doesn't persist between rc_pre and rc_start(). This way we
can also ditch the custom rc_start() function in favor of the default
one which is just:

rc_start() {
	rc_exec "${daemon} ${daemon_flags}
}
2024-11-27 21:40:36 +01:00
Phantasm
a21e11f586
openbsd: unify IPvX placeholders in configs 2024-11-22 19:47:37 +01:00
Phantasm
427db32603
openbsd relayd: clarify certificate naming 2024-11-12 00:21:33 +01:00
Phantasm
3dc2655f59
openbsd: update relayd and httpd configuration files
* httpd: use proper server names
* httpd: add example of a very basic static website along with Pleroma
* httpd: let Pleroma serve robots.txt
* relayd: add example of forwarding to a basic httpd website
* relayd: remove appended response headers (most of them already served
  by Pleroma anyway)
* relayd: add comments about hosting Pleroma on subdomains
* relayd: reject request that don't belong to any forward
* relayd: add example of hosting media uploads on subdomain
* relayd: change forward timeout check to something sane that actually
  works
2024-11-12 00:07:58 +01:00
Phantasm
b2a716fc91
openbsd rc: replace deprecated flags, renamed to fit other service files 2024-11-12 00:03:41 +01:00
Mark Felder
045dfaf2af Fix nginx location for serving media directly 2024-10-30 10:48:23 -04:00
Mark Felder
ff039f9530 Add example OpenLDAP ldif to enable users to change their own passwords 2024-10-11 15:41:08 -04:00
Mark Felder
503e43da5d Document the /uploads location more thoroughly 2024-09-25 15:36:20 -04:00
Mark Felder
2870140db2 The /media route has not existed for some years now 2024-09-25 15:27:30 -04:00
Mark Felder
90e0911cdb Provide full uploads config for a subdomain 2024-09-25 15:19:57 -04:00
Mark Felder
f06a7b51e2 Annotate the Nginx media upload limit 2024-09-25 15:13:33 -04:00
Mark Felder
887a45488b Provide example of configuring a dedicated media and proxy subdomain 2024-09-25 15:05:42 -04:00
Mark Felder
16796c292f Provide HTTP/3 config example 2024-09-25 14:44:48 -04:00
Mark Felder
537d4d19c5 Move to the new method to enable http2 instead of on the listen socket statement 2024-09-25 14:42:18 -04:00
Mark Felder
f53c34c5d6 Move Pleroma cache to /var/tmp
/tmp is increasingly becoming tmpfs on a lot of distros and in cloud environments, so putting the cache there by default will be problematic
2024-09-25 14:37:50 -04:00
Henry Jameson
bf5b097cd2 Merge remote-tracking branch 'origin/develop' into shigusegubu 2024-08-06 16:46:58 +03:00
pleromian
af53efa9e3 docs: update docs for NetBSD 2024-06-20 01:40:02 +02:00
Lain Soykaf
4325b1aec3 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into nsfw-api-mrf 2024-05-27 17:49:31 +04:00
Henry Jameson
d65bdde809 Merge remote-tracking branch 'origin/develop' into shigusegubu 2024-03-26 12:34:10 +02:00
marcin mikołajczak
017e35fbf1 Fix some more typos
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-12-28 00:17:04 +01:00
Henry Jameson
78697ad23a Merge remote-tracking branch 'origin/develop' into shigusegubu 2023-07-19 21:06:02 +03:00
Haelwenn
2b9cd25cf4 Merge branch 'tusooa/media-altdomain' into 'develop'
Add instructions to serve media on another domain

See merge request pleroma/pleroma!3892
2023-07-02 21:30:16 +00:00
Haelwenn (lanodan) Monnier
a663b73634 Add no_new_privs to OpenRC service files 2023-06-13 12:47:02 +02:00
tusooa
f970091c6a
Add instructions to serve media on another domain 2023-05-26 17:17:13 -04:00
Henry Jameson
447bfcdb35 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (208 commits)
  Document inclusion of wasm-unsafe-eval
  Update http_security_plug.ex
  Update lib/pleroma/web/plugs/http_security_plug.ex
  try to fix ruffle on chrome
  Alter priority of Delete activities to be lowest
  Deletes do not generate notifications of any kind, so skip trying
  Object.Fetcher: Set reachable on successful fetch
  Translated using Weblate (Ukrainian)
  Added translation using Weblate (Ukrainian)
  Added translation using Weblate (Ukrainian)
  Lint
  Update config cheatsheet
  Clarify config description
  Document Oban workers getting timeouts defined
  Lint
  Define sane Oban Worker timeouts
  Clean up stale entries in mix.lock
  Document removal of Quack
  Add migration to remove Quack from ConfigDB
  Remove Quack logging backend
  ...
2022-11-18 01:38:17 +02:00
Iván Raskovsky
36519bdbee allow custom db port 2022-11-11 12:22:21 -03:00
Mark Felder
243ed7d60f Update the recommended VCL configuration 2022-08-10 17:18:06 -04:00
Henry Jameson
550693111e Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (115 commits)
  Change test case wording
  Use `duration` param for mute expiration duration
  Emoji: apply recommended tail call changes
  Extract translatable strings
  Emoji: split qualification variation into a module
  Add authorized_fetch_mode to description.exs
  EmojiReactValidator: use new qualification method
  Emoji: implement full-qualifier using combinations
  EmojiReactValidator: fix emoji qualification
  Revert "Merge branch 'fix/emoji-react-qualification' into 'develop'"
  Translated using Weblate (French)
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Chinese (Simplified))
  ...
2022-08-01 14:55:02 +03:00
Sean King
3da1b2548d
Actually fix with forward slashes being restricted inside nickname 2022-07-18 21:30:57 -06:00
Sean King
2c7eed122e
Don't accept forward slash character for nicknames 2022-07-17 12:50:01 -06:00
Sean King
64e16e6a4b
Document way to do notice compatibility routes with Nginx reverse-proxy instead 2022-07-16 23:44:37 -06:00
Henry Jameson
31115e24c0 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (294 commits)
  Fix incorrect fallback when English is set to first language
  Fix eratic test for POST /api/pleroma/admin/reports/:id/notes
  After code review
  Support fallbacking to other languages
  Delete report notifs when demoting from superuser
  Update Caddyfile to Caddy v2
  Lint
  Support multiple locales from userLanguage cookie
  Support multiple locales formally
  Make lint happy
  Add test for fallbacking to a general language
  Fallback to a variant if the language in general is not supported
  Add changelog
  Document API addition
  Allow user to register with custom language
  Allow update_credentials to update User.language
  Send emails i18n'd using backend-stored user language
  Make all emails translatable
  Fix digest test
  Make mail and mailer translatable
  ...
2022-04-19 14:27:21 +03:00
sleepycrow
9b69ccb35b Update Caddyfile to Caddy v2 2022-03-06 14:24:32 +01:00
Alex Gleason
c802c3055e
NsfwApiPolicy: add systemd example file 2021-06-17 15:04:40 -05:00
Sean King
08694599ae
Remove bash script for downloading new MastoFE build 2021-04-15 23:41:34 -06:00
Henry Jameson
e7aebdf7b6 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (185 commits)
  OAuthScopesPlug: remove transform_scopes in favor of explicit admin scope definitions
  OpenAPI: Add `admin:` scope prefix to admin operations
  Remove `:auth, :enforce_oauth_admin_scope_usage`
  Do not want these interfering with develop builds
  Make it possible to generate custom docker images by prefixing the branch name with "build-docker"
  Chats: Introduce /api/v2/pleroma/chats which implements pagination
  ChatMessage schema: Add `unread` property
  Relicense documentation under CC-BY-4.0
  Add API endpoint to remove a conversation
  update changelog to mention change of avatar
  replace avi.png
  Add myself to .mailmap
  [#2053] Changed `Notification/for_user_query/2` to use join to filter out inactive actors instead of subselect of _all_ inactive AP ids from `users`.
  [#2510] Improved support for app-bound OAuth tokens. Auth-related refactoring.
  not used mock
  OpenAPI spec: Do not show build enviroment in the spec version
  OpenAPI spec task: Load pleroma application to get version info
  Lint
  Revert "Add plaintext support for all emails except the digest"
  MRF NoEmptyPolicy: Deny posts from local users if there is no content or only mentions.
  ...
2021-02-20 20:47:18 +02:00
Mark Felder
1d8f1fe077 Add a default rule to not attempt to cache any files larger than 50MB
This fixes connection failures when trying to retrieve large files.
It is less common in typical Pleroma usage, but it's possible to encounter
this on a cloud instance with lower memory.
2021-02-05 13:35:51 -06:00
Mark Felder
c6ef87d585 Note the requirement for the url_format parameter 2021-01-25 18:20:07 -06:00
Mark Felder
8373cb645b Add sudo rule, remove quoting that breaks the for loop 2021-01-25 18:15:04 -06:00
Mark Felder
003402df40 Add ability to invalidate cache entries for Apache 2021-01-21 14:20:13 -06:00
Mark Felder
3078e62488 Update Apache configuration. This has been tested. 2021-01-21 12:25:18 -06:00