akkoma
5 years agoBasic skeleton of "Switching a from-source install to OTP releases"
rinpatch [Mon, 24 Jun 2019 08:51:02 +0000 (11:51 +0300)]
Basic skeleton of "Switching a from-source install to OTP releases"

5 years agoUse supervise-daemon(8) for the alpine service
rinpatch [Mon, 24 Jun 2019 07:08:33 +0000 (10:08 +0300)]
Use supervise-daemon(8) for the alpine service

5 years agoRemove the warning about alpine as the issue is now solved
rinpatch [Sun, 23 Jun 2019 23:50:28 +0000 (02:50 +0300)]
Remove the warning about alpine as the issue is now solved

5 years agoUse build-base instead of individual packages
rinpatch [Sun, 23 Jun 2019 05:35:35 +0000 (08:35 +0300)]
Use build-base instead of individual packages

5 years agoreleases_en.md -> otp_en.md
rinpatch [Sun, 23 Jun 2019 04:44:10 +0000 (07:44 +0300)]
releases_en.md -> otp_en.md

5 years agoAdd a Further Reading section to the OTP install guide
rinpatch [Sun, 23 Jun 2019 04:43:45 +0000 (07:43 +0300)]
Add a Further Reading section to the OTP install guide

5 years agoRemove sudo in the nginx config command example
rinpatch [Sun, 23 Jun 2019 04:39:23 +0000 (07:39 +0300)]
Remove sudo in the nginx config command example

5 years agoAdd a section on executing mix tasks
rinpatch [Sun, 23 Jun 2019 00:05:02 +0000 (03:05 +0300)]
Add a section on executing mix tasks

5 years agoAdd a section about updating
rinpatch [Sat, 22 Jun 2019 23:55:43 +0000 (02:55 +0300)]
Add a section about updating

5 years agoAdd docs about SSL certificate auto-renew
rinpatch [Sat, 22 Jun 2019 23:42:47 +0000 (02:42 +0300)]
Add docs about SSL certificate auto-renew

5 years agoRemove a note about needing to add RUM to config manually, as it is now
rinpatch [Sat, 22 Jun 2019 18:18:34 +0000 (21:18 +0300)]
Remove a note about needing to add RUM to config manually, as it is now
in the config generator

5 years agoFix the webroot method in the nginx config
rinpatch [Sat, 22 Jun 2019 17:26:59 +0000 (20:26 +0300)]
Fix the webroot method in the nginx config

5 years agoAdd a warning about OTP releases on Alpine 3.10
rinpatch [Sat, 22 Jun 2019 10:40:37 +0000 (13:40 +0300)]
Add a warning about OTP releases on Alpine 3.10

5 years agoAdd an OpenRC service for OTP releases
rinpatch [Sat, 22 Jun 2019 10:24:33 +0000 (13:24 +0300)]
Add an OpenRC service for OTP releases

5 years agoMerge branch 'develop' into release-docs
rinpatch [Sat, 22 Jun 2019 09:44:20 +0000 (12:44 +0300)]
Merge branch 'develop' into release-docs

5 years agoMerge branch 'mix_sem_ver_version_fix' into 'develop'
rinpatch [Sat, 22 Jun 2019 09:20:11 +0000 (09:20 +0000)]
Merge branch 'mix_sem_ver_version_fix' into 'develop'

Fixed mix version computed for underscore-containing branches

See merge request pleroma/pleroma!1314

5 years agoMerge branch 'fix/ecto-tasks-release' into 'develop'
rinpatch [Sat, 22 Jun 2019 09:19:10 +0000 (09:19 +0000)]
Merge branch 'fix/ecto-tasks-release' into 'develop'

Ecto tasks: Resolve relative path using the application directory instead of cwd and load the application before doing anything

See merge request pleroma/pleroma!1322

5 years agoMerge branch 'bugfix/simple-notifications-for-non-create-activities' into 'develop'
rinpatch [Sat, 22 Jun 2019 06:55:32 +0000 (06:55 +0000)]
Merge branch 'bugfix/simple-notifications-for-non-create-activities' into 'develop'

notifications: fix notification generation for non-create activities

See merge request pleroma/pleroma!1323

5 years agonotifications: fix notification generation for non-create activities
William Pitcock [Sat, 22 Jun 2019 06:44:47 +0000 (06:44 +0000)]
notifications: fix notification generation for non-create activities

in 300d94c62, an Object.normalize() call was introduced.  calling Object.normalize()
on an activity with a non-object URI (say, a user) causes Really Bad Things to happen.
so don't do that.

5 years agoCorrect dependencies for RUM on alpine and remove installcheck
rinpatch [Sat, 22 Jun 2019 05:36:36 +0000 (08:36 +0300)]
Correct dependencies for RUM on alpine and remove installcheck

5 years agoCorrect a typo in the apk command
rinpatch [Sat, 22 Jun 2019 05:31:02 +0000 (08:31 +0300)]
Correct a typo in the apk command

5 years agoDo not exit on fail in the one-liner because it closes ssh connection and fix depende...
rinpatch [Sat, 22 Jun 2019 05:30:32 +0000 (08:30 +0300)]
Do not exit on fail in the one-liner because it closes ssh connection and fix dependencies for alpine

5 years agoUse uname -m instead of arch for more portability
rinpatch [Sat, 22 Jun 2019 02:20:36 +0000 (05:20 +0300)]
Use uname -m instead of arch for more portability

5 years agoAdd a systemd service for OTP releases
rinpatch [Sat, 22 Jun 2019 02:00:41 +0000 (05:00 +0300)]
Add a systemd service for OTP releases

5 years agoExecuting create is unnecessary after the postgres script is executed
rinpatch [Sat, 22 Jun 2019 01:35:17 +0000 (04:35 +0300)]
Executing create is unnecessary after the postgres script is executed

5 years agoLoad the application before executing the create task
rinpatch [Sat, 22 Jun 2019 01:33:46 +0000 (04:33 +0300)]
Load the application before executing the create task

5 years agoEcto tasks: Resolve relative path using the application directory
rinpatch [Sat, 22 Jun 2019 01:17:04 +0000 (04:17 +0300)]
Ecto tasks: Resolve relative path using the application directory
instead of cwd and load the application before doing anything

In OTP releases cwd != app directory and the configuration is read
only if the application is loaded

5 years agoMerge branch 'chore/update-bbcode' into 'develop'
kaniini [Fri, 21 Jun 2019 23:54:37 +0000 (23:54 +0000)]
Merge branch 'chore/update-bbcode' into 'develop'

mix: update bbcode dependency to v0.1.1

See merge request pleroma/pleroma!1321

5 years agoMerge branch 'fix/fallback-config' into 'develop'
rinpatch [Fri, 21 Jun 2019 23:43:14 +0000 (23:43 +0000)]
Merge branch 'fix/fallback-config' into 'develop'

Fallback to Config if Mix.Config does not exist, even if Config does not exist either

See merge request pleroma/pleroma!1320

5 years agomix: update bbcode dependency to v0.1.1
William Pitcock [Fri, 21 Jun 2019 23:42:50 +0000 (23:42 +0000)]
mix: update bbcode dependency to v0.1.1

5 years agoFallback to Config if Mix.Config does not exist, even if Config does not
rinpatch [Fri, 21 Jun 2019 23:29:49 +0000 (02:29 +0300)]
Fallback to Config if Mix.Config does not exist, even if Config does not
exist either

For some weird reason Code.ensure_loaded?(Config) is false on OTP
releases even though `use Config` from config files works just fine.

5 years agoExecute migration commands as the pleroma user and add a note about the need to uncom...
rinpatch [Fri, 21 Jun 2019 23:20:55 +0000 (02:20 +0300)]
Execute migration commands as the pleroma user and add a note about the need to uncomment the RUM command

5 years agoCorrect the psql command
rinpatch [Fri, 21 Jun 2019 23:09:45 +0000 (02:09 +0300)]
Correct the psql command

5 years agoRemove the getting started steps from pleroma.instance gen task
rinpatch [Fri, 21 Jun 2019 23:07:05 +0000 (02:07 +0300)]
Remove the getting started steps from pleroma.instance gen task

They are not compatible with every platform, different for OTP releases
and may become outdated. We are better off just telling people to refer
to the installation guides for their particular platform

5 years agoMerge branch 'develop' into release-docs
rinpatch [Fri, 21 Jun 2019 23:00:18 +0000 (02:00 +0300)]
Merge branch 'develop' into release-docs

5 years agoMerge branch 'feature/mrf-anti-link-spam' into 'develop'
kaniini [Fri, 21 Jun 2019 22:56:54 +0000 (22:56 +0000)]
Merge branch 'feature/mrf-anti-link-spam' into 'develop'

implement anti link spam MRF

See merge request pleroma/pleroma!1307

5 years agoMerge branch 'fix/use-config-when-possible' into 'develop'
rinpatch [Fri, 21 Jun 2019 22:43:39 +0000 (22:43 +0000)]
Merge branch 'fix/use-config-when-possible' into 'develop'

use Config in generated config when available

See merge request pleroma/pleroma!1319

5 years agoMerge branch 'oauth_secure_redirect' into 'develop'
kaniini [Fri, 21 Jun 2019 22:31:12 +0000 (22:31 +0000)]
Merge branch 'oauth_secure_redirect' into 'develop'

OAuth security improvements (`redirect_uri` listing enforcement)

See merge request pleroma/pleroma!1302

5 years agoMerge branch 'revert-6f5a0cc1' into 'develop'
kaniini [Fri, 21 Jun 2019 22:28:46 +0000 (22:28 +0000)]
Merge branch 'revert-6f5a0cc1' into 'develop'

Revert "Merge branch 'fix/ogp-title' into 'develop'"

See merge request pleroma/pleroma!1317

5 years agochange the anti-link-spam MRF implementation to use old_user? instead of the previous...
William Pitcock [Fri, 21 Jun 2019 22:27:14 +0000 (22:27 +0000)]
change the anti-link-spam MRF implementation to use old_user? instead of the previous name

5 years agoMerge branch 'fix-rate-limit-test' into 'develop'
kaniini [Fri, 21 Jun 2019 22:25:09 +0000 (22:25 +0000)]
Merge branch 'fix-rate-limit-test' into 'develop'

Fix rate limiter tests

See merge request pleroma/pleroma!1316

5 years agouse Config in generated config when available
rinpatch [Fri, 21 Jun 2019 18:56:49 +0000 (21:56 +0300)]
use Config in generated config when available

Mix.Config is deprecated and does not work on OTP releases. However
we can't fully switch to Config because it is not present in
Elixir < 1.9. I tried to evaluate if Config is available at runtime,
but for some weird reason OTP releases crash if I do that.

5 years agoMerge branch 'move-sample-configs' into 'develop'
rinpatch [Fri, 21 Jun 2019 17:27:00 +0000 (17:27 +0000)]
Merge branch 'move-sample-configs' into 'develop'

Move config templates to priv so they can be found in releases

See merge request pleroma/pleroma!1318

5 years agoApply suggestion to docs/installation/releases_en.md
rinpatch [Fri, 21 Jun 2019 17:00:12 +0000 (17:00 +0000)]
Apply suggestion to docs/installation/releases_en.md

5 years agoApply suggestion to docs/installation/releases_en.md
rinpatch [Fri, 21 Jun 2019 16:59:56 +0000 (16:59 +0000)]
Apply suggestion to docs/installation/releases_en.md

5 years agoApply suggestion to docs/installation/releases_en.md
rinpatch [Fri, 21 Jun 2019 16:59:48 +0000 (16:59 +0000)]
Apply suggestion to docs/installation/releases_en.md

5 years agoMove config templates to priv so they can be found in releases
rinpatch [Fri, 21 Jun 2019 16:30:25 +0000 (19:30 +0300)]
Move config templates to priv so they can be found in releases

5 years agoFixed branch name substitutions for mix version (to comply to SemVer format).
Ivan Tashkinov [Fri, 21 Jun 2019 14:19:29 +0000 (17:19 +0300)]
Fixed branch name substitutions for mix version (to comply to SemVer format).

5 years agoRevert "Merge branch 'fix/ogp-title' into 'develop'"
feld [Fri, 21 Jun 2019 11:36:32 +0000 (11:36 +0000)]
Revert "Merge branch 'fix/ogp-title' into 'develop'"

This reverts merge request !1277

5 years agoFix rate limiter tests
Egor Kislitsyn [Fri, 21 Jun 2019 09:47:16 +0000 (16:47 +0700)]
Fix rate limiter tests

5 years agoDefault DB configuration to false and set the default database name to
rinpatch [Fri, 21 Jun 2019 03:42:04 +0000 (06:42 +0300)]
Default DB configuration to false and set the default database name to
`pleroma` instead of `pleroma_dev`

5 years agoMerge branch 'develop' into release-docs
rinpatch [Fri, 21 Jun 2019 03:41:13 +0000 (06:41 +0300)]
Merge branch 'develop' into release-docs

5 years agoDo not set ownership group in chown commands
rinpatch [Fri, 21 Jun 2019 03:39:03 +0000 (06:39 +0300)]
Do not set ownership group in chown commands

5 years agoRemove a useless echo
rinpatch [Fri, 21 Jun 2019 03:37:38 +0000 (06:37 +0300)]
Remove a useless echo

5 years agoChange to long adduser options because the short ones only work on busybox
rinpatch [Fri, 21 Jun 2019 03:32:34 +0000 (06:32 +0300)]
Change to long adduser options because the short ones only work on busybox

5 years agoAdd notes on RUM indexes
rinpatch [Fri, 21 Jun 2019 03:22:34 +0000 (06:22 +0300)]
Add notes on RUM indexes

5 years agoAdd a note about RUM indexes package on Debian/Ubuntu
rinpatch [Fri, 21 Jun 2019 03:14:02 +0000 (06:14 +0300)]
Add a note about RUM indexes package on Debian/Ubuntu

5 years agoCorrect package names for Debian
rinpatch [Fri, 21 Jun 2019 03:04:39 +0000 (06:04 +0300)]
Correct package names for Debian

5 years agoFormatting
rinpatch [Fri, 21 Jun 2019 02:57:46 +0000 (05:57 +0300)]
Formatting

5 years agoOTP release install guide sceleton
rinpatch [Fri, 21 Jun 2019 02:48:13 +0000 (05:48 +0300)]
OTP release install guide sceleton

5 years agoCopy the nginx config to the release directory
rinpatch [Fri, 21 Jun 2019 02:46:47 +0000 (05:46 +0300)]
Copy the nginx config to the release directory

5 years agoFix nginx webroot method config
rinpatch [Fri, 21 Jun 2019 02:46:21 +0000 (05:46 +0300)]
Fix nginx webroot method config

5 years agoMerge branch 'fix/config-gen-releases' into 'develop'
rinpatch [Thu, 20 Jun 2019 21:25:34 +0000 (21:25 +0000)]
Merge branch 'fix/config-gen-releases' into 'develop'

Refactor mix tasks a bit and make config generator work with releases

See merge request pleroma/pleroma!1312

5 years agoMerge branch 'fix/dynamic-configuration' into 'develop'
lain [Thu, 20 Jun 2019 17:43:57 +0000 (17:43 +0000)]
Merge branch 'fix/dynamic-configuration' into 'develop'

Fixes for dynamic configuration

See merge request pleroma/pleroma!1313

5 years agoFixes for dynamic configuration
Alexander Strizhakov [Thu, 20 Jun 2019 17:43:57 +0000 (17:43 +0000)]
Fixes for dynamic configuration

5 years agoDisable rpc for instance gen
rinpatch [Thu, 20 Jun 2019 15:27:17 +0000 (18:27 +0300)]
Disable rpc for instance gen

5 years agoFixed mix version computed for underscore-containing branches to be of SemVer format.
Ivan Tashkinov [Thu, 20 Jun 2019 14:54:16 +0000 (17:54 +0300)]
Fixed mix version computed for underscore-containing branches to be of SemVer format.

5 years agoMerge branch 'develop' into fix/config-gen-releases
rinpatch [Thu, 20 Jun 2019 08:51:16 +0000 (11:51 +0300)]
Merge branch 'develop' into fix/config-gen-releases

5 years agoMerge branch 'feature/release-update-script' into 'develop'
rinpatch [Thu, 20 Jun 2019 08:50:26 +0000 (08:50 +0000)]
Merge branch 'feature/release-update-script' into 'develop'

pleroma_ctl: add an update command

Closes #1004 and #988

See merge request pleroma/pleroma!1305

5 years agoApply suggestion to rel/files/bin/pleroma_ctl
rinpatch [Thu, 20 Jun 2019 08:12:56 +0000 (08:12 +0000)]
Apply suggestion to rel/files/bin/pleroma_ctl

5 years agoExport PLEROMA_BUILD_BRANCH
rinpatch [Thu, 20 Jun 2019 08:02:05 +0000 (11:02 +0300)]
Export PLEROMA_BUILD_BRANCH

5 years agodocs: better description for mrf anti link spam
William Pitcock [Thu, 20 Jun 2019 03:01:03 +0000 (03:01 +0000)]
docs: better description for mrf anti link spam

5 years agoAllow setting upload/static directories in the config generator
rinpatch [Thu, 20 Jun 2019 00:59:16 +0000 (03:59 +0300)]
Allow setting upload/static directories in the config generator

5 years agoRemove deprecated dedupe_media from the config template
rinpatch [Thu, 20 Jun 2019 00:40:00 +0000 (03:40 +0300)]
Remove deprecated dedupe_media from the config template

5 years agoRemove a useless binding from config template call
rinpatch [Wed, 19 Jun 2019 23:34:19 +0000 (02:34 +0300)]
Remove a useless binding from config template call

5 years agoRelease Tasks: Ensure the application is loaded before getting the
rinpatch [Wed, 19 Jun 2019 23:20:20 +0000 (02:20 +0300)]
Release Tasks: Ensure the application is loaded before getting the
modules

Needed for non-rpc tasks to work

5 years agoRename Pleroma.Mix.Tasks.Common -> Mix.Pleroma and import it's functions
rinpatch [Wed, 19 Jun 2019 23:05:19 +0000 (02:05 +0300)]
Rename Pleroma.Mix.Tasks.Common -> Mix.Pleroma and import it's functions
instead of aliasing

This seems to be the convention for functions that can be reused between
different mix tasks in all Elixir projects I've seen and it gets rid on
an error message when someone runs mix pleroma.common

Also in this commit by accident:
- Move benchmark task under a proper namespace
- Insert a space after the prompt

5 years agoMerge branch 'user_sign_out_mix_task' into 'develop'
rinpatch [Wed, 19 Jun 2019 19:51:38 +0000 (19:51 +0000)]
Merge branch 'user_sign_out_mix_task' into 'develop'

User sign out mix task

See merge request pleroma/pleroma!1309

5 years agoApply suggestion to lib/mix/tasks/pleroma/user.ex
Ivan Tashkinov [Wed, 19 Jun 2019 19:39:53 +0000 (19:39 +0000)]
Apply suggestion to lib/mix/tasks/pleroma/user.ex

5 years agoUser sign out mix task.
Ivan Tashkinov [Wed, 19 Jun 2019 19:29:36 +0000 (22:29 +0300)]
User sign out mix task.

5 years agounbreak polls
William Pitcock [Wed, 19 Jun 2019 16:33:49 +0000 (16:33 +0000)]
unbreak polls

5 years agoimplement anti link spam MRF
William Pitcock [Wed, 19 Jun 2019 15:57:44 +0000 (15:57 +0000)]
implement anti link spam MRF

5 years agopleroma_ctl: Rename arch to flavour because it also includes the libc
rinpatch [Wed, 19 Jun 2019 11:59:12 +0000 (14:59 +0300)]
pleroma_ctl: Rename arch to flavour because it also includes the libc

5 years agopleroma_ctl: add an update command
rinpatch [Wed, 19 Jun 2019 11:53:16 +0000 (14:53 +0300)]
pleroma_ctl: add an update command

Closes #988 and #1004

5 years agoMake possible to override the branch name via a env variable
rinpatch [Wed, 19 Jun 2019 11:40:39 +0000 (14:40 +0300)]
Make possible to override the branch name via a env variable

This is useful for the CI builds because they have a detached HEAD or
for emulating a feature that is availible only on a particular branch
(e.g pleroma_ctl downloads CI artifacts only for develop and master)

5 years agoMerge branch 'logger-level-for-migration-tasks' into 'develop'
rinpatch [Wed, 19 Jun 2019 10:33:33 +0000 (10:33 +0000)]
Merge branch 'logger-level-for-migration-tasks' into 'develop'

Logger level for migration tasks

Closes #983

See merge request pleroma/pleroma!1295

5 years agoaliases for mix tasks
Alexander Strizhakov [Wed, 19 Jun 2019 10:33:33 +0000 (10:33 +0000)]
aliases for mix tasks

ecto.migrate
ecto.rollback

5 years agoMerge branch 'begone-the-dot-hack' into 'develop'
rinpatch [Wed, 19 Jun 2019 10:22:23 +0000 (10:22 +0000)]
Merge branch 'begone-the-dot-hack' into 'develop'

Remove the dot hack when posting from Mastodon API and add proper errors when the post exceeds character limits

See merge request pleroma/pleroma!1298

5 years agoMerge branch 'fix/rich-media-hashtags-again' into 'develop'
lain [Wed, 19 Jun 2019 08:48:41 +0000 (08:48 +0000)]
Merge branch 'fix/rich-media-hashtags-again' into 'develop'

Rich Media: Skip Microformats hashtags

See merge request pleroma/pleroma!1304

5 years agoMerge branch 'update-frontend-c4fcdc71' into 'develop'
lain [Wed, 19 Jun 2019 08:37:34 +0000 (08:37 +0000)]
Merge branch 'update-frontend-c4fcdc71' into 'develop'

Update bundled pleroma-fe to c4fcdc71

See merge request pleroma/pleroma!1303

5 years agoRefactor pleroma_ctl copying to a generic function for copying files into the release dir
rinpatch [Wed, 19 Jun 2019 00:51:59 +0000 (03:51 +0300)]
Refactor pleroma_ctl copying to a generic function for copying files into the release dir

5 years agoRich Media: Skip Microformats hashtags
rinpatch [Tue, 18 Jun 2019 21:31:30 +0000 (00:31 +0300)]
Rich Media: Skip Microformats hashtags

When fixing this problem I incorrectly assumed a.hashtag is
the proper way for detecting hashtags, but it is just something Pleroma and
Mastodon add. Per microformats it should be detected by the presense of rel=tag.

This MR adds a check for rel=tag, but I still left a.hashtag just in case

5 years agoUpdate bundled pleroma-fe to c4fcdc71
rinpatch [Tue, 18 Jun 2019 21:04:00 +0000 (00:04 +0300)]
Update bundled pleroma-fe to c4fcdc71

5 years agoMerge branch 'deps/update-auto-linker' into 'develop'
lain [Tue, 18 Jun 2019 20:47:36 +0000 (20:47 +0000)]
Merge branch 'deps/update-auto-linker' into 'develop'

Deps: Update auto_linker

See merge request pleroma/pleroma!1300

5 years agoMerge branch 'fix/mastoapi-sanitize-display-name' into 'develop'
lain [Tue, 18 Jun 2019 20:47:07 +0000 (20:47 +0000)]
Merge branch 'fix/mastoapi-sanitize-display-name' into 'develop'

Mastodon API: Sanitize display names

Closes #1000

See merge request pleroma/pleroma!1299

5 years agoMinor edit (comment).
Ivan Tashkinov [Tue, 18 Jun 2019 14:15:26 +0000 (17:15 +0300)]
Minor edit (comment).

5 years agoAdded more `redirect_uri` checks to prevent redirect to not explicitly listed URI.
Ivan Tashkinov [Tue, 18 Jun 2019 14:00:49 +0000 (17:00 +0300)]
Added more `redirect_uri` checks to prevent redirect to not explicitly listed URI.

5 years agoDeps: Update auto_linker
rinpatch [Tue, 18 Jun 2019 13:08:18 +0000 (16:08 +0300)]
Deps: Update auto_linker

5 years agoMastodon API: Sanitize display names
rinpatch [Tue, 18 Jun 2019 11:09:15 +0000 (14:09 +0300)]
Mastodon API: Sanitize display names

Closes #1000

5 years agoAdd proper error handling for when the post exceeds character limits
rinpatch [Tue, 18 Jun 2019 02:05:05 +0000 (05:05 +0300)]
Add proper error handling for when the post exceeds character limits