Merge branch 'master' into logformat

2020-01-02 12:31:51 +01:00
parent 7f83ad31f4 e01c2e02fb
commit 28fd88e53e
10 changed files with 201 additions and 3 deletions
--- a/install/froxlor.sql
+++ b/install/froxlor.sql
@@ -849,6 +849,7 @@ CREATE TABLE `panel_fpmdaemons` (
  `max_requests` int(4) NOT NULL DEFAULT '0',
  `idle_timeout` int(4) NOT NULL DEFAULT '30',
  `limit_extensions` varchar(255) NOT NULL default '.php',
+  `custom_config` text,
  PRIMARY KEY  (`id`),
  UNIQUE KEY `reload` (`reload_cmd`),
  UNIQUE KEY `config` (`config_dir`)