From bace5f06693ae3defb93074c39ea866d65c7792f Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 13 Feb 2025 01:40:37 -0800 Subject: [PATCH] made php with own module --- configuration.nix | 60 ++--------------------------------------- modules/modules.nix | 3 ++- modules/php.nix | 66 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 59 deletions(-) create mode 100644 modules/php.nix diff --git a/configuration.nix b/configuration.nix index 35ba463..940caff 100755 --- a/configuration.nix +++ b/configuration.nix @@ -2,32 +2,7 @@ let - personalization = import ./modules/personalization.nix; - - - custom-php = pkgs.php.buildEnv { - extensions = { enabled, all }: enabled ++ (with all; [ bz2 apcu redis imagick memcached ]); - extraConfig = '' - - display_errors = On - display_startup_errors = On - max_execution_time = 10000 - max_input_time = 3000 - memory_limit = 1G; - opcache.enable=1; - opcache.memory_consumption=512; - opcache_revalidate_freq = 240; - opcache.max_accelerated_files=20000; - post_max_size = 3G - upload_max_filesize = 3G - apc.enable_cli=1 - opcache.interned_strings_buffer = 64 - redis.session.locking_enabled=1 - redis.session.lock_retries=-1 - redis.session.lock_wait_time=10000 - - ''; - }; + personalization = import ./modules/personalization.nix; in { @@ -103,19 +78,8 @@ in description = "free"; extraGroups = [ "networkmanager" ]; }; - - -####### PHP user for PHPFPM ####### - php = { - isSystemUser = true; - createHome = false; - uid = 7777; - }; }; - users.users.php.group = "php"; - users.groups.php = {}; - # Enable automatic login for the user. services.displayManager.autoLogin.enable = true; services.displayManager.autoLogin.user = "free"; @@ -133,7 +97,7 @@ in nixpkgs.config.permittedInsecurePackages = [ "jitsi-meet-1.0.8043" - ]; + ]; # List packages installed in system profile. To search, run: # $ nix search wget @@ -167,7 +131,6 @@ in lm_sensors hunspell hunspellDicts.en_US - custom-php matrix-synapse-tools.synadm brave dua @@ -204,25 +167,6 @@ in }; -####### PHPFMP ####### - services.phpfpm.pools = { - mypool = { - user = "caddy"; - group = "php"; - phpPackage = custom-php; - settings = { - "pm" = "dynamic"; - "pm.max_children" = 75; - "pm.start_servers" = 10; - "pm.min_spare_servers" = 5; - "pm.max_spare_servers" = 20; - "pm.max_requests" = 500; - "clear_env" = "no"; - }; - }; - }; - - ####### CADDY ####### services.caddy = { enable = true; diff --git a/modules/modules.nix b/modules/modules.nix index eb86ee8..dc4fe3c 100755 --- a/modules/modules.nix +++ b/modules/modules.nix @@ -3,7 +3,8 @@ { imports = [ - + + ./php.nix ./synapse.nix ./coturn.nix ./bitcoinecosystem.nix diff --git a/modules/php.nix b/modules/php.nix new file mode 100644 index 0000000..855b6aa --- /dev/null +++ b/modules/php.nix @@ -0,0 +1,66 @@ +{ config, pkgs, lib, ... }: + + +let + + custom-php = pkgs.php.buildEnv { + extensions = { enabled, all }: enabled ++ (with all; [ bz2 apcu redis imagick memcached ]); + extraConfig = '' + + display_errors = On + display_startup_errors = On + max_execution_time = 10000 + max_input_time = 3000 + memory_limit = 1G; + opcache.enable=1; + opcache.memory_consumption=512; + opcache_revalidate_freq = 240; + opcache.max_accelerated_files=20000; + post_max_size = 3G + upload_max_filesize = 3G + apc.enable_cli=1 + opcache.interned_strings_buffer = 64 + redis.session.locking_enabled=1 + redis.session.lock_retries=-1 + redis.session.lock_wait_time=10000 + + ''; + }; +in + +{ + users.users = { + + php = { + isSystemUser = true; + createHome = false; + uid = 7777; + }; + }; + + users.users.php.group = "php"; + + users.groups.php = {}; + + environment.systemPackages = with pkgs; [ + + custom-php + ]; + + services.phpfpm.pools = { + mypool = { + user = "caddy"; + group = "php"; + phpPackage = custom-php; + settings = { + "pm" = "dynamic"; + "pm.max_children" = 75; + "pm.start_servers" = 10; + "pm.min_spare_servers" = 5; + "pm.max_spare_servers" = 20; + "pm.max_requests" = 500; + "clear_env" = "no"; + }; + }; + }; +}