diff options
author | sils <sils@sils.li> | 2023-10-14 15:28:05 +0200 |
---|---|---|
committer | sils <sils@sils.li> | 2023-10-14 15:28:05 +0200 |
commit | 04e4866a17853d583c943b52ec2b9c5e7518e4ae (patch) | |
tree | bd079002dbebd4fffc533596c3f4e5a99a6b3a56 /system/impermanence | |
parent | Fix(system/services/etebase): Add proxy parameters (diff) | |
parent | fix(system/services/mastodon): Correctly avoid string casts (diff) | |
download | nixos-server-04e4866a17853d583c943b52ec2b9c5e7518e4ae.tar.gz nixos-server-04e4866a17853d583c943b52ec2b9c5e7518e4ae.zip |
Merge branch 'main' into etebase
Diffstat (limited to 'system/impermanence')
-rw-r--r-- | system/impermanence/default.nix | 6 | ||||
-rw-r--r-- | system/impermanence/mods/mastodon.nix | 10 | ||||
-rw-r--r-- | system/impermanence/mods/matrix.nix | 6 | ||||
-rw-r--r-- | system/impermanence/mods/murmur.nix | 10 | ||||
-rw-r--r-- | system/impermanence/mods/postgresql.nix (renamed from system/impermanence/mods/keycloak.nix) | 0 | ||||
-rw-r--r-- | system/impermanence/mods/taskserver.nix | 5 |
6 files changed, 36 insertions, 1 deletions
diff --git a/system/impermanence/default.nix b/system/impermanence/default.nix index 0d3bd82..3c923d8 100644 --- a/system/impermanence/default.nix +++ b/system/impermanence/default.nix @@ -3,12 +3,16 @@ imports = [ ./mods/acme.nix ./mods/etebase-server.nix - ./mods/keycloak.nix + ./mods/fail2ban.nix ./mods/mail.nix + ./mods/mastodon.nix ./mods/matrix.nix ./mods/minecraft.nix + ./mods/murmur.nix ./mods/nix-sync.nix ./mods/openssh.nix + ./mods/postgresql.nix + ./mods/taskserver.nix ./mods/users.nix ]; diff --git a/system/impermanence/mods/mastodon.nix b/system/impermanence/mods/mastodon.nix new file mode 100644 index 0000000..a5bdbfd --- /dev/null +++ b/system/impermanence/mods/mastodon.nix @@ -0,0 +1,10 @@ +{...}: { + environment.persistence."/srv".directories = [ + { + directory = "/var/lib/mastodon"; + user = "mastodon"; + group = "mastodon"; + mode = "0700"; + } + ]; +} diff --git a/system/impermanence/mods/matrix.nix b/system/impermanence/mods/matrix.nix index 7f02609..3af6530 100644 --- a/system/impermanence/mods/matrix.nix +++ b/system/impermanence/mods/matrix.nix @@ -6,6 +6,12 @@ group = "matrix-synapse"; mode = "0700"; } + { + directory = "/var/lib/mautrix-whatsapp"; + user = "mautrix-whatsapp"; + group = "matrix-synapse"; + mode = "0750"; + } ]; systemd.tmpfiles.rules = [ "d /etc/matrix 0755 matrix-synapse matrix-synapse" diff --git a/system/impermanence/mods/murmur.nix b/system/impermanence/mods/murmur.nix new file mode 100644 index 0000000..48912e1 --- /dev/null +++ b/system/impermanence/mods/murmur.nix @@ -0,0 +1,10 @@ +{...}: { + environment.persistence."/srv".directories = [ + { + directory = "/var/lib/murmur"; + user = "murmur"; + group = "murmur"; + mode = "0700"; + } + ]; +} diff --git a/system/impermanence/mods/keycloak.nix b/system/impermanence/mods/postgresql.nix index 63b02f5..63b02f5 100644 --- a/system/impermanence/mods/keycloak.nix +++ b/system/impermanence/mods/postgresql.nix diff --git a/system/impermanence/mods/taskserver.nix b/system/impermanence/mods/taskserver.nix new file mode 100644 index 0000000..9208aa4 --- /dev/null +++ b/system/impermanence/mods/taskserver.nix @@ -0,0 +1,5 @@ +{...}: { + environment.persistence."/srv".directories = [ + "/var/lib/taskserver" + ]; +} |