Merge branch 'master' of github.com:webmin/webmin

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

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 <tt>mod_php</tt>
+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 <tt>mod_php</tt>

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

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

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

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

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

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

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

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

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

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

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

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