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

bump from nixos-24.11 to nixos-unstable + bumped stateVersion

Browse source
This commit is contained in:
eyjhb 2024-08-16 14:19:37 +02:00
parent 438f375f8e
commit 3ab76ae616
No known key found for this signature in database
GPG key ID: 609F508E3239F920
5 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
machines/gerd.nix
View file

@ -48,5 +48,5 @@
}; };
}; };
system.stateVersion = "24.05"; system.stateVersion = "24.11";
} }

5
machines/gerd/services/authelia/authelia.nix
View file

@ -4,6 +4,7 @@ let
svc_domain = "auth.${config.mine.shared.settings.domain}"; svc_domain = "auth.${config.mine.shared.settings.domain}";
autheliaStateDir = "/var/lib/authelia-main"; autheliaStateDir = "/var/lib/authelia-main";
port = 9091;
in { in {
services.authelia.instances.main = { services.authelia.instances.main = {
enable = true; enable = true;
@ -19,6 +20,8 @@ in {
settings = { settings = {
session.domain = config.mine.shared.settings.domain; session.domain = config.mine.shared.settings.domain;
server.address = "tcp://127.0.0.1:${builtins.toString port}";
# totp - disable for now, as it requires email server # totp - disable for now, as it requires email server
access_control.default_policy = "one_factor"; access_control.default_policy = "one_factor";
# totp.disable = true; # totp.disable = true;
@ -62,7 +65,7 @@ in {
services.nginx.virtualHosts."${svc_domain}" = { services.nginx.virtualHosts."${svc_domain}" = {
forceSSL = true; forceSSL = true;
enableACME = true; enableACME = true;
locations."/".proxyPass = "http://localhost:${builtins.toString config.services.authelia.instances.main.settings.server.port}"; locations."/".proxyPass = "http://localhost:${builtins.toString port}";
}; };
# persistent files # persistent files

1
machines/gerd/services/forgejo/auth_sources.nix
View file

@ -83,7 +83,6 @@ let
echo "PRERUN-AUTH: Finished adding/updating..." echo "PRERUN-AUTH: Finished adding/updating..."
''; '';
in { in {
systemd.services.forgejo.preStart = lib.mkAfter '' systemd.services.forgejo.preStart = lib.mkAfter ''
${scriptAddLDAPAuth} ${scriptAddLDAPAuth}
${scriptAddOAuth} ${scriptAddOAuth}

4
machines/gerd/services/nextcloud.nix
View file

@ -129,7 +129,7 @@ in {
version = "3.1.1"; version = "3.1.1";
# TODO(eyJhb): add to niv # TODO(eyJhb): add to niv
in pkgs.fetchNextcloudApp { in pkgs.fetchNextcloudApp {
sha256 = "sha256-EVHDDFtz92lZviuTqr+St7agfBWok83HpfuL6DFCoTE="; sha256 = "sha256-b/tKk+y+ZypCHGNDtunDua2msYD6/TzA0haoC0k85F4=";
url = "https://github.com/pulsejet/nextcloud-oidc-login/releases/download/v${version}/oidc_login.tar.gz"; url = "https://github.com/pulsejet/nextcloud-oidc-login/releases/download/v${version}/oidc_login.tar.gz";
license = "agpl3Only"; license = "agpl3Only";
}; };
@ -162,7 +162,7 @@ in {
systemd.services.nextcloud-setup = { systemd.services.nextcloud-setup = {
# runs this after all the main nextcloud-setup stuff # runs this after all the main nextcloud-setup stuff
postStop = lib.mkAfter '' script = lib.mkAfter ''
${nextcloudSetupLdap} ${nextcloudSetupLdap}
${nextcloudSetupAdmin} ${nextcloudSetupAdmin}
${nextcloudSetupEncryption} ${nextcloudSetupEncryption}

14
shared/sources/sources.json
View file

@ -35,16 +35,22 @@
"url": "https://github.com/nix-community/impermanence/archive/23c1f06316b67cb5dabdfe2973da3785cfe9c34a.tar.gz", "url": "https://github.com/nix-community/impermanence/archive/23c1f06316b67cb5dabdfe2973da3785cfe9c34a.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"nixpkgs": { "nixos-mailserver": {
"branch": "nixos-24.05", "branch": "nixos-24.05",
"repo": "git@gitlab.com:simple-nixos-mailserver/nixos-mailserver.git",
"rev": "29916981e7b3b5782dc5085ad18490113f8ff63b",
"type": "git"
},
"nixpkgs": {
"branch": "nixos-unstable",
"description": "Nix Packages collection", "description": "Nix Packages collection",
"homepage": null, "homepage": null,
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4a92571f9207810b559c9eac203d1f4d79830073", "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9",
"sha256": "0sp7qjbb7dvrh4zvd40i6y7jwsd1v1qj44f0c95q88g7fikda8gq", "sha256": "1ds3yjcy52l8d3rkxr3b7h9c0c3nly079bgakjaasnfjj3xprrwr",
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/4a92571f9207810b559c9eac203d1f4d79830073.tar.gz", "url": "https://github.com/NixOS/nixpkgs/archive/c3aa7b8938b17aebd2deecf7be0636000d62a2b9.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
} }
} }