Commit graph

132 commits

Author SHA1 Message Date
Henry Jameson
593edd3c41 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (53 commits)
  Add warning against parsing/reusing MastoFE settings blob
  Update NotificationOperation spec
  Add `is_muted` to notifications
  Translated using Weblate (Italian)
  Added translation using Weblate (Italian)
  Add include for the "Further reading" section
  HellthreadPolicy: Restrict to Notes and Articles.
  Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex
  proper error codes for error in adminFE
  Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex
  cheatsheet.md: no_attachment_links → attachment_links
  fix for packs pagination
  Stop filling conversation field on incoming objects (legacy, unused)
  Only accounts with Service actor_type are considered as bots
  Add support for bot field in update_credentials
  README: Add some troubleshooting info for compilation issues.
  [#1873] Fixes missing :offset pagination param support. Added pagination support for hashtags search.
  default page size for files
  changelog entry
  adding overall count for packs and files
  ...
2020-06-23 01:35:40 +03:00
Henry Jameson
ce6f690a85 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (276 commits)
  Remove `poll` from `notification_type` OpenAPI spec
  credo fix
  CHANGELOG.md: mention minimal elixir version update
  Update OTP releases to official images of 1.10.3
  Chunk the notification type backfill migration
  moving custom ecto types in context folders
  Upgrade to Elixir 1.9
  naming
  fix attemps to merge map
  fix for updated hackney
  Mogrify args as custom tuples
  Fix tests
  Changelog: Add info about conversation view changes.
  Conversations: Return last dm for conversation, not last message.
  Mastodon API: ensure the notification endpoint doesn't return less than the requested amount of records unless it's the last page
  ControllerHelper: Always return id field.
  Apply suggestion to lib/pleroma/web/controller_helper.ex
  Remove use of atoms in MRF.UserAllowListPolicy
  Fix atom leak in Rich Media Parser
  Return an empty map from Pleroma.Web.RichMedia.Parsers.OGP.parse/2
  ...
2020-06-19 15:17:00 +03:00
Maksim Pechnikov
579763126f Merge branch 'develop' into issue/1855 2020-06-15 15:24:55 +03:00
Maksim Pechnikov
2e8a236cef fix invalidates media url's 2020-06-14 21:02:57 +03:00
normandy
122328b93a Update pleroma.nginx to support TLSv1.3
Based on SSL config from https://ssl-config.mozilla.org/
2020-06-12 02:05:49 -04:00
Henry Jameson
f9b13c754c Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (269 commits)
  Apply suggestion to docs/administration/CLI_tasks/user.md
  rename mix task: `pleroma.user unsubscribe` -> `pleroma.user deactivate`
  Added the ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image via AdminFE
  fixed `mix pleroma.instance gen`
  Also add new sidebarRight setting
  Add `background_image` to `InstanceOperation`
  Move notification actions to PleromaAPI.NotificationController
  Move conversation actions to PleromaAPI.ConversationController
  Move reaction actions to EmojiReactionController
  Add OpenAPI spec for PleromaAPI.PleromaAPIController
  Changelog: Add background to instance
  Docs: Add background_image in instance
  InstanceOperation: Add background image to example
  MastoFE: update to bundle-2020-05-20
  Apply suggestion to installation/nginx-cache-purge.sh.example
  update purge script
  Synchronize :fe settings in config.exs
  Fix summary
  User.Query: Remove superfluous `distinct`
  UserTest: Hide warning in tests.
  ...
2020-05-22 00:29:15 +03:00
Maksim
376147fb82 Apply suggestion to installation/nginx-cache-purge.sh.example 2020-05-20 04:12:21 +00:00
Maksim Pechnikov
b5b9d161cd update purge script 2020-05-20 06:56:04 +03:00
Maksim Pechnikov
3f8d68bdf3 added example cache purge script 2020-05-17 05:56:20 +03:00
lain
a2a8c8e9e0 Merge branch 'features/openrc-console' into 'develop'
init.d/pleroma: Add option to attach an elixir console

See merge request pleroma/pleroma!1704
2020-05-14 09:27:33 +00:00
Alexander Strizhakov
3c42caa85c
apache chain issue fix 2020-05-06 16:20:47 +03:00
Henry Jameson
5ca35e1251 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (249 commits)
  Add a test for accounts/update_credentials
  Fix activity deletion
  Add emoji support in statuses in staticfe
  AccountView: fix for other forms of <br> in bio
  Mastodon API Account view: Remove an outdated hack
  Improved in-test `clear_config/n` applicability (setup / setup_all / in-test usage).
  restrict_unauthenticated setting
  include_types parameter in /api/v1/notifications
  remove federated testing
  Improved in-test config management functions.
  Fix ssl option on Ecto config breaking release
  Admin API: `PATCH /api/pleroma/admin/users/:nickname/credentials`, `GET /api/pleroma/admin/users/:nickname/credentials`.
  Admin API: `PATCH /api/pleroma/admin/users/:nickname/change_password`
  removing with_move parameter
  Improve documentation of mrf_object_age
  gitlab: create templates for bug reports and release MRs
  warnings fix
  removing from descriptions.exs deprecated settings
  fix for content-type header for tag feed
  adding rss for user feed
  ...
2020-03-25 17:37:53 +02:00
Mark Felder
e04e16bbc0 Do not strip Cache-Control headers from media. Trust the Pleroma backend. 2020-03-13 11:31:55 -05:00
Mark Felder
05da5f5cca Update Copyrights 2020-03-03 16:44:49 -06:00
Haelwenn (lanodan) Monnier
effb4a3d48
init.d/pleroma: Add option to attach an elixir console 2020-02-20 21:24:24 +01:00
Henry Jameson
830e18a702 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (734 commits)
  update fast sanitize dependency
  streamer: use direct object for filter checks when there is no valid child object in an activity
  Bump fast_sanitize version
  Fix moderation log crash
  Undo dialyzer fix
  Fix count
  AdminAPI: Omit relay user from users list
  Fix "the call ... will never return" warning
  Bump fast_sanitize dependency so this builds on more than just Linux
  Remove following column from the migrations
  Update test for get_recipients_from_activity
  Fix bookmark migration using a query with a schema
  Add a migration to fix blocked follows
  Fix duplicate recipients
  Rip out the rest of htmlsanitizeex
  Remove commented-out code
  Fix XSS emoji test
  Bump fast_sanitize dependency
  Fix two migrations sharing the same module name
  Migrate missing follow requests
  ...
2019-11-04 11:43:40 +02:00
minibikini
f9380289eb Add remote_ip plug 2019-09-27 21:59:23 +00:00
feld
df3feb9412 Make it obvious how to support dual stack for MongooseIM 2019-09-20 13:21:07 +00:00
kPherox
99b4847da3
Fix missing changes in pleroma/pleroma!1197 2019-08-30 21:00:50 +09:00
Henry Jameson
ae4d15503b Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (159 commits)
  [#1043] fix search accounts.
  tasks/pleroma/instance.ex: Change :upload_dir to :uploads_dir
  Expose `skip_thread_containment` in nodeinfo
  Split alters rather than work with indexes
  Use fallback values for search queries
  Fix migration
  [#1048] Fixed version parsing in pleroma_ctl. Closes #1036.
  [#1048] Resolved violations of SemVer version format. Refactoring.
  Add fallback value to the admin report view.
  Move changelog entries
  [#1033] Fix database migrations
  Update changelog and admin API docs with tags, display_name, avatar additions
  OTP Release install docs: Remove --dry-run in cron certbot command
  Add hashtag filter to user statuses (GET /api/v1/accounts/:id/statuses)
  [#1026] Filter.AnonymizeFilename added ability to retain file extension with custom text
  Fix not being able to pin unlisted posts
  Add PLEROMA_BUILD_ENV to override env for the version generator and use it in the CI for building docs
  Add a caveat for docker deployment in the config docs
  Revert "Build releases only on tags or develop"
  Build releases only on tags or develop
  ...
2019-07-06 21:54:28 +03:00
rinpatch
997e766929 Remove sudo in the nginx config command example 2019-06-23 07:39:23 +03:00
rinpatch
c013d3f3c8 Fix the webroot method in the nginx config 2019-06-22 20:26:59 +03:00
rinpatch
ddf5e6254a Fix nginx webroot method config 2019-06-21 05:46:21 +03:00
Henry Jameson
f0e2fb1609 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (193 commits)
  Remove search result order for non-RUM indexes
  Update `auto_linker` dependency
  Document TagPolicy in `rewrite_policy` section
  Import release config from env variable or /etc/pleroma/config.exs and warn if the file is missing
  Add option to restrict all users to local content
  Better default parameters for suggestion
  Update `plug` dependency
  Update `ex_rated` dependency
  Replace `MastodonAPIController.account_register/2` rate limiter
  Update CHANGELOG
  Add rate limiting for search endpoints
  Add RateLimiter
  Remove unused imports and aliases from migration
  Update pleroma_ctl
  Add more tests for using media_proxy and whitelists
  Add a changelog entry for releases
  specify that a version is needed for rollback
  Add migrate/rollback to release tasks
  Fix wrong placement of serve_endpoints
  Use Mix.shell().yes? if available
  ...
2019-06-12 22:20:20 +03:00
feld
abedcca349 Sample Mongoose IM config.
Change domain, ensure paths to PEM files are correct, and this is good to go.
2019-05-31 20:36:33 +00:00
feld
abc15b6dcc Improve Varnish config. We set sane headers from the backend now. 2019-05-28 21:20:24 +00:00
Alfie Pates
356c047759 explicitly set reverse proxy upstream to IPv4
since Pleroma.Web.Endpoint binds on IPv4 only and `localhost.` resolves to
  [::0] on some systems

  fixes #930.
2019-05-23 22:33:27 +01:00
Henry Jameson
e7ff752c52 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (218 commits)
  http: bump connection timeout to 10 seconds
  Fix prometheus-ecto error when not configured
  Document MRF.Simple :report_removal
  Add virtual :thread_muted? field
  Move default mascot configuration to `config/`
  Add changelog entry for mascot config
  Use string map for default mascot
  Format mascot tests
  Add mascot get/set tests
  Add API endpoints for a custom user mascot
  Add report filtering to MRF.SimplePolicy
  add Changelog entry
  also suppress link previews from posts marked #nsfw
  add CHANGELOG entry
  config: make sending the user agent configurable, disable sending the user agent in tests
  http: request builder: send user-agent when making requests
  rich media: suppress link previews if post is marked as sensitive
  mrf: simple policy: mark all posts instead of posts with media as sensitive if they match media_nsfw
  CI: Use the correct image with the correct hostname.
  RUM: Set rum status by the environment.
  ...
2019-05-22 00:02:44 +03:00
lambda
a58813e7a1 Merge branch 'features/download-mastofe-build' into 'develop'
installation/download-mastofe-build.sh: Add mastofe CI-artifacts download

See merge request pleroma/pleroma!1052
2019-05-01 10:48:30 +00:00
Henry Jameson
5015d517d0 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (184 commits)
  html: lock down allowed class attributes to only those related to microformats
  Extend Mastodon API with public endpoint for getting Favorites timeline of any user (#789)
  Add :emoji settings to config.md
  added healthcheck setting to instance config
  Add shortcode_globs setting to documentation
  Add a changelog entry for `pleroma.in_reply_to_account_acct`
  Add `pleroma.in_reply_to_account_acct` to MastoAPI status entity
  Replace Object.normalize(activity.data[object] with Object.normalize(acitivty) to benefit from preloading
  Fix unclosed ` and put synopsis into a code block in pleroma.emoji mix task docs
  Use `User.get_cached*` everywhere
  Feature/826 healthcheck endpoint
  Fix emoji.txt / custom_emoji.txt / shortcode_globs handling
  Formatting
  Change the default manifest to pleroma's namespace
  Replace MD5 with SHA256 for emoji pack verification
  Wrap the docstrings to 70 characters
  differences_in_mastoapi_responses.md: `content_type` parameter of post submission
  [#923] Refactored OAuthController#authorize definitions, added test.
  Set correct values in the MastoAPI reblog status view
  Mention Mastodon 2.8+ follow import fix in changelog
  ...
2019-04-24 02:38:41 +03:00
Dominik V. Salonen
498c96d458 Add supervisord configuration 2019-04-16 07:14:44 +00:00
lambda
1b4c4d29a3 Merge branch 'ssl_trusted_cert' into 'develop'
ssl_trusted_certificate should point to chain.pem if we're demonstrating...

See merge request pleroma/pleroma!996
2019-04-12 08:58:46 +00:00
Haelwenn (lanodan) Monnier
378b964d8e
installation/download-mastofe-build.sh: Add copyright header
[ci skip]
2019-04-12 07:39:49 +02:00
Haelwenn (lanodan) Monnier
b421dd3dd2
installation/download-mastofe-build.sh: Add mastofe CI-artifacts download
[ci skip]
2019-04-12 07:32:46 +02:00
Horsemans
10a9682596 ssl_trusted_certificate should point to chain.pem if we're demonstrating LetsEncrypt: https://community.letsencrypt.org/t/howto-ocsp-stapling-for-nginx/13611/5 2019-03-31 16:58:28 +00:00
Henry Jameson
c7ccd43500 shitfuck 2019-03-21 20:39:46 +02:00
Henry Jameson
580787d360 piece of shit 2019-03-21 20:35:52 +02:00
Henry Jameson
ae07bb4779 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (208 commits)
  Web.OAuth.OAuthControllerTest: Add test against token formatting
  Web.OAuth.OAuthController: Fix scopes Enum.join for OAuth response
  activitypub: fix date header format
  Added migration for setting default tags in existing users records
  config: fix chat endpoint path
  mastodon websocket: return errors using ok, not stop
  mastodon websocket: bring back infinity timeout
  mastodon websocket: use pattern match to get query data, robustly handle errors
  config: update config for cowboy 2 endpoints
  mastodon api: websocket: update code for cowboy 2.x
  mix: update dependencies for cowboy 2.0
  Renamed *DatabaseAuthenticator to *Authenticator.
  Added `auth_template/0` to DatabaseAuthenticator.
  Made auth customization be runtime-configurable.
  Added deactivated to the user view
  Remove parts of the old activity view.
  Add user muted status info to twitterapi.
  Add user muted status info to MastodonAPI.
  Add `with_muted` param.
  Follower requests: Utilize object index.
  ...
2019-03-02 20:20:45 +02:00
Kenneth Zhao
e1bdaaa3fe need to put back ipv4 listen instruct 2019-02-26 08:41:37 -08:00
PEA
d3a6c065a4 Add ipv6 handling to pleroma.nginx
Replaces `listen 80` with `listen [::]:80`, same with 443
2019-02-25 23:37:46 -05:00
faried nawaz
c75e643a72
apache config: add instructions for mediaproxy. 2019-02-23 00:18:03 +05:00
shibayashi
d1752a81a8 Update service files of OpenRC and systemd to new recommended paths 2019-02-10 19:25:34 +00:00
shibayashi
1d8b578bb7
Recommend the acme-challenge path that is used in the installation guides 2019-02-09 23:08:27 +01:00
shibayashi
e868cfe619 Add /media to Caddy cache 2019-02-09 11:39:01 +00:00
Henry Jameson
f1bb6b6bc4 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (280 commits)
  Mark streaming feature for Apps in README.md
  Update README.md
  hide_followings was renamed to hide_followers in the FE, but never synced up in the BE
  tests: add a rich media card that contains all relevant fields
  test: add some regression tests for the rich media card rendering
  mastodon api: rich media: don't clobber %URI struct with a string
  adds a couple of explicit examples for ExSyslogger
  Fix if clause in activity_pub user_view
  rids the duplicate timestamp from default ExSyslogger config
  update frontend
  Allow to configure visibility for admin and moderator badges
  Add is_admin and is_moderator boolean fields to the user view
  rich media: parser: reject any data which cannot be explicitly encoded into JSON
  test: twitterapi: fix another possible test failure case
  test: twitterapi: fix the test breakage for real
  mastodon api: fix rendering of cards without image URLs (closes #597)
  Fix SQL
  ARGLE GARBLE
  html: don't attempt to parse nil content
  activitypub: transmogrifier: fix bare tags
  ...
2019-02-08 10:08:36 +02:00
vaartis
9e43a28bc3 Update the openrc service's retry with the correct format 2019-01-28 08:18:11 +00:00
Henry Jameson
f314d1b9d5 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (194 commits)
  Mix.Tasks.Pleroma.Instance: Generate signing_salt
  Send delete event over Mastodon streaming api
  Add a test to ensure #39 is fixed.
  update frontend
  Set custom similarity limit.
  Make use of the indices.
  test: add regression test for to/cc clobbering
  [#477] User trigram index adjustment.
  [#477] User: FTS and trigram search results mixing (to handle misspelled requests).
  [#491] Made full nicknames be preserved in user links text only in Bio.
  activitypub: add a match clause for objects, not just activities
  activitypub: transmogrifier: do not clobber the addressing on relayed announcements
  activitypub: allow is_public?() to work on any type of map representing an AS2 object
  activitypub: relay: chase selective public announce changes
  activitypub: announce: add new public parameter
  Add comments and change default path of the Mix binary.
  Fix bad link in likes collection
  [#502] Fixed `user_count` in `/api/v1/instance` to include only active local users.
  formatting
  Default to disabled in the code in case the setting is absent from config.exs
  ...
2019-01-21 14:35:25 +03:00
shibayashi
2a818a3e77
Add comments and change default path of the Mix binary. 2019-01-17 19:49:54 +01:00
kaniini
c445c9e125 Merge branch 'fix-nginx-caching' into 'develop'
Fix nginx caching issues

See merge request pleroma/pleroma!654
2019-01-14 07:25:08 +00:00
Mark Felder
cc3a83a730 Fix nginx caching issues
Nginx is currently not caching data because proxy_buffering needs to be
enabled for caching to work at all, and we are receiving a Cache-Control
header from Pleroma that states "max-age=0, private, must-revalidate"

Even disregarding the Cache-Control header that should actually be set
to "public, max-age=1209600" as defined in the reverse_proxy code, we
don't want to obey this header at all as it overrides our Nginx caching
rules.
2019-01-10 21:29:05 +00:00