nyanloutre/nixos-config
1
1
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: nyanloutre:580c33acbaad339bdf530db323804c25f91a0baa
Branches Tags
nyanloutre:master
...
compare: nyanloutre:89a8d3baa6ef7d39a435994d3186fbc9f5546164
Branches Tags
nyanloutre:master

5 Commits
580c33acba ... 89a8d3baa6

Author SHA1 Message Date
nyanloutre
89a8d3baa6 LoutreOS: fix acme config 2022-07-05 20:41:35 +02:00
nyanloutre
349d25b201 LoutreOS: keep default logrotate config 2022-07-05 20:41:04 +02:00
nyanloutre
be051f67d3 LoutreOS: disable redis 2022-07-05 20:40:48 +02:00
nyanloutre
4f0c846880 flake.lock: Update 
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'
 2022-07-05 20:25:04 +02:00
nyanloutre
fe51717336 LoutreOS: update nixos-mailserver 2022-07-05 20:25:00 +02:00
4 changed files with 24 additions and 52 deletions
Show Stats Expand all files Collapse all files

26
flake.lock generated
View File

@ -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-21_11": [
"nixpkgs-22_05": [
"nixpkgs"
],
"utils": "utils"
},
"locked": {
"lastModified": 1638911354,
"narHash": "sha256-hNhzLOp+dApEY15vwLAQZu+sjEQbJcOXCaSfAT6lpsQ=",
"lastModified": 1655930346,
"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"
}

4
flake.nix
View File

@ -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 = {

18
systems/LoutreOS/services.nix
View File

@ -90,22 +90,10 @@ in
secure_ip = ["0.0.0.0/0"];
'';
redis.enable = true;
# redis.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
'';
};
};
};
# enable with nginx defult config
logrotate.enable = true;
fail2ban.enable = true;

28
systems/LoutreOS/web.nix
View File

@ -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 = {
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 = {