Compare commits

..

No commits in common. "43e97d65c4e1e29c1abdd1bebbdb31a4698aacc7" and "38390db87c8f2b6c247f86d575681a6d03934068" have entirely different histories.

5 changed files with 10 additions and 15 deletions

View file

@ -947,11 +947,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1706173671, "lastModified": 1705566941,
"narHash": "sha256-lciR7kQUK2FCAYuszyd7zyRRmTaXVeoZsCyK6QFpGdk=", "narHash": "sha256-CLNtVRDA8eUPk+bxsCCZtRO0Cp+SpHdn1nNOLoFypLs=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4fddc9be4eaf195d631333908f2a454b03628ee5", "rev": "b06ff4bf8f4ad900fe0c2a61fc2946edc3a84be7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -963,11 +963,11 @@
}, },
"nixpkgs_10": { "nixpkgs_10": {
"locked": { "locked": {
"lastModified": 1706098335, "lastModified": 1705458851,
"narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=", "narHash": "sha256-uQvEhiv33Zj/Pv364dTvnpPwFSptRZgVedDzoM+HqVg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a77ab169a83a4175169d78684ddd2e54486ac651", "rev": "8bf65f17d8070a0a490daf5f1c784b87ee73982c",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -22,8 +22,8 @@ let
}; };
authentik = mkImage { authentik = mkImage {
imageName = "ghcr.io/goauthentik/server"; imageName = "ghcr.io/goauthentik/server";
finalImageTag = "2023.10.6"; finalImageTag = "2023.8.3";
imageDigest = "sha256:101f83c43ccb80de1f8035d1153ce8ebcdba35e6bf98ac7168d8d7fc5d09827f"; imageDigest = "sha256:82a07af063e8f93d0f174b6b058fcb6d54cd31ca2a271d23173cb149e19e8116";
}; };
}; };
authentikEnv = pkgs.writeText "authentik.env" '' authentikEnv = pkgs.writeText "authentik.env" ''

View file

@ -73,7 +73,7 @@ with lib;
global.server_name = server_name; global.server_name = server_name;
global.port = instance.port; global.port = instance.port;
global.allow_registration = instance.allow_registration; global.allow_registration = instance.allow_registration;
global.database_path = "/mnt/data/${srvName}/"; global.database_path = "/var/lib/${srvName}/";
}); });
in in
{ {
@ -103,8 +103,7 @@ with lib;
"@system-service" "@system-service"
"~@privileged" "~@privileged"
]; ];
StateDirectory = "/mnt/data/${srvName}"; StateDirectory = "${srvName}";
BindPaths = [ "/mnt/data/${srvName}" ];
ExecStart = "${cfg.package}/bin/conduit"; ExecStart = "${cfg.package}/bin/conduit";
Restart = "on-failure"; Restart = "on-failure";
RestartSec = 10; RestartSec = 10;

View file

@ -47,7 +47,6 @@
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
git git
htop-vim htop-vim
kakoune
docker-compose docker-compose
]; ];

View file

@ -152,11 +152,8 @@ in
}; };
federation.ENABLED = true; federation.ENABLED = true;
}; };
stateDir = "/mnt/data/gitea";
mailerPasswordFile = secrets."gitea/mailer-password".path; mailerPasswordFile = secrets."gitea/mailer-password".path;
database = { database = {