nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Compare commits

merge into: nrd.li:develop
Branches Tags
nrd.li:stable
nrd.li:develop
...
pull from: nrd.li:stable
Branches Tags
nrd.li:stable
nrd.li:develop

30 commits
develop ... stable

Author SHA1 Message Date
Kegan Myers 024578a659 install bash to container 2023-07-23 15:07:55 -05:00
Kegan Myers dd17e0353a allow specifying secret file location 2023-07-23 14:35:54 -05:00
FloatingGhost 9d7c877de0 Merge branch 'develop' into stable 2023-05-26 20:46:56 +01:00
FloatingGhost 39a878f530 Merge branch 'develop' into stable 2023-05-26 12:07:05 +01:00
FloatingGhost dcee1b109b Merge branch 'develop' into stable 2023-05-26 12:05:11 +01:00
FloatingGhost 9a8373a3f5 Merge branch 'develop' into stable 2023-05-23 14:10:19 +01:00
FloatingGhost ccae7ef824 Merge branch 'develop' into stable 2023-04-14 18:10:07 +01:00
FloatingGhost 8504878187 Merge branch 'develop' into stable 2023-04-14 18:09:32 +01:00
FloatingGhost fef4bae006 Merge branch 'develop' into stable 2023-03-11 18:25:07 +00:00
FloatingGhost 86dcf273c5 Merge branch 'develop' into stable 2023-03-11 17:26:58 +00:00
FloatingGhost 36cb19dbf2 Merge branch 'develop' into stable 2023-02-15 22:13:30 +00:00
FloatingGhost 71d08991ea Merge branch 'develop' into stable 2023-02-11 11:19:42 +00:00
FloatingGhost d756607112 Merge branch 'develop' into stable 2023-02-11 10:59:04 +00:00
FloatingGhost 367bc9c818 Merge branch 'develop' into stable 2023-02-11 10:57:01 +00:00
FloatingGhost 81caf77223 Merge branch 'develop' into stable 2023-02-11 10:49:01 +00:00
FloatingGhost 551f92dd50 Merge branch 'develop' into stable 2023-02-11 10:43:22 +00:00
floatingghost d9508474b6 Merge pull request 'clean-up docs to avoid version-mismatches in BE and FE in new installs (for stable)' (#378) from stefan230/akkoma:stable into stable 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/378
 2022-12-19 10:59:34 +00:00
Stefan f676007b18 clean-up docs to avoid mismatches in BE and FE. Clearly state that stable-versions are installed 2022-12-16 17:23:31 +01:00
FloatingGhost 63f2d1cbef Merge branch 'develop' into stable 2022-12-10 14:50:35 +00:00
FloatingGhost f91b896731 Merge branch 'develop' into stable 2022-11-12 15:34:19 +00:00
FloatingGhost af90a4e51b Merge branch 'develop' into stable 2022-10-14 12:49:46 +01:00
FloatingGhost 5e7be063c7 Merge branch 'develop' into stable 2022-10-08 12:12:52 +01:00
FloatingGhost a1317bf541 use on-release tag 2022-09-20 13:36:28 +01:00
FloatingGhost a0dd670e68 ensure we use the same OTP for all releases 2022-09-20 13:34:50 +01:00
floatingghost 11d29d27b8 Ensure migrations succeed (#216) 
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/216
 2022-09-16 12:53:45 +01:00
FloatingGhost 44da806a77 Merge branch 'develop' into stable 2022-09-10 17:13:49 +01:00
floatingghost d7c805b0bb Merge pull request '2022.09 stable' (#208) from develop into stable 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/208
 2022-09-10 16:06:18 +00:00
floatingghost c52982e9c5 add finch outbound proxy support (#158) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/158
 2022-08-24 16:03:17 +01:00
floatingghost 2e433e106f generate-keys-at-registration-time (#181) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/181
 2022-08-24 15:39:30 +01:00
floatingghost bfbe4e8dce Merge pull request 'stable release' (#160) from develop into stable 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/160
 2022-08-12 15:25:01 +00:00
3 changed files with 8 additions and 3 deletions
Show stats Expand all files Collapse all files

5
CHANGELOG.md
View file

@ -190,6 +190,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
## 2022.08
### Removed
- Non-finch HTTP adapters. `:tesla, :adapter` is now highly recommended to be set to the default.
## 2022.08
### Added
- extended runtime module support, see config cheatsheet
- quote posting; quotes are limited to public posts

2
Dockerfile
View file

@ -14,7 +14,7 @@ LABEL org.opencontainers.image.title="akkoma" \
org.opencontainers.image.revision=$VCS_REF \
org.opencontainers.image.created=$BUILD_DATE
RUN apk add git gcc g++ musl-dev make cmake file-dev exiftool ffmpeg imagemagick libmagic ncurses postgresql-client
RUN apk add git gcc g++ musl-dev make cmake file-dev exiftool ffmpeg imagemagick libmagic ncurses postgresql-client bash
EXPOSE 4000

4
config/prod.exs
View file

@ -63,8 +63,8 @@
# Finally import the config/prod.secret.exs
# which should be versioned separately.
if File.exists?("./config/prod.secret.exs") do
import_config "prod.secret.exs"
if File.exists?(System.get_env("PROD_SECRET_FILE", "./config/prod.secret.exs")) do
import_config System.get_env("PROD_SECRET_FILE", "./config/prod.secret.exs")
else
"`config/prod.secret.exs` not found. You may want to create one by running `mix pleroma.instance gen`"
|> IO.warn([])