fricloud/server-configs
2
0
Fork 0
Code Issues 4 Pull requests Projects Releases Packages Wiki Activity Actions

Add Mastodon #14

Merged
eyjhb merged 1 commit from RasmusRendal/mastodon into main 2025-09-19 17:12:04 +00:00
Conversation 1 Commits 1 Files changed 6 +155
rasmus commented 2025-09-18 16:49:36 +00:00
Owner
Copy link

weee

weee
rasmus force-pushed RasmusRendal/mastodon from 3e6b804dfb to 232099c86c 2025-09-18 16:58:52 +00:00 Compare
rasmus force-pushed RasmusRendal/mastodon from 232099c86c to 419383ccc7 2025-09-18 17:01:05 +00:00 Compare
rasmus force-pushed RasmusRendal/mastodon from 419383ccc7 to a6c63758f8 2025-09-18 17:03:18 +00:00 Compare
rasmus force-pushed RasmusRendal/mastodon from a6c63758f8 to 189686e196 2025-09-18 22:51:35 +00:00 Compare
eyjhb requested changes 2025-09-19 05:05:54 +00:00
eyjhb left a comment
Owner
Copy link

Stuff and things to change

Stuff and things to change
machines/gerd/services/mastodon.nix Outdated
@ -0,0 +5,4 @@
}:
let
svc_domain = "mastodon.${config.mine.shared.settings.domain}";
# I'm copying Drasl, yeah. Why "Authelia" is defined here, eyJhb should know
eyjhb commented 2025-09-19 05:04:12 +00:00
Owner
Copy link

Delete comment

Delete comment
rasmus marked this conversation as resolved
machines/gerd/services/mastodon.nix Outdated
@ -0,0 +6,4 @@
let
svc_domain = "mastodon.${config.mine.shared.settings.domain}";
# I'm copying Drasl, yeah. Why "Authelia" is defined here, eyJhb should know
draslOIDCName = "Authelia";
eyjhb commented 2025-09-19 05:03:35 +00:00
Owner
Copy link

Line 56 in 886a88f
Name = draslOIDCName;

Also, drasl?

https://git.fricloud.dk/fricloud/server-configs/src/commit/886a88f279bd13d6580c2613070abb4585fe5442/machines/gerd/services/drasl.nix#L56 Also, drasl?
rasmus marked this conversation as resolved
machines/gerd/services/mastodon.nix Outdated
@ -0,0 +7,4 @@
svc_domain = "mastodon.${config.mine.shared.settings.domain}";
# I'm copying Drasl, yeah. Why "Authelia" is defined here, eyJhb should know
draslOIDCName = "Authelia";
OidcClientId = "mastodon";
eyjhb commented 2025-09-19 05:03:51 +00:00
Owner
Copy link

Lowercase the first letter -> oidcClientId

Lowercase the first letter -> `oidcClientId`
rasmus marked this conversation as resolved
machines/gerd/services/mastodon.nix Outdated
@ -0,0 +16,4 @@
configureNginx = true;
# Chosen at random.
# Come get me, eyJhb
eyjhb commented 2025-09-19 05:04:05 +00:00
Owner
Copy link

Delete comment

Delete comment
rasmus marked this conversation as resolved
machines/gerd/services/mastodon.nix Outdated
@ -0,0 +29,4 @@
# Documented in this PR https://github.com/mastodon/mastodon/pull/16221
# https://github.com/mastodon/mastodon/blob/main/config/initializers/3_omniauth.rb#L74
#
# Maybe we want to look at https://www.authelia.com/integration/openid-connect/clients/mastodon/
eyjhb commented 2025-09-19 05:04:25 +00:00
Owner
Copy link

Look at it

Look at it
rasmus marked this conversation as resolved
machines/gerd/services/mastodon.nix Outdated
@ -0,0 +33,4 @@
# I haven't
(pkgs.writeText "mastodon env crap" ''
OIDC_ENABLED=true
OIDC_DISPLAY_NAME="${svc_domain}"
eyjhb commented 2025-09-19 05:04:51 +00:00
Owner
Copy link

Should be oidcName

Should be `oidcName`
rasmus marked this conversation as resolved
machines/gerd/services/mastodon.nix Outdated
@ -0,0 +75,4 @@
mine.shared.meta.mastodon = {
name = "Mastodon";
description = ''
Everyone knows what Mastodon is
eyjhb commented 2025-09-19 05:05:25 +00:00
Owner
Copy link

Nope!

Nope!
rasmus marked this conversation as resolved
secrets/secrets.nix Outdated
@ -81,6 +81,8 @@ in
# drasl
"drasl/authelia-secret.age".publicKeys = defaultAccess;
"mastodon/authelia-secret.age".publicKeys = defaultAccess;
eyjhb commented 2025-09-19 05:05:44 +00:00
Owner
Copy link

Where is my damn comment above this?

Where is my damn comment above this?
rasmus marked this conversation as resolved
rasmus force-pushed RasmusRendal/mastodon from 189686e196 to e6d0f9345d 2025-09-19 05:36:51 +00:00 Compare
rasmus force-pushed RasmusRendal/mastodon from e6d0f9345d to 0cbe0fcedb 2025-09-19 09:26:09 +00:00 Compare
rasmus force-pushed RasmusRendal/mastodon from 0cbe0fcedb to 3cfcf75b92 2025-09-19 09:58:17 +00:00 Compare
rasmus changed title from wip: implement mastodon to Add Mastodon 2025-09-19 10:00:23 +00:00
eyjhb merged commit 6f9d96776e into main 2025-09-19 17:12:04 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
eyjhb
Labels
Clear labels   
bug

Something is not working

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
help wanted

Need some help

  
invalid

Something is wrong

  
question

More information is needed

  
urgent

MERGE NU JOHAN!

  
wontfix

This won't be fixed

No labels
bug
duplicate
enhancement
help wanted
invalid
question
urgent
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
fricloud/server-configs!14
No description provided.