diff --git a/flake.lock b/flake.lock index 7593ec2..e513dfb 100644 --- a/flake.lock +++ b/flake.lock @@ -88,6 +88,21 @@ "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, @@ -119,22 +134,23 @@ "nixpkgs": [ "nixpkgs-unstable" ], - "nixpkgs-22_05": [ + "nixpkgs-21_05": "nixpkgs-21_05", + "nixpkgs-21_11": [ "nixpkgs" ], "utils": "utils" }, "locked": { - "lastModified": 1655930346, - "narHash": "sha256-ht56HHOzEhjeIgAv5ZNFjSVX/in1YlUs0HG9c1EUXTM=", + "lastModified": 1638911354, + "narHash": "sha256-hNhzLOp+dApEY15vwLAQZu+sjEQbJcOXCaSfAT6lpsQ=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "f535d8123c4761b2ed8138f3d202ea710a334a1d", + "rev": "6e3a7b2ea6f0d68b82027b988aa25d3423787303", "type": "gitlab" }, "original": { "owner": "simple-nixos-mailserver", - "ref": "nixos-22.05", + "ref": "nixos-21.11", "repo": "nixos-mailserver", "type": "gitlab" } diff --git a/flake.nix b/flake.nix index 38aa468..28f27a2 100644 --- a/flake.nix +++ b/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-22.05"; + url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-21.11"; inputs = { nixpkgs.follows = "nixpkgs-unstable"; - nixpkgs-22_05.follows = "nixpkgs"; + nixpkgs-21_11.follows = "nixpkgs"; }; }; dogetipbot-telegram = { diff --git a/systems/LoutreOS/services.nix b/systems/LoutreOS/services.nix index ce7f4aa..2411cb4 100644 --- a/systems/LoutreOS/services.nix +++ b/systems/LoutreOS/services.nix @@ -90,10 +90,22 @@ in secure_ip = ["0.0.0.0/0"]; ''; - # redis.enable = true; + redis.enable = true; - # enable with nginx defult config - logrotate.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; diff --git a/systems/LoutreOS/web.nix b/systems/LoutreOS/web.nix index 7917507..ce8599f 100644 --- a/systems/LoutreOS/web.nix +++ b/systems/LoutreOS/web.nix @@ -44,7 +44,7 @@ let in { security.acme = { - defaults.email = "paul@nyanlout.re"; + email = "paul@nyanlout.re"; acceptTerms = true; }; @@ -65,19 +65,19 @@ in services = { phpfpm.pools = { - # work = { - # user = config.users.users.work.name; - # phpPackage = pkgs.php.withExtensions ({ all, ... }: with all; [ redis filter ]); - # settings = { - # "listen.owner" = config.services.nginx.user; - # "pm" = "dynamic"; - # "pm.max_children" = 75; - # "pm.start_servers" = 10; - # "pm.min_spare_servers" = 5; - # "pm.max_spare_servers" = 20; - # "pm.max_requests" = 500; - # }; - # }; + work = { + user = config.users.users.work.name; + phpPackage = pkgs.php.withExtensions ({ all, ... }: with all; [ redis filter ]); + settings = { + "listen.owner" = config.services.nginx.user; + "pm" = "dynamic"; + "pm.max_children" = 75; + "pm.start_servers" = 10; + "pm.min_spare_servers" = 5; + "pm.max_spare_servers" = 20; + "pm.max_requests" = 500; + }; + }; drive = { user = config.users.users.webdav.name; settings = {