versia-pub/activitypub
2
0
Fork 0
mirror of https://github.com/versia-pub/activitypub.git synced 2025-12-06 14:48:19 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: simplify nix module

Browse source
This commit is contained in:
April John 2024-05-06 16:12:40 +02:00
parent 4c3d06b686
commit 1340f00167
Signed by: aprl
GPG key ID: BCB934A2909C5460
1 changed files with 11 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
module.nix
View file

@ -44,7 +44,7 @@ let
}; };
}; };
dbconfone = lib.mkIf cfg.database.createLocally { dbconfone = lib.mkIf cfg.database.createLocally {
systemd.services.lysandap.serviceConfig.Environment = { systemd.services.lysandap.Environment = {
DATABASE_URL = "postgresql:///${cfg.database.user}@localhost/${cfg.database.dbname}"; DATABASE_URL = "postgresql:///${cfg.database.user}@localhost/${cfg.database.dbname}";
"PORT" = "${toString cfg.port}"; "PORT" = "${toString cfg.port}";
"ADDRESS" = "${cfg.address}:${toString cfg.port}"; "ADDRESS" = "${cfg.address}:${toString cfg.port}";
@ -54,7 +54,7 @@ let
}; };
}; };
dbconftwo = lib.mkIf (cfg.database.createLocally == false) { dbconftwo = lib.mkIf (cfg.database.createLocally == false) {
systemd.services.lysandap.serviceConfig.Environment = { systemd.services.lysandap.Environment = {
DATABASE_URL = "postgresql://${cfg.database.user}:${cfg.database.passwordFile}@${cfg.database.host}:${toString cfg.database.port}/${cfg.database.dbname}"; DATABASE_URL = "postgresql://${cfg.database.user}:${cfg.database.passwordFile}@${cfg.database.host}:${toString cfg.database.port}/${cfg.database.dbname}";
"PORT" = "${toString cfg.port}"; "PORT" = "${toString cfg.port}";
"ADDRESS" = "${cfg.address}:${toString cfg.port}"; "ADDRESS" = "${cfg.address}:${toString cfg.port}";
@ -248,46 +248,25 @@ in
{ {
systemd.services.lysandap = { systemd.services.lysandap = {
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
wants = [ "network-online.target" ]; #wants = [ "network-online.target" ];
after = [ "network-online.target" ] ++ lib.optional cfg.database.createLocally "postgresql.service"; #after = [ "network-online.target" ] ++ lib.optional cfg.database.createLocally "postgresql.service";
requires = lib.optional cfg.database.createLocally "postgresql.service"; #requires = lib.optional cfg.database.createLocally "postgresql.service";
description = "Lysand AP layer"; script = "${cfg.package}/bin/lysandap";
serviceConfig = { preStart = "${cfg.mig-package}/bin/ls-ap-migration up";
ExecStart = "${cfg.package}/bin/lysandap"; Environment = lib.mkDefault {
ExecStartPre = "${cfg.mig-package}/bin/ls-ap-migration up";
Environment = lib.mkDefault {
"PORT" = "${toString cfg.port}"; "PORT" = "${toString cfg.port}";
"ADDRESS" = "${cfg.address}:${toString cfg.port}"; "ADDRESS" = "${cfg.address}:${toString cfg.port}";
"FEDERATED_DOMAIN" = cfg.domain; "FEDERATED_DOMAIN" = cfg.domain;
"SERVICE_SCALE" = toString cfg.serviceScale; "SERVICE_SCALE" = toString cfg.serviceScale;
"LOCAL_USER_NAME" = "example"; "LOCAL_USER_NAME" = "example";
}; };
serviceConfig = {
RestartSec = "2s";
DynamicUser = true; DynamicUser = true;
User = lib.mkIf (cfg.database.createLocally || cfg.serviceScale > 1) "lysandap"; User = lib.mkIf (cfg.database.createLocally || cfg.serviceScale > 1) "lysandap";
StateDirectory = "lysandap"; StateDirectory = "lysandap";
StateDirectoryMode = "0750"; StateDirectoryMode = "0750";
WorkingDirectory = cfg.package;
CapabilityBoundingSet = "";
PrivateDevices = true;
PrivateUsers = true;
ProtectHome = true;
ProtectKernelLogs = true;
ProtectProc = "invisible";
RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ];
RestrictNamespaces = true;
SystemCallArchitectures = "native";
SystemCallFilter = [ "@system-service" "~@privileged" "~@resources" ];
# Because of various potential issues related to alpha/beta software, it is recommended to
# enable the following options to ensure the Lysand AP instance is restarted daily.
# This option enables the automatic restarting of the Invidious instance.
# To ensure multiple instances of Invidious are not restarted at the exact same time, a
# randomized extra offset of up to 5 minutes is added.
Restart = lib.mkDefault "always"; Restart = lib.mkDefault "always";
RuntimeMaxSec = lib.mkDefault "1h";
RuntimeRandomizedExtraSec = lib.mkDefault "5min";
}; };
}; };
} }