From a7dac2e806c77e8d26621cb8f068321070f396a9 Mon Sep 17 00:00:00 2001 From: iliajie Date: Fri, 22 Jul 2022 14:59:20 +0300 Subject: [PATCH 1/4] Fix new line --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bf1667954..bb84dcbd9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,6 @@ ## Changelog #### 1.998-dev (July, 2022) - * Fix Apache, BIND, MySQL, ProFTPd and other modules configs on newest distros for new installs * Fix to use Cron default path when run from UI * Fix post uninstall cleanups From 81f763d241a9e181bb9aa538dc64c9f88aa2a325 Mon Sep 17 00:00:00 2001 From: iliajie Date: Fri, 22 Jul 2022 15:20:50 +0300 Subject: [PATCH 2/4] Fix Postfix configs --- postfix/config-AlmaLinux-8.0-ALL | 33 ++++++++++++++++++++++ postfix/config-CentOS-Linux-7.0-ALL | 33 ++++++++++++++++++++++ postfix/config-CentOS-Stream-Linux-8.0-ALL | 33 ++++++++++++++++++++++ postfix/config-Rocky-Linux-8.0-ALL | 33 ++++++++++++++++++++++ postfix/config-debian-linux-10.0-ALL | 33 ++++++++++++++++++++++ postfix/config-redhat-linux-24.0-ALL | 33 ++++++++++++++++++++++ 6 files changed, 198 insertions(+) create mode 100644 postfix/config-AlmaLinux-8.0-ALL create mode 100644 postfix/config-CentOS-Linux-7.0-ALL create mode 100644 postfix/config-CentOS-Stream-Linux-8.0-ALL create mode 100644 postfix/config-Rocky-Linux-8.0-ALL create mode 100644 postfix/config-debian-linux-10.0-ALL create mode 100644 postfix/config-redhat-linux-24.0-ALL diff --git a/postfix/config-AlmaLinux-8.0-ALL b/postfix/config-AlmaLinux-8.0-ALL new file mode 100644 index 000000000..52043502e --- /dev/null +++ b/postfix/config-AlmaLinux-8.0-ALL @@ -0,0 +1,33 @@ +postfix_control_command=/usr/sbin/postfix +postfix_config_command=/usr/sbin/postconf +postfix_config_file=/etc/postfix/main.cf +postfix_aliases_table_command=/usr/sbin/postalias +postfix_newaliases_command=/usr/bin/newaliases +postfix_lookup_table_command=/usr/sbin/postmap +postfix_queue_command=postqueue +postfix_super_command=/usr/sbin/postsuper +max_records=200 +perpage=20 +mailq_dir=/var/spool/postfix +mailq_cmd=postqueue -p +postcat_cmd=/usr/sbin/postcat +sort_mode=0 +fwd_mode=0 +mailq_sort=0 +mailq_count=0 +delete_warn=1 +mailq_sort=0 +check_config=1 +top_buttons=1 +wrap_width=80 +index_check=1 +postfix_master=/etc/postfix/master.cf +columns=2 +show_cmts=0 +prefix_cmts=0 +ldap_doms=0 +delete_confirm=1 +max_maps=400 +reload_cmd=systemctl reload postfix +stop_cmd=systemctl stop postfix +start_cmd=systemctl start postfix diff --git a/postfix/config-CentOS-Linux-7.0-ALL b/postfix/config-CentOS-Linux-7.0-ALL new file mode 100644 index 000000000..52043502e --- /dev/null +++ b/postfix/config-CentOS-Linux-7.0-ALL @@ -0,0 +1,33 @@ +postfix_control_command=/usr/sbin/postfix +postfix_config_command=/usr/sbin/postconf +postfix_config_file=/etc/postfix/main.cf +postfix_aliases_table_command=/usr/sbin/postalias +postfix_newaliases_command=/usr/bin/newaliases +postfix_lookup_table_command=/usr/sbin/postmap +postfix_queue_command=postqueue +postfix_super_command=/usr/sbin/postsuper +max_records=200 +perpage=20 +mailq_dir=/var/spool/postfix +mailq_cmd=postqueue -p +postcat_cmd=/usr/sbin/postcat +sort_mode=0 +fwd_mode=0 +mailq_sort=0 +mailq_count=0 +delete_warn=1 +mailq_sort=0 +check_config=1 +top_buttons=1 +wrap_width=80 +index_check=1 +postfix_master=/etc/postfix/master.cf +columns=2 +show_cmts=0 +prefix_cmts=0 +ldap_doms=0 +delete_confirm=1 +max_maps=400 +reload_cmd=systemctl reload postfix +stop_cmd=systemctl stop postfix +start_cmd=systemctl start postfix diff --git a/postfix/config-CentOS-Stream-Linux-8.0-ALL b/postfix/config-CentOS-Stream-Linux-8.0-ALL new file mode 100644 index 000000000..52043502e --- /dev/null +++ b/postfix/config-CentOS-Stream-Linux-8.0-ALL @@ -0,0 +1,33 @@ +postfix_control_command=/usr/sbin/postfix +postfix_config_command=/usr/sbin/postconf +postfix_config_file=/etc/postfix/main.cf +postfix_aliases_table_command=/usr/sbin/postalias +postfix_newaliases_command=/usr/bin/newaliases +postfix_lookup_table_command=/usr/sbin/postmap +postfix_queue_command=postqueue +postfix_super_command=/usr/sbin/postsuper +max_records=200 +perpage=20 +mailq_dir=/var/spool/postfix +mailq_cmd=postqueue -p +postcat_cmd=/usr/sbin/postcat +sort_mode=0 +fwd_mode=0 +mailq_sort=0 +mailq_count=0 +delete_warn=1 +mailq_sort=0 +check_config=1 +top_buttons=1 +wrap_width=80 +index_check=1 +postfix_master=/etc/postfix/master.cf +columns=2 +show_cmts=0 +prefix_cmts=0 +ldap_doms=0 +delete_confirm=1 +max_maps=400 +reload_cmd=systemctl reload postfix +stop_cmd=systemctl stop postfix +start_cmd=systemctl start postfix diff --git a/postfix/config-Rocky-Linux-8.0-ALL b/postfix/config-Rocky-Linux-8.0-ALL new file mode 100644 index 000000000..52043502e --- /dev/null +++ b/postfix/config-Rocky-Linux-8.0-ALL @@ -0,0 +1,33 @@ +postfix_control_command=/usr/sbin/postfix +postfix_config_command=/usr/sbin/postconf +postfix_config_file=/etc/postfix/main.cf +postfix_aliases_table_command=/usr/sbin/postalias +postfix_newaliases_command=/usr/bin/newaliases +postfix_lookup_table_command=/usr/sbin/postmap +postfix_queue_command=postqueue +postfix_super_command=/usr/sbin/postsuper +max_records=200 +perpage=20 +mailq_dir=/var/spool/postfix +mailq_cmd=postqueue -p +postcat_cmd=/usr/sbin/postcat +sort_mode=0 +fwd_mode=0 +mailq_sort=0 +mailq_count=0 +delete_warn=1 +mailq_sort=0 +check_config=1 +top_buttons=1 +wrap_width=80 +index_check=1 +postfix_master=/etc/postfix/master.cf +columns=2 +show_cmts=0 +prefix_cmts=0 +ldap_doms=0 +delete_confirm=1 +max_maps=400 +reload_cmd=systemctl reload postfix +stop_cmd=systemctl stop postfix +start_cmd=systemctl start postfix diff --git a/postfix/config-debian-linux-10.0-ALL b/postfix/config-debian-linux-10.0-ALL new file mode 100644 index 000000000..52043502e --- /dev/null +++ b/postfix/config-debian-linux-10.0-ALL @@ -0,0 +1,33 @@ +postfix_control_command=/usr/sbin/postfix +postfix_config_command=/usr/sbin/postconf +postfix_config_file=/etc/postfix/main.cf +postfix_aliases_table_command=/usr/sbin/postalias +postfix_newaliases_command=/usr/bin/newaliases +postfix_lookup_table_command=/usr/sbin/postmap +postfix_queue_command=postqueue +postfix_super_command=/usr/sbin/postsuper +max_records=200 +perpage=20 +mailq_dir=/var/spool/postfix +mailq_cmd=postqueue -p +postcat_cmd=/usr/sbin/postcat +sort_mode=0 +fwd_mode=0 +mailq_sort=0 +mailq_count=0 +delete_warn=1 +mailq_sort=0 +check_config=1 +top_buttons=1 +wrap_width=80 +index_check=1 +postfix_master=/etc/postfix/master.cf +columns=2 +show_cmts=0 +prefix_cmts=0 +ldap_doms=0 +delete_confirm=1 +max_maps=400 +reload_cmd=systemctl reload postfix +stop_cmd=systemctl stop postfix +start_cmd=systemctl start postfix diff --git a/postfix/config-redhat-linux-24.0-ALL b/postfix/config-redhat-linux-24.0-ALL new file mode 100644 index 000000000..52043502e --- /dev/null +++ b/postfix/config-redhat-linux-24.0-ALL @@ -0,0 +1,33 @@ +postfix_control_command=/usr/sbin/postfix +postfix_config_command=/usr/sbin/postconf +postfix_config_file=/etc/postfix/main.cf +postfix_aliases_table_command=/usr/sbin/postalias +postfix_newaliases_command=/usr/bin/newaliases +postfix_lookup_table_command=/usr/sbin/postmap +postfix_queue_command=postqueue +postfix_super_command=/usr/sbin/postsuper +max_records=200 +perpage=20 +mailq_dir=/var/spool/postfix +mailq_cmd=postqueue -p +postcat_cmd=/usr/sbin/postcat +sort_mode=0 +fwd_mode=0 +mailq_sort=0 +mailq_count=0 +delete_warn=1 +mailq_sort=0 +check_config=1 +top_buttons=1 +wrap_width=80 +index_check=1 +postfix_master=/etc/postfix/master.cf +columns=2 +show_cmts=0 +prefix_cmts=0 +ldap_doms=0 +delete_confirm=1 +max_maps=400 +reload_cmd=systemctl reload postfix +stop_cmd=systemctl stop postfix +start_cmd=systemctl start postfix From 9b658f07bc832d99ae8090dd4ea1e9a9cdc1e568 Mon Sep 17 00:00:00 2001 From: iliajie Date: Fri, 22 Jul 2022 18:01:09 +0300 Subject: [PATCH 3/4] Fix SSH configs --- sshd/config-AlmaLinux-8.0-ALL | 1 + sshd/config-CentOS-Stream-Linux-8.0-ALL | 1 + sshd/config-Rocky-Linux-8.0-ALL | 1 + ...nux-10.10-ALL => config-Ubuntu-Linux-10.10-17.10} | 0 sshd/config-Ubuntu-Linux-18.04-ALL | 12 ++++++++++++ sshd/config-debian-linux-10.0-ALL | 1 + sshd/config-redhat-linux-24.0-ALL | 5 +++-- 7 files changed, 19 insertions(+), 2 deletions(-) rename sshd/{config-Ubuntu-Linux-10.10-ALL => config-Ubuntu-Linux-10.10-17.10} (100%) create mode 100644 sshd/config-Ubuntu-Linux-18.04-ALL diff --git a/sshd/config-AlmaLinux-8.0-ALL b/sshd/config-AlmaLinux-8.0-ALL index 1f065023a..7bc4cd120 100644 --- a/sshd/config-AlmaLinux-8.0-ALL +++ b/sshd/config-AlmaLinux-8.0-ALL @@ -9,3 +9,4 @@ sync_create=0 sync_auth=1 sync_pass=0 sync_gnupg=0 +restart_cmd=systemctl reload sshd diff --git a/sshd/config-CentOS-Stream-Linux-8.0-ALL b/sshd/config-CentOS-Stream-Linux-8.0-ALL index 1f065023a..7bc4cd120 100644 --- a/sshd/config-CentOS-Stream-Linux-8.0-ALL +++ b/sshd/config-CentOS-Stream-Linux-8.0-ALL @@ -9,3 +9,4 @@ sync_create=0 sync_auth=1 sync_pass=0 sync_gnupg=0 +restart_cmd=systemctl reload sshd diff --git a/sshd/config-Rocky-Linux-8.0-ALL b/sshd/config-Rocky-Linux-8.0-ALL index 1f065023a..7bc4cd120 100644 --- a/sshd/config-Rocky-Linux-8.0-ALL +++ b/sshd/config-Rocky-Linux-8.0-ALL @@ -9,3 +9,4 @@ sync_create=0 sync_auth=1 sync_pass=0 sync_gnupg=0 +restart_cmd=systemctl reload sshd diff --git a/sshd/config-Ubuntu-Linux-10.10-ALL b/sshd/config-Ubuntu-Linux-10.10-17.10 similarity index 100% rename from sshd/config-Ubuntu-Linux-10.10-ALL rename to sshd/config-Ubuntu-Linux-10.10-17.10 diff --git a/sshd/config-Ubuntu-Linux-18.04-ALL b/sshd/config-Ubuntu-Linux-18.04-ALL new file mode 100644 index 000000000..7bc4cd120 --- /dev/null +++ b/sshd/config-Ubuntu-Linux-18.04-ALL @@ -0,0 +1,12 @@ +sshd_path=/usr/sbin/sshd +sshd_config=/etc/ssh/sshd_config +client_config=/etc/ssh/ssh_config +pid_file=/var/run/sshd.pid +start_cmd=systemctl start sshd +stop_cmd=systemctl stop sshd +keygen_path=/usr/bin/ssh-keygen +sync_create=0 +sync_auth=1 +sync_pass=0 +sync_gnupg=0 +restart_cmd=systemctl reload sshd diff --git a/sshd/config-debian-linux-10.0-ALL b/sshd/config-debian-linux-10.0-ALL index 1f065023a..7bc4cd120 100644 --- a/sshd/config-debian-linux-10.0-ALL +++ b/sshd/config-debian-linux-10.0-ALL @@ -9,3 +9,4 @@ sync_create=0 sync_auth=1 sync_pass=0 sync_gnupg=0 +restart_cmd=systemctl reload sshd diff --git a/sshd/config-redhat-linux-24.0-ALL b/sshd/config-redhat-linux-24.0-ALL index 08ed8896a..7bc4cd120 100644 --- a/sshd/config-redhat-linux-24.0-ALL +++ b/sshd/config-redhat-linux-24.0-ALL @@ -2,10 +2,11 @@ sshd_path=/usr/sbin/sshd sshd_config=/etc/ssh/sshd_config client_config=/etc/ssh/ssh_config pid_file=/var/run/sshd.pid -start_cmd=systemctl start sshd.service -stop_cmd=systemctl stop sshd.service +start_cmd=systemctl start sshd +stop_cmd=systemctl stop sshd keygen_path=/usr/bin/ssh-keygen sync_create=0 sync_auth=1 sync_pass=0 sync_gnupg=0 +restart_cmd=systemctl reload sshd From d416eace1b1874247eba47227f49614a963199e1 Mon Sep 17 00:00:00 2001 From: iliajie Date: Fri, 22 Jul 2022 18:35:47 +0300 Subject: [PATCH 4/4] Fix PHPINI Ubuntu module config (where did the `tabs` go?) --- phpini/config-Ubuntu-Linux-20.0-ALL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpini/config-Ubuntu-Linux-20.0-ALL b/phpini/config-Ubuntu-Linux-20.0-ALL index 2da748ae9..14c317a0d 100644 --- a/phpini/config-Ubuntu-Linux-20.0-ALL +++ b/phpini/config-Ubuntu-Linux-20.0-ALL @@ -1 +1 @@ -php_ini=/etc/php*/cli/php.ini,/etc/php/*/cli/php.ini=Configuration for CLI /etc/php*/fpm/php.ini,/etc/php/*/fpm/php.ini=Configuration for FPM /etc/php*/cgi/php.ini,/etc/php/*/cgi/php.ini=Configuration for CGI /etc/php*/apache2/php.ini,/etc/php/*/apache2/php.ini=Configuration for mod_php +php_ini=/etc/php*/cli/php.ini,/etc/php/*/cli/php.ini=Configuration for CLI /etc/php*/fpm/php.ini,/etc/php/*/fpm/php.ini=Configuration for FPM /etc/php*/cgi/php.ini,/etc/php/*/cgi/php.ini=Configuration for CGI /etc/php*/apache2/php.ini,/etc/php/*/apache2/php.ini=Configuration for mod_php