SelfPrivacy/selfprivacy-nixos-config
1
0
Fork 0
mirror of https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config.git synced 2025-02-16 14:24:30 +00:00
Code Issues Projects Releases Wiki Activity

upgrade nixpkgs to NixOS 23.11

Browse source
This commit is contained in:
Alexander Tomokhov 2023-12-18 18:13:57 +04:00
parent b7045a8198
commit d881cc8ce5
8 changed files with 21 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
configuration.nix
View file

@ -35,7 +35,7 @@
services.do-agent.enable = if config.selfprivacy.server.provider == "digitalocean" then true else false; services.do-agent.enable = if config.selfprivacy.server.provider == "digitalocean" then true else false;
boot.cleanTmpDir = true; boot.tmp.cleanOnBoot = true;
networking = { networking = {
hostName = config.selfprivacy.hostname; hostName = config.selfprivacy.hostname;
domain = config.selfprivacy.domain; domain = config.selfprivacy.domain;
@ -55,8 +55,10 @@
users.users.root.openssh.authorizedKeys.keys = config.selfprivacy.ssh.rootKeys; users.users.root.openssh.authorizedKeys.keys = config.selfprivacy.ssh.rootKeys;
services.openssh = { services.openssh = {
enable = config.selfprivacy.ssh.enable; enable = config.selfprivacy.ssh.enable;
passwordAuthentication = config.selfprivacy.ssh.passwordAuthentication; settings = {
permitRootLogin = "yes"; PasswordAuthentication = config.selfprivacy.ssh.passwordAuthentication;
PermitRootLogin = "yes";
};
openFirewall = false; openFirewall = false;
}; };
programs.ssh = { programs.ssh = {

6
flake.lock
View file

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1702759837, "lastModified": 1702780907,
"narHash": "sha256-u3XeJVRe/Q975nwFE+6ALEwypMKJEELMJKDAhSKyq3M=", "narHash": "sha256-blbrBBXjjZt6OKTcYX1jpe9SRof2P9ZYWPzq22tzXAA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b2566f4f897ac6224e094b167d9488d03e157f28", "rev": "1e2e384c5b7c50dbf8e9c441a9e58d85f408b01f",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
letsencrypt/resolve.nix
View file

@ -10,10 +10,6 @@ in
StartLimitBurst = 5; StartLimitBurst = 5;
StartLimitIntervalSec = 5; StartLimitIntervalSec = 5;
Restart = "on-failure"; Restart = "on-failure";
RestartSec =
if lib.versionOlder config.system.nixos.release "23.11"
then 15 * 60
else abort "since NixOS 23.11 (#266155) ACME systemd service restart intervals should have been fixed, thus no workarounds are needed";
}; };
}; };
}; };

10
sp-modules/gitea/module.nix
View file

@ -46,12 +46,14 @@ in
}; };
appName = "SelfPrivacy git Service"; appName = "SelfPrivacy git Service";
repositoryRoot = "${stateDir}/repositories"; repositoryRoot = "${stateDir}/repositories";
domain = "git.${sp.domain}";
rootUrl = "https://git.${sp.domain}/";
httpAddress = "0.0.0.0";
httpPort = 3000;
# cookieSecure = true; # cookieSecure = true;
settings = { settings = {
server = {
DOMAIN = "git.${sp.domain}";
ROOT_URL = "https://git.${sp.domain}/";
HTTP_ADDR = "0.0.0.0";
HTTP_PORT = 3000;
};
mailer = { mailer = {
ENABLED = false; ENABLED = false;
}; };

2
sp-modules/nextcloud/module.nix
View file

@ -44,7 +44,7 @@
}; };
services.nextcloud = { services.nextcloud = {
enable = true; enable = true;
package = pkgs.nextcloud25; package = pkgs.nextcloud26;
inherit hostName; inherit hostName;
# Use HTTPS for links # Use HTTPS for links

8
sp-modules/simple-nixos-mailserver/config.nix
View file

@ -1,4 +1,4 @@
mailserverDate: { config, lib, ... }: { config, lib, ... }:
let let
sp = config.selfprivacy; sp = config.selfprivacy;
in in
@ -66,11 +66,7 @@ lib.mkIf sp.modules.simple-nixos-mailserver.enable
"admin@${sp.domain}" = "${sp.username}@${sp.domain}"; "admin@${sp.domain}" = "${sp.username}@${sp.domain}";
}; };
certificateScheme = certificateScheme = "manual";
if builtins.compareVersions mailserverDate "20230525011002"
>= 0
then "manual"
else 1;
certificateFile = "/var/lib/acme/${sp.domain}/fullchain.pem"; certificateFile = "/var/lib/acme/${sp.domain}/fullchain.pem";
keyFile = "/var/lib/acme/${sp.domain}/key.pem"; keyFile = "/var/lib/acme/${sp.domain}/key.pem";

6
sp-modules/simple-nixos-mailserver/flake.lock
View file

@ -42,11 +42,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1687462267, "lastModified": 1700085753,
"narHash": "sha256-rNSputjn/0HEHHnsKfQ8mQVEPVchcBw7DsbND7Wg8dk=", "narHash": "sha256-qtib7f3eRwfaUF+VziJXiBcZFqpHCAXS4HlrFsnzzl4=",
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"rev": "24128c3052090311688b09a400aa408ba61c6ee5", "rev": "008d78cc21959e33d0d31f375b88353a7d7121ae",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {

2
sp-modules/simple-nixos-mailserver/flake.nix
View file

@ -9,7 +9,7 @@
imports = [ imports = [
mailserver.nixosModules.default mailserver.nixosModules.default
./options.nix ./options.nix
(import ./config.nix mailserver.lastModifiedDate) ./config.nix
]; ];
}; };
configPathsNeeded = configPathsNeeded =