diff --git a/systems/hikari/web-development.nix b/systems/hikari/web-development.nix index 1a86ea4..b154148 100644 --- a/systems/hikari/web-development.nix +++ b/systems/hikari/web-development.nix @@ -27,5 +27,44 @@ ''; }; }; + + mysql = { + enable = true; + + package = pkgs.mariadb; + + ensureUsers = [ + { + name = "daniels"; + ensurePermissions = { + "*.*" = "ALL PRIVILEGES"; + }; + } + { + # INITIALLY once change dev user to be identified by password + name = "dev"; + ensurePermissions = { + # TODO: Auto build from defined databases?! + "own_danielsiepmann.*" = "ALL PRIVILEGES"; + }; + } + ]; + + ensureDatabases = [ + "testing" # Used by TYPO3 functional tests + "testing_at" # Used by TYPO3 Acceptance tests + ]; + + settings = { + mysqld = { + # sql_mode = "SRTICT_TRANS_TABLES;NO_ZERO_IN_DATE;NO_ZERO_DATE;ERROR_FOR_DIVISION_BY_ZERO;NO_ENGINE_SUBSTITUTION"; + general_log = true; + general_log_file = "/var/lib/mysql/query.log"; + + bind-address = "127.0.0.1"; + # = "/var/log/mysql/query.log"; + }; + }; + }; }; } diff --git a/systems/hikari/web-development/daniel-siepmann.localhost.nix b/systems/hikari/web-development/daniel-siepmann.localhost.nix index 30e4531..7e83551 100644 --- a/systems/hikari/web-development/daniel-siepmann.localhost.nix +++ b/systems/hikari/web-development/daniel-siepmann.localhost.nix @@ -3,6 +3,7 @@ let domain = "daniel-siepmann.localhost"; documentRoot = "/var/projects/own/daniel-siepmann.de/project/public/"; + databaseName = "own_danielsiepmann"; in { services = { httpd.virtualHosts.${domain} = { @@ -76,10 +77,15 @@ in { "listen.group" = config.services.httpd.group; "pm" = "static"; "pm.max_children" = 15; + "php_admin_value[max_execution_time]" = 240; + "php_admin_value[max_input_vars]" = 1500; }; phpEnv = { + TYPO3_ADDITIONAL_CONFIGURATION = "/var/projects/own/typo3-configuration/AdditionalConfiguration.inc.php"; + TYPO3_DATABASE = databaseName; TYPO3_CONTEXT = "Development/dsiepmann"; }; }; + mysql.ensureDatabases = [databaseName]; }; }