steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

nix/os/devices/vmd32387.contaboserver.net: update to NixOS 20.03

Browse source
This commit is contained in:
steveej 2020-03-15 09:57:21 +01:00
parent 0ea2593e9c
commit ebe3167f5b
5 changed files with 43 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

32
nix/os/containers/webserver.nix
View file

@ -36,20 +36,28 @@ in args // {
''; '';
}; };
services.phpfpm.phpPackage = pkgs.php56; nixpkgs.config.php = {
imap = false;
openssl = false;
curl = false;
ldap = false;
};
services.phpfpm.poolConfigs.mypool = '' services.phpfpm.pools.mypool = {
listen = 127.0.0.1:9000 phpPackage = pkgs.php56;
user = nobody listen = "127.0.0.1:9000";
pm = dynamic user = "nobody";
pm.max_children = 5 settings = {
pm.start_servers = 2 "pm" = "dynamic";
pm.min_spare_servers = 1 "pm.max_children" = 5;
pm.max_spare_servers = 3 "pm.start_servers" = 2;
pm.max_requests = 500 "pm.min_spare_servers" = 1;
"pm.max_spare_servers" = 3;
"pm.max_requests" = 500;
php_admin_value[error_reporting] = E_ALL & ~E_NOTICE & ~E_WARNING & ~E_STRICT & ~E_DEPRECATED "php_admin_value[error_reporting]" = "E_ALL & ~E_NOTICE & ~E_WARNING & ~E_STRICT & ~E_DEPRECATED";
''; };
};
services.mysql = { services.mysql = {
enable = true; enable = true;

1
nix/os/devices/vmd32387.contaboserver.net/configuration.nix
View file

@ -12,5 +12,6 @@
./system.nix ./system.nix
./hw.nix ./hw.nix
./pkg.nix ./pkg.nix
./boot.nix
]; ];
} }

15
nix/os/devices/vmd32387.contaboserver.net/versions.nix
View file

@ -1,15 +1,20 @@
{ {
channelsNixosStable = { channelsNixosStable = {
ref = "nixos-19.03"; ref = "nixos-20.03";
rev = "07e2b59812de95deeedde95fb6ba22d581d12fbc"; rev = "730453919bdc191496eb5dda04d69c4c99c724b9";
}; };
channelsNixosUnstable = { channelsNixosUnstable = {
ref = "nixos-unstable"; ref = "nixos-unstable";
rev = "34aa254f9ebf5899636a9927ceefbc9df80230f4"; rev = "0729b8c55e0dfaf302af4c57546871d47a652048";
};
nixpkgsMaster = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "master";
rev = "641e1029748a8ccd5fc052f0029e2fee89ebd0ef";
}; };
homeManagerModule = { homeManagerModule = {
url = "https://github.com/rycee/home-manager"; url = "https://github.com/rycee/home-manager";
ref = "master"; ref = "release-19.09";
rev = "465d08d99f5b72b38cecb7ca1865b7255de3ee86"; rev = "0d1ca254d0f213a118459c5be8ae465018132f74";
}; };
} }

4
nix/pkgs/default.nix
View file

@ -48,7 +48,9 @@ in rec {
}; };
php56 = (pkgs.callPackages php56 = (pkgs.callPackages
"${nixpkgsWithPhp5}/pkgs/development/interpreters/php/default.nix" {}) "${nixpkgsWithPhp5}/pkgs/development/interpreters/php/default.nix" {
icu = pkgs.icu60;
})
.php56.overrideAttrs(drv: rec { .php56.overrideAttrs(drv: rec {
# See https://secure.php.net/ChangeLog-5.php # See https://secure.php.net/ChangeLog-5.php
version = "5.6.40"; version = "5.6.40";

14
nix/variables/versions.nix
View file

@ -1,20 +1,24 @@
{ {
channelsNixosStable = { channelsNixosStable = {
ref = "nixos-20.03";
rev = "730453919bdc191496eb5dda04d69c4c99c724b9";
};
channelsNixos1909 = {
ref = "nixos-19.09"; ref = "nixos-19.09";
rev = "c5aabb0d603e2c1ea05f5a93b3be82437f5ebf31"; rev = "64565f9d8ffe5bc3737ebd5f6b97756fac16d23b";
}; };
channelsNixosUnstable = { channelsNixosUnstable = {
ref = "nixos-unstable"; ref = "nixos-unstable";
rev = "7827d3f4497ed722fedca57fd4d5ca1a65c38256"; rev = "0729b8c55e0dfaf302af4c57546871d47a652048";
}; };
nixpkgsMaster = { nixpkgsMaster = {
url = "https://github.com/NixOS/nixpkgs/"; url = "https://github.com/NixOS/nixpkgs/";
ref = "master"; ref = "master";
rev = "abe853b84c58ddbb7c5c07e80090d47480d56c11"; rev = "47f61c9d7f116701ad9ca0d4b894ebb5f36ef5cf";
}; };
homeManagerModule = { homeManagerModule = {
url = "https://github.com/rycee/home-manager"; url = "https://github.com/rycee/home-manager";
ref = "master"; ref = "release-19.09";
rev = "450571056552c9311fcb2894328696b535265593"; rev = "0d1ca254d0f213a118459c5be8ae465018132f74";
}; };
} }