Merge pull request 'nixos-22.11' (#25) from nixos-22.11 into master

Reviewed-on: #25

api/api-module.nix

@@ -76,7 +76,7 @@ in
         PYTHONUNBUFFERED = "1";
         ENABLE_SWAGGER = (if cfg.enableSwagger then "1" else "0");
         B2_BUCKET = cfg.b2Bucket;
-        PYTHONPATH = pkgs.selfprivacy-graphql-api.pythonPath + ":${pkgs.selfprivacy-graphql-api}/lib/python3.9/site-packages/";
+        PYTHONPATH = pkgs.selfprivacy-graphql-api.pythonPath + ":${pkgs.selfprivacy-graphql-api}/lib/python3.10/site-packages/";
       } // config.networking.proxy.envVars;
       path = [
         "/var/"
@@ -98,7 +98,7 @@ in
       wantedBy = [ "network-online.target" ];
       serviceConfig = {
         User = "root";
-        ExecStart = "${pkgs.python39Packages.huey}/bin/huey_consumer.py selfprivacy_api.task_registry.huey";
+        ExecStart = "${pkgs.python310Packages.huey}/bin/huey_consumer.py selfprivacy_api.task_registry.huey";
         Restart = "always";
         RestartSec = "5";
       };

configuration.nix

@@ -1,6 +1,6 @@
 { config, pkgs, lib, ... }:
 let
-  url-overlay = "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nix-repo/archive/redis.tar.gz";
+  url-overlay = "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nix-repo/archive/22-11.tar.gz";
   nix-overlay = (import (builtins.fetchTarball url-overlay));
 in
 {
@@ -89,6 +89,7 @@ in
     allowReboot = config.services.userdata.autoUpgrade.allowReboot;
     channel = "https://channel.selfprivacy.org/nixos-selfpricacy";
   };
+  system.stateVersion = config.services.userdata.stateVersion;
   nix = {
     optimise.automatic = true;
     gc = {

git/gitea.nix

@@ -13,10 +13,6 @@ in
     gitea = {
       enable = cfg.gitea.enable;
       stateDir = "/var/lib/gitea";
-      log = {
-        rootPath = "/var/lib/gitea/log";
-        level = "Warn";
-      };
       user = "gitea";
       database = {
         type = "sqlite3";
@@ -40,7 +36,6 @@ in
       rootUrl = "https://git.${cfg.domain}/";
       httpAddress = "0.0.0.0";
       httpPort = 3000;
-      cookieSecure = true;
       settings = {
         mailer = {
           ENABLED = false;
@@ -58,6 +53,13 @@ in
         repository = {
           FORCE_PRIVATE = false;
         };
+        session = {
+          COOKIE_SECURE = true;
+        };
+        log = {
+          ROOT_PATH = "/var/lib/gitea/log";
+          LEVEL = "Warn";
+        };
       };
     };
   };

mailserver/system/mailserver.nix

@@ -6,10 +6,10 @@ in
   imports = [
     (builtins.fetchTarball {
       # Pick a commit from the branch you are interested in
-      url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/f535d812/nixos-mailserver-f535d812.tar.gz";
+      url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/6d0d9fb9/nixos-mailserver-6d0d9fb9.tar.gz";
 
       # And set its hash
-      sha256 = "sha256:0csx2i8p7gbis0n5aqpm57z5f9cd8n9yabq04bg1h4mkfcf7mpl6";
+      sha256 = "sha256:0h35al73p15z9v8zb6hi5nq987sfl5wp4rm5c8947nlzlnsjl61x";
     })
   ];
 

nextcloud/nextcloud.nix

@@ -11,7 +11,7 @@ in
   };
   services.nextcloud = {
     enable = cfg.nextcloud.enable;
-    package = pkgs.nextcloud24;
+    package = pkgs.nextcloud25;
     hostName = "cloud.${cfg.domain}";
 
     # Use HTTPS for links

variables-module.nix

@@ -41,6 +41,13 @@ in
         type = types.nullOr types.bool;
       };
     };
+    stateVersion = mkOption {
+      description = ''
+        State version of the server
+      '';
+      type = types.str;
+      default = "22.11";
+    };
     ########################
     # Server admin options #
     ########################

variables.nix

@@ -7,6 +7,7 @@ in
     hostname = lib.attrsets.attrByPath [ "hostname" ] null jsonData;
     domain = lib.attrsets.attrByPath [ "domain" ] null jsonData;
     timezone = lib.attrsets.attrByPath [ "timezone" ] "Europe/Uzhgorod" jsonData;
+    stateVersion = lib.attrsets.attrByPath [ "stateVersion" ] "22.05" jsonData;
     autoUpgrade = {
       enable = lib.attrsets.attrByPath [ "autoUpgrade" "enable" ] true jsonData;
       allowReboot = lib.attrsets.attrByPath [ "autoUpgrade" "allowReboot" ] true jsonData;