LoutreOS: fix acme config

Flake lock file changes:

• Updated input 'simple-nixos-mailserver':
    'gitlab:simple-nixos-mailserver/nixos-mailserver/6e3a7b2ea6f0d68b82027b988aa25d3423787303' (2021-12-07)
  → 'gitlab:simple-nixos-mailserver/nixos-mailserver/f535d8123c4761b2ed8138f3d202ea710a334a1d' (2022-06-22)
• Removed input 'simple-nixos-mailserver/nixpkgs-21_05'
• Removed input 'simple-nixos-mailserver/nixpkgs-21_11'
• Added input 'simple-nixos-mailserver/nixpkgs-22_05':
    follows 'nixpkgs'

flake.lock

@@ -88,21 +88,6 @@
         "type": "indirect"
       }
     },
-    "nixpkgs-21_05": {
-      "locked": {
-        "lastModified": 1625692408,
-        "narHash": "sha256-e9L3TLLDVIJpMnHtiNHJE62oOh6emRtSZ244bgYJUZs=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "c06613c25df3fe1dd26243847a3c105cf6770627",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-21.05",
-        "type": "indirect"
-      }
-    },
     "nixpkgs-unstable": {
       "locked": {
         "lastModified": 1656835607,
@@ -134,23 +119,22 @@
         "nixpkgs": [
           "nixpkgs-unstable"
         ],
-        "nixpkgs-21_05": "nixpkgs-21_05",
+        "nixpkgs-22_05": [
-        "nixpkgs-21_11": [
           "nixpkgs"
         ],
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1638911354,
+        "lastModified": 1655930346,
-        "narHash": "sha256-hNhzLOp+dApEY15vwLAQZu+sjEQbJcOXCaSfAT6lpsQ=",
+        "narHash": "sha256-ht56HHOzEhjeIgAv5ZNFjSVX/in1YlUs0HG9c1EUXTM=",
         "owner": "simple-nixos-mailserver",
         "repo": "nixos-mailserver",
-        "rev": "6e3a7b2ea6f0d68b82027b988aa25d3423787303",
+        "rev": "f535d8123c4761b2ed8138f3d202ea710a334a1d",
         "type": "gitlab"
       },
       "original": {
         "owner": "simple-nixos-mailserver",
-        "ref": "nixos-21.11",
+        "ref": "nixos-22.05",
         "repo": "nixos-mailserver",
         "type": "gitlab"
       }

flake.nix

@@ -4,10 +4,10 @@
     nixpkgs-unstable.url = "flake:nixpkgs/nixos-unstable";
     utils.url = "github:gytis-ivaskevicius/flake-utils-plus/v1.3.1";
     simple-nixos-mailserver = {
-      url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-21.11";
+      url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-22.05";
       inputs = {
         nixpkgs.follows = "nixpkgs-unstable";
-        nixpkgs-21_11.follows = "nixpkgs";
+        nixpkgs-22_05.follows = "nixpkgs";
       };
     };
     dogetipbot-telegram = {

systems/LoutreOS/services.nix

@@ -90,22 +90,10 @@ in
       secure_ip = ["0.0.0.0/0"];
     '';
 
-    redis.enable = true;
+    # redis.enable = true;
 
-    logrotate = {
+    # enable with nginx defult config
-      enable = true;
+    logrotate.enable = true;
-      paths = {
-        nginx = {
-          path = "/var/log/nginx/*.log";
-          user = config.services.nginx.user;
-          group = config.services.nginx.group;
-          keep = 7;
-          extraConfig = ''
-            compress
-          '';
-        };
-      };
-    };
 
     fail2ban.enable = true;
 

systems/LoutreOS/web.nix

@@ -44,7 +44,7 @@ let
 in
 {
   security.acme = {
-    email = "paul@nyanlout.re";
+    defaults.email = "paul@nyanlout.re";
     acceptTerms = true;
   };
 
@@ -65,19 +65,19 @@ in
 
   services = {
     phpfpm.pools = {
-      work = {
+      # work = {
-        user = config.users.users.work.name;
+      #   user = config.users.users.work.name;
-        phpPackage = pkgs.php.withExtensions ({ all, ... }: with all; [ redis filter ]);
+      #   phpPackage = pkgs.php.withExtensions ({ all, ... }: with all; [ redis filter ]);
-        settings = {
+      #   settings = {
-          "listen.owner" = config.services.nginx.user;
+      #     "listen.owner" = config.services.nginx.user;
-          "pm" = "dynamic";
+      #     "pm" = "dynamic";
-          "pm.max_children" = 75;
+      #     "pm.max_children" = 75;
-          "pm.start_servers" = 10;
+      #     "pm.start_servers" = 10;
-          "pm.min_spare_servers" = 5;
+      #     "pm.min_spare_servers" = 5;
-          "pm.max_spare_servers" = 20;
+      #     "pm.max_spare_servers" = 20;
-          "pm.max_requests" = 500;
+      #     "pm.max_requests" = 500;
-        };
+      #   };
-      };
+      # };
       drive = {
         user = config.users.users.webdav.name;
         settings = {