Compare commits
No commits in common. "89a8d3baa6ef7d39a435994d3186fbc9f5546164" and "580c33acbaad339bdf530db323804c25f91a0baa" have entirely different histories.
89a8d3baa6
...
580c33acba
26
flake.lock
generated
26
flake.lock
generated
@ -88,6 +88,21 @@
|
|||||||
"type": "indirect"
|
"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": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1656835607,
|
"lastModified": 1656835607,
|
||||||
@ -119,22 +134,23 @@
|
|||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs-unstable"
|
"nixpkgs-unstable"
|
||||||
],
|
],
|
||||||
"nixpkgs-22_05": [
|
"nixpkgs-21_05": "nixpkgs-21_05",
|
||||||
|
"nixpkgs-21_11": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
],
|
],
|
||||||
"utils": "utils"
|
"utils": "utils"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1655930346,
|
"lastModified": 1638911354,
|
||||||
"narHash": "sha256-ht56HHOzEhjeIgAv5ZNFjSVX/in1YlUs0HG9c1EUXTM=",
|
"narHash": "sha256-hNhzLOp+dApEY15vwLAQZu+sjEQbJcOXCaSfAT6lpsQ=",
|
||||||
"owner": "simple-nixos-mailserver",
|
"owner": "simple-nixos-mailserver",
|
||||||
"repo": "nixos-mailserver",
|
"repo": "nixos-mailserver",
|
||||||
"rev": "f535d8123c4761b2ed8138f3d202ea710a334a1d",
|
"rev": "6e3a7b2ea6f0d68b82027b988aa25d3423787303",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "simple-nixos-mailserver",
|
"owner": "simple-nixos-mailserver",
|
||||||
"ref": "nixos-22.05",
|
"ref": "nixos-21.11",
|
||||||
"repo": "nixos-mailserver",
|
"repo": "nixos-mailserver",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
}
|
}
|
||||||
|
@ -4,10 +4,10 @@
|
|||||||
nixpkgs-unstable.url = "flake:nixpkgs/nixos-unstable";
|
nixpkgs-unstable.url = "flake:nixpkgs/nixos-unstable";
|
||||||
utils.url = "github:gytis-ivaskevicius/flake-utils-plus/v1.3.1";
|
utils.url = "github:gytis-ivaskevicius/flake-utils-plus/v1.3.1";
|
||||||
simple-nixos-mailserver = {
|
simple-nixos-mailserver = {
|
||||||
url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-22.05";
|
url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-21.11";
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.follows = "nixpkgs-unstable";
|
nixpkgs.follows = "nixpkgs-unstable";
|
||||||
nixpkgs-22_05.follows = "nixpkgs";
|
nixpkgs-21_11.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
dogetipbot-telegram = {
|
dogetipbot-telegram = {
|
||||||
|
@ -90,10 +90,22 @@ in
|
|||||||
secure_ip = ["0.0.0.0/0"];
|
secure_ip = ["0.0.0.0/0"];
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# redis.enable = true;
|
redis.enable = true;
|
||||||
|
|
||||||
# enable with nginx defult config
|
logrotate = {
|
||||||
logrotate.enable = true;
|
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;
|
fail2ban.enable = true;
|
||||||
|
|
||||||
|
@ -44,7 +44,7 @@ let
|
|||||||
in
|
in
|
||||||
{
|
{
|
||||||
security.acme = {
|
security.acme = {
|
||||||
defaults.email = "paul@nyanlout.re";
|
email = "paul@nyanlout.re";
|
||||||
acceptTerms = true;
|
acceptTerms = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -65,19 +65,19 @@ in
|
|||||||
|
|
||||||
services = {
|
services = {
|
||||||
phpfpm.pools = {
|
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 = {
|
drive = {
|
||||||
user = config.users.users.webdav.name;
|
user = config.users.users.webdav.name;
|
||||||
settings = {
|
settings = {
|
||||||
|
Loading…
Reference in New Issue
Block a user