public
/
mastodon-container
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add users for groups

This commit is contained in:
niten 2024-01-06 10:41:10 -08:00
parent 628c81b232
commit 4dbb0e5c27
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
mastodon-container.nix
View File

@ -58,7 +58,7 @@ let
try_files $uri @proxy; try_files $uri @proxy;
} }
location ~ ^/(emoji|packs|system/accounts/avatars|system/media_attachments/files) { location ~ /(emoji|packs|system/accounts/avatars|system/media_attachments/files) {
add_header Cache-Control "public, max-age=31536000, immutable"; add_header Cache-Control "public, max-age=31536000, immutable";
add_header Strict-Transport-Security "max-age=31536000" always; add_header Strict-Transport-Security "max-age=31536000" always;
try_files $uri @proxy; try_files $uri @proxy;
@ -201,21 +201,26 @@ in {
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
users.users = { users = {
mastodon = { users = {
isSystemUser = true; mastodon = {
group = "mastodon"; isSystemUser = true;
uid = cfg.uids.mastodon; group = "mastodon";
uid = cfg.uids.mastodon;
};
mastodon-postgres = {
isSystemUser = true;
group = "mastodon";
uid = cfg.uids.postgres;
};
mastodon-redis = {
isSystemUser = true;
group = "mastodon";
uid = cfg.uids.redis;
};
}; };
mastodon-postgres = { groups.mastodon = {
isSystemUser = true; members = [ "mastodon" "mastodon-postgres" "mastodon-redis" ];
group = "mastodon";
uid = cfg.uids.postgres;
};
mastodon-redis = {
isSystemUser = true;
group = "mastodon";
uid = cfg.uids.redis;
}; };
}; };
@ -290,7 +295,6 @@ in {
volumes = volumes =
[ "${cfg.state-directory}/postgres:/var/lib/postgresql/data" ]; [ "${cfg.state-directory}/postgres:/var/lib/postgresql/data" ];
healthcheck.test = [ "CMD" "pg_isready" "-U" "mastodon" ]; healthcheck.test = [ "CMD" "pg_isready" "-U" "mastodon" ];
# environment.POSTGRES_HOST_AUTH_METHOD = "trust";
user = mkUserMap cfg.uids.postgres; user = mkUserMap cfg.uids.postgres;
env_file = [ env_file = [
hostSecrets.mastodonCommonEnv.target-file hostSecrets.mastodonCommonEnv.target-file