From 127905b84e585724cbb4cd9a4fe67c1dd9af4c3e Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 17 Feb 2022 21:29:53 +0100 Subject: [PATCH] Removing config panels --- actions.toml | 45 ------------------------------- check_process | 10 ------- config_panel.toml | 69 ----------------------------------------------- 3 files changed, 124 deletions(-) delete mode 100644 actions.toml delete mode 100644 config_panel.toml diff --git a/actions.toml b/actions.toml deleted file mode 100644 index 71fd449..0000000 --- a/actions.toml +++ /dev/null @@ -1,45 +0,0 @@ -[reset_default_setupvars] -name = "Reset the config file and restore a default one." -command = "/bin/bash scripts/actions/reset_default_config \"setupVars.conf\"" -# user = "root" # optional -# cwd = "/" # optional -# accepted_return_codes = [0, 1, 2, 3] # optional -accepted_return_codes = [0] -description = "Reset the config file setupVars.conf." - -[reset_default_ftl] -name = "Reset the config file and restore a default one." -command = "/bin/bash scripts/actions/reset_default_config \"pihole-FTL.conf\"" -# user = "root" # optional -# cwd = "/" # optional -# accepted_return_codes = [0, 1, 2, 3] # optional -accepted_return_codes = [0] -description = "Reset the config file pihole-FTL.conf." - -[reset_default_nginx] -name = "Reset the nginx config for this app." -command = "/bin/bash scripts/actions/reset_default_system nginx" -# user = "root" # optional -# cwd = "/" # optional -# accepted_return_codes = [0, 1, 2, 3] # optional -accepted_return_codes = [0] -description = "Reset the nginx config for this app." - -[reset_default_phpfpm] -name = "Reset the php-fpm config for this app." -command = "/bin/bash scripts/actions/reset_default_system phpfpm" -# user = "root" # optional -# cwd = "/" # optional -# accepted_return_codes = [0, 1, 2, 3] # optional -accepted_return_codes = [0] -description = "Reset the php-fpm config for this app." - - -[reset_default_app] -name = "Reset the app with a default configuration." -command = "/bin/bash scripts/actions/reset_default_app" -# user = "root" # optional -# cwd = "/" # optional -# accepted_return_codes = [0, 1, 2, 3] # optional -accepted_return_codes = [0] -description = "Reset the app to its default configuration to try to fix potential issues.
This action won't remove any data added to the app.
However, if you have modified any configuration, it will be overwritten." diff --git a/check_process b/check_process index 2d0d119..43d2619 100644 --- a/check_process +++ b/check_process @@ -6,16 +6,6 @@ query_logging=1 enable_dhcp=0 pihole_version="Last available" - ; Config_panel - main.overwrite_files.overwrite_setupvars=0|1 - main.overwrite_files.overwrite_ftl=0|1 - main.overwrite_files.overwrite_nginx=0|1 - main.overwrite_files.overwrite_phpfpm=0|1 - main.global_config.email_type=0|1 - main.php_fpm_config.footprint=low|medium|high - main.php_fpm_config.free_footprint=20 - main.php_fpm_config.usage=low|medium|high - main.php_fpm_config.force_max_children=20|0 ; Checks pkg_linter=1 setup_sub_dir=1 diff --git a/config_panel.toml b/config_panel.toml deleted file mode 100644 index c79ffa0..0000000 --- a/config_panel.toml +++ /dev/null @@ -1,69 +0,0 @@ -version = "1.0" - -[main] -name = "PiHole configuration" - - [main.overwrite_files] - name = "Overwriting config files" - - [main.overwrite_files.overwrite_setupvars] - ask = "Overwrite the config file setupVars.conf?" - type = "boolean" - default = true - help = "If the file is overwritten, a backup will be created." - - [main.overwrite_files.overwrite_ftl] - ask = "Overwrite the config file pihole-FTL.conf?" - type = "boolean" - default = true - help = "If the file is overwritten, a backup will be created." - - [main.overwrite_files.overwrite_nginx] - ask = "Overwrite the nginx config file?" - type = "boolean" - default = true - help = "If the file is overwritten, a backup will be created." - - [main.overwrite_files.overwrite_phpfpm] - ask = "Overwrite the PHP-FPM config file?" - type = "boolean" - default = true - help = "If the file is overwritten, a backup will be created." - - - [main.global_config] - name = "Global configuration" - - [main.global_config.email_type] - ask = "Send HTML email to admin?" - type = "boolean" - default = true - help = "Allow app scripts to send HTML mails instead of plain text." - - - [main.php_fpm_config] - name = "PHP-FPM configuration" - - [main.php_fpm_config.footprint] - ask = "Memory footprint of the service?" - choices = ["low", "medium", "high", "specific"] - default = "low" - help = "low <= 20Mb per pool. medium between 20Mb and 40Mb per pool. high > 40Mb per pool.
Use specific to set a value with the following option." - - [main.php_fpm_config.free_footprint] - ask = "Memory footprint of the service?" - type = "number" - default = "0" - help = "Free field to specify exactly the footprint in Mb if you don't want to use one of the three previous values." - - [main.php_fpm_config.usage] - ask = "Expected usage of the service?" - choices = ["low", "medium", "high"] - default = "low" - help = "low: Personal usage, behind the SSO. No RAM footprint when not used, but the impact on the processor can be high if many users are using the service.
medium: Low usage, few people or/and publicly accessible. Low RAM footprint, medium processor footprint when used.
high: High usage, frequently visited website. High RAM footprint, but lower on processor usage and quickly responding." - - [main.php_fpm_config.force_max_children] - ask = "Force the value of pm.max_children?" - type = "number" - default = "0" - help = "Do not change this value unless you're sure about what you're doing!
pm.max_children is automatically defined by this formula: $max_ram / 2 / $footprint
You can force that value, and ignore the formula by changing the value here.
To reset to the default value, set to 0."