diff --git a/nix/os/containers/webserver.nix b/nix/os/containers/webserver.nix index 56d201d..7b34875 100644 --- a/nix/os/containers/webserver.nix +++ b/nix/os/containers/webserver.nix @@ -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 = '' - listen = 127.0.0.1:9000 - user = nobody - pm = dynamic - pm.max_children = 5 - pm.start_servers = 2 - pm.min_spare_servers = 1 - pm.max_spare_servers = 3 - pm.max_requests = 500 + services.phpfpm.pools.mypool = { + phpPackage = pkgs.php56; + listen = "127.0.0.1:9000"; + user = "nobody"; + settings = { + "pm" = "dynamic"; + "pm.max_children" = 5; + "pm.start_servers" = 2; + "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 = { enable = true; diff --git a/nix/os/devices/vmd32387.contaboserver.net/configuration.nix b/nix/os/devices/vmd32387.contaboserver.net/configuration.nix index 2239b54..48f44d9 100644 --- a/nix/os/devices/vmd32387.contaboserver.net/configuration.nix +++ b/nix/os/devices/vmd32387.contaboserver.net/configuration.nix @@ -12,5 +12,6 @@ ./system.nix ./hw.nix ./pkg.nix + ./boot.nix ]; } diff --git a/nix/os/devices/vmd32387.contaboserver.net/versions.nix b/nix/os/devices/vmd32387.contaboserver.net/versions.nix index 4db49e8..3ddc083 100644 --- a/nix/os/devices/vmd32387.contaboserver.net/versions.nix +++ b/nix/os/devices/vmd32387.contaboserver.net/versions.nix @@ -1,15 +1,20 @@ { channelsNixosStable = { - ref = "nixos-19.03"; - rev = "07e2b59812de95deeedde95fb6ba22d581d12fbc"; + ref = "nixos-20.03"; + rev = "730453919bdc191496eb5dda04d69c4c99c724b9"; }; channelsNixosUnstable = { ref = "nixos-unstable"; - rev = "34aa254f9ebf5899636a9927ceefbc9df80230f4"; + rev = "0729b8c55e0dfaf302af4c57546871d47a652048"; + }; + nixpkgsMaster = { + url = "https://github.com/NixOS/nixpkgs/"; + ref = "master"; + rev = "641e1029748a8ccd5fc052f0029e2fee89ebd0ef"; }; homeManagerModule = { url = "https://github.com/rycee/home-manager"; - ref = "master"; - rev = "465d08d99f5b72b38cecb7ca1865b7255de3ee86"; + ref = "release-19.09"; + rev = "0d1ca254d0f213a118459c5be8ae465018132f74"; }; } diff --git a/nix/pkgs/default.nix b/nix/pkgs/default.nix index 2a7f4d2..bc20d8f 100644 --- a/nix/pkgs/default.nix +++ b/nix/pkgs/default.nix @@ -48,7 +48,9 @@ in rec { }; php56 = (pkgs.callPackages - "${nixpkgsWithPhp5}/pkgs/development/interpreters/php/default.nix" {}) + "${nixpkgsWithPhp5}/pkgs/development/interpreters/php/default.nix" { + icu = pkgs.icu60; + }) .php56.overrideAttrs(drv: rec { # See https://secure.php.net/ChangeLog-5.php version = "5.6.40"; diff --git a/nix/variables/versions.nix b/nix/variables/versions.nix index 2739d8a..d4b01eb 100644 --- a/nix/variables/versions.nix +++ b/nix/variables/versions.nix @@ -1,20 +1,24 @@ { channelsNixosStable = { + ref = "nixos-20.03"; + rev = "730453919bdc191496eb5dda04d69c4c99c724b9"; + }; + channelsNixos1909 = { ref = "nixos-19.09"; - rev = "c5aabb0d603e2c1ea05f5a93b3be82437f5ebf31"; + rev = "64565f9d8ffe5bc3737ebd5f6b97756fac16d23b"; }; channelsNixosUnstable = { ref = "nixos-unstable"; - rev = "7827d3f4497ed722fedca57fd4d5ca1a65c38256"; + rev = "0729b8c55e0dfaf302af4c57546871d47a652048"; }; nixpkgsMaster = { url = "https://github.com/NixOS/nixpkgs/"; ref = "master"; - rev = "abe853b84c58ddbb7c5c07e80090d47480d56c11"; + rev = "47f61c9d7f116701ad9ca0d4b894ebb5f36ef5cf"; }; homeManagerModule = { url = "https://github.com/rycee/home-manager"; - ref = "master"; - rev = "450571056552c9311fcb2894328696b535265593"; + ref = "release-19.09"; + rev = "0d1ca254d0f213a118459c5be8ae465018132f74"; }; }