New version bump

Add `fdisk` GPT improvements

CHANGELOG.md

@@ -1,5 +1,13 @@
 ## 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
+* Add better support for CentOS Stream Linux for new installs
+* Add improvements for searching and naming global PHP configs files
+* Add latest Authentic [theme update](https://github.com/webmin/authentic-theme/releases/tag/19.98-RC1) with various bug fixes and small improvements
+
 #### 1.997 (July 12, 2022)
 * Add support for mirror and RAID volumes in LVM module
 * Add latest Authentic [theme update](https://github.com/webmin/authentic-theme/releases/tag/19.97) with nice new features in File Manager and other fixes

README.md

@@ -31,7 +31,7 @@ Webmin can be installed in two different ways:
  1. By downloading a pre-built package, available for different distributions (CentOS, Fedora, SuSE, Mandriva, Debian, Ubuntu, Solaris and [other](http://www.webmin.com/support.html)) under [latest release assets](https://github.com/webmin/webmin/releases/latest) or from our [download page](http://webmin.com/download.html);
   <kbd>Note: It is highly recommended to [add repository](https://doxfer.webmin.com/Webmin/Installation) to your system for having automatic updates.</kbd>
 
- 2. By downloading, extracting [source file](https://prdownloads.sourceforge.net/webadmin/webmin-1.997.tar.gz), and running [_setup.sh_](http://www.webmin.com/tgz.html) script, with no arguments, which will setup to run it directly from this directory, or with a command-line argument, such as targeted directory.
+ 2. By downloading, extracting [source file](https://prdownloads.sourceforge.net/webadmin/webmin-1.998.tar.gz), and running [_setup.sh_](http://www.webmin.com/tgz.html) script, with no arguments, which will setup to run it directly from this directory, or with a command-line argument, such as targeted directory.
   <kbd>Note: If you are installing Webmin [on Windows](http://www.webmin.com/windows.html) system, you must run the command `perl setup.pl` instead. The Windows version depends on several programs, and modules that may not be part of the standard distribution. You will need _process.exe_ command, _sc.exe_ command, and _Win32::Daemon_ Perl module.</kbd>
 
 ## Documentation

apache/config-AlmaLinux-7.0-ALL

@@ -1,4 +1,4 @@
-show_list=0
+show_list=1
 httpd_dir=/etc/httpd
 httpd_path=/usr/sbin/httpd
 mime_types=/etc/mime.types

apache/config-CentOS-Stream-Linux-8.0-ALL

@@ -1,9 +1,9 @@
-show_list=0
+show_list=1
 httpd_dir=/etc/httpd
 httpd_path=/usr/sbin/httpd
 mime_types=/etc/mime.types
 start_cmd=systemctl start httpd.service
-apply_cmd=/usr/sbin/apachectl graceful
+apply_cmd=systemctl reload httpd.service
 stop_cmd=systemctl stop httpd.service
 show_order=0
 max_servers=100
@@ -15,5 +15,5 @@ test_apachectl=1
 auto_mods=1
 show_names=0
 allow_virtualmin=0
-pid_file=/etc/httpd/run/httpd.pid
+pid_file=/run/httpd/httpd.pid
 format_config=1

apache/config-Fedora-Linux-20.00-ALL

@@ -0,0 +1,19 @@
+show_list=1
+httpd_dir=/etc/httpd
+httpd_path=/usr/sbin/httpd
+mime_types=/etc/mime.types
+start_cmd=systemctl start httpd.service
+apply_cmd=systemctl reload httpd.service
+stop_cmd=systemctl stop httpd.service
+show_order=0
+max_servers=100
+test_config=1
+test_manual=0
+apachectl_path=/usr/sbin/apachectl
+test_always=0
+test_apachectl=1
+auto_mods=1
+show_names=0
+allow_virtualmin=0
+pid_file=/run/httpd/httpd.pid
+format_config=1

apache/config-Redhat-Enterprise-Linux-7.0-ALL

@@ -1,4 +1,4 @@
-show_list=0
+show_list=1
 httpd_dir=/etc/httpd
 httpd_path=/usr/sbin/httpd
 mime_types=/etc/mime.types

apache/config-Rocky-Linux-7.0-ALL

@@ -1,4 +1,4 @@
-show_list=0
+show_list=1
 httpd_dir=/etc/httpd
 httpd_path=/usr/sbin/httpd
 mime_types=/etc/mime.types

apache/config-debian-linux-10.0-ALL

@@ -0,0 +1,23 @@
+httpd_dir=/etc/apache2
+httpd_path=/usr/sbin/apache2
+httpd_conf=/etc/apache2/apache2.conf
+mime_types=/etc/mime.types
+start_cmd=systemctl start apache2
+apply_cmd=systemctl reload apache2
+stop_cmd=systemctl stop apache2
+show_order=0
+max_servers=100
+test_config=1
+test_manual=0
+test_always=0
+test_apachectl=1
+virt_file=/etc/apache2/sites-available
+link_dir=/etc/apache2/sites-enabled
+auto_mods=1
+defines_file=/etc/apache2/envvars
+defines_name=APACHE_ARGUMENTS
+apachectl_path=/usr/sbin/apache2ctl
+show_names=0
+allow_virtualmin=0
+format_config=1
+show_list=1

apache/config-redhat-linux-24.0-ALL

@@ -1,9 +1,9 @@
-show_list=0
+show_list=1
 httpd_dir=/etc/httpd
 httpd_path=/usr/sbin/httpd
 mime_types=/etc/mime.types
 start_cmd=systemctl start httpd.service
-apply_cmd=/usr/sbin/apachectl graceful
+apply_cmd=systemctl reload httpd.service
 stop_cmd=systemctl stop httpd.service
 show_order=0
 max_servers=100
@@ -15,4 +15,5 @@ test_apachectl=1
 auto_mods=1
 show_names=0
 allow_virtualmin=0
+pid_file=/run/httpd/httpd.pid
 format_config=1

bind8/config-AlmaLinux-6.0-ALL

@@ -3,8 +3,6 @@ named_path=/usr/sbin/named
 named_conf=/etc/named.conf
 show_list=1
 records_order=0
-start_cmd=service named start
-stop_cmd=service named stop
 max_zones=50
 rev_def=0
 support_aaaa=1
@@ -12,7 +10,7 @@ allow_comments=0
 allow_wild=1
 allow_long=0
 master_ttl=1
-pid_file=/var/run/named.pid /run/named.pid
+pid_file=/run/named/named.pid
 whois_cmd=whois
 short_names=0
 updserial_def=0
@@ -42,7 +40,6 @@ keygen=dnssec-keygen
 signzone=dnssec-signzone
 checkconf=named-checkconf
 other_slaves=1
-restart_cmd=restart
 keygen=dnssec-keygen
 tmpl_dnssec=0
 dnssec_period=21
@@ -54,3 +51,6 @@ dnssectools_rollmgr_pidfile=/var/run/rollmgr.pid
 force_random=0
 spf_record=0
 dnssec_info=1
+start_cmd=systemctl start named.service
+stop_cmd=systemctl stop named.service
+restart_cmd=systemctl reload named.service

bind8/config-CentOS-Linux-8.0-ALL

@@ -0,0 +1,52 @@
+soa_style=1
+named_path=/usr/sbin/named
+named_conf=/etc/named.conf
+show_list=1
+records_order=0
+max_zones=50
+rev_def=0
+support_aaaa=1
+allow_comments=0
+allow_wild=1
+allow_long=0
+master_ttl=1
+pid_file=/run/named/named.pid
+whois_cmd=whois
+short_names=0
+updserial_def=0
+updserial_on=1
+updserial_man=1
+ndc_cmd=ndc
+forwardzonefilename_format=ZONE.hosts
+reversezonefilename_format=ZONE.rev
+rev_must=0
+ipv6_mode=1
+allow_underscore=1
+by_view=0
+confirm_zone=1
+confirm_rec=0
+no_chroot=0
+relative_paths=0
+rndc_cmd=rndc
+master_dir=/var/named
+slave_dir=/var/named/slaves
+no_pid_chroot=0
+soa_start=0
+rndc_conf=/etc/rndc.conf
+rndcconf_cmd=rndc-confgen
+largezones=0
+checkzone=named-checkzone
+keygen=dnssec-keygen
+signzone=dnssec-signzone
+checkconf=named-checkconf
+other_slaves=1
+keygen=dnssec-keygen
+tmpl_dnssec=0
+dnssec_period=21
+tmpl_dnssec_dt=1
+force_random=0
+spf_record=0
+dnssec_info=1
+start_cmd=systemctl start named.service
+stop_cmd=systemctl stop named.service
+restart_cmd=systemctl reload named.service

bind8/config-CentOS-Stream-Linux-8.0-ALL

@@ -0,0 +1,56 @@
+soa_style=1
+named_path=/usr/sbin/named
+named_conf=/etc/named.conf
+show_list=1
+records_order=0
+max_zones=50
+rev_def=0
+support_aaaa=1
+allow_comments=0
+allow_wild=1
+allow_long=0
+master_ttl=1
+pid_file=/run/named/named.pid
+whois_cmd=whois
+short_names=0
+updserial_def=0
+updserial_on=1
+updserial_man=1
+ndc_cmd=ndc
+forwardzonefilename_format=ZONE.hosts
+reversezonefilename_format=ZONE.rev
+rev_must=0
+ipv6_mode=1
+allow_underscore=1
+by_view=0
+confirm_zone=1
+confirm_rec=0
+no_chroot=0
+relative_paths=0
+rndc_cmd=rndc
+master_dir=/var/named
+slave_dir=/var/named/slaves
+no_pid_chroot=0
+soa_start=0
+rndc_conf=/etc/rndc.conf
+rndcconf_cmd=rndc-confgen
+largezones=0
+checkzone=named-checkzone
+keygen=dnssec-keygen
+signzone=dnssec-signzone
+checkconf=named-checkconf
+other_slaves=1
+keygen=dnssec-keygen
+tmpl_dnssec=0
+dnssec_period=21
+tmpl_dnssec_dt=1
+dnssectools_conf=/etc/dnssec-tools/dnssec-tools.conf
+dnssectools_rollrec=/var/named/system.rollrec
+dnssectools_keydir=/var/named/dtkeys
+dnssectools_rollmgr_pidfile=/var/run/rollmgr.pid
+force_random=0
+spf_record=0
+dnssec_info=1
+start_cmd=systemctl start named.service
+stop_cmd=systemctl stop named.service
+restart_cmd=systemctl reload named.service

bind8/config-Rocky-Linux-6.0-ALL

@@ -3,8 +3,6 @@ named_path=/usr/sbin/named
 named_conf=/etc/named.conf
 show_list=1
 records_order=0
-start_cmd=service named start
-stop_cmd=service named stop
 max_zones=50
 rev_def=0
 support_aaaa=1
@@ -12,7 +10,7 @@ allow_comments=0
 allow_wild=1
 allow_long=0
 master_ttl=1
-pid_file=/var/run/named.pid /run/named.pid
+pid_file=/run/named/named.pid
 whois_cmd=whois
 short_names=0
 updserial_def=0
@@ -42,7 +40,6 @@ keygen=dnssec-keygen
 signzone=dnssec-signzone
 checkconf=named-checkconf
 other_slaves=1
-restart_cmd=restart
 keygen=dnssec-keygen
 tmpl_dnssec=0
 dnssec_period=21
@@ -54,3 +51,6 @@ dnssectools_rollmgr_pidfile=/var/run/rollmgr.pid
 force_random=0
 spf_record=0
 dnssec_info=1
+start_cmd=systemctl start named.service
+stop_cmd=systemctl stop named.service
+restart_cmd=systemctl reload named.service

bind8/config-debian-linux-10.0-ALL

@@ -0,0 +1,50 @@
+soa_style=1
+named_path=/usr/sbin/named
+named_conf=/etc/bind/named.conf
+show_list=1
+records_order=0
+max_zones=50
+rev_def=0
+support_aaaa=1
+allow_comments=0
+allow_wild=1
+allow_long=0
+master_ttl=1
+whois_cmd=whois
+short_names=0
+updserial_def=0
+updserial_on=1
+updserial_man=1
+ndc_cmd=ndc
+forwardzonefilename_format=ZONE.hosts
+reversezonefilename_format=ZONE.rev
+rev_must=0
+ipv6_mode=1
+allow_underscore=1
+by_view=0
+confirm_zone=1
+confirm_rec=0
+no_chroot=0
+relative_paths=0
+rndc_cmd=rndc
+pid_file=/var/run/named/named.pid
+zones_file=/etc/bind/named.conf.local
+master_dir=/var/lib/bind
+slave_dir=/var/lib/bind
+no_pid_chroot=0
+soa_start=0
+rndc_conf=/etc/bind/rndc.conf
+rndcconf_cmd=rndc-confgen
+largezones=0
+checkzone=named-checkzone
+keygen=dnssec-keygen
+signzone=dnssec-signzone
+checkconf=named-checkconf
+other_slaves=1
+force_random=0
+spf_record=0
+dnssec_info=1
+start_cmd=systemctl start bind9.service
+stop_cmd=systemctl stop bind9.service
+restart_cmd=systemctl reload bind9.service
+dnssec_period=21

bind8/config-redhat-linux-24.0-ALL

@@ -28,12 +28,10 @@ by_view=0
 confirm_zone=1
 confirm_rec=0
 no_chroot=0
-chroot=/var/named/chroot
 relative_paths=0
 rndc_cmd=rndc
 master_dir=/var/named
 slave_dir=/var/named/slaves
-auto_chroot=sh -c '. /etc/sysconfig/named && echo "$ROOTDIR"'
 no_pid_chroot=0
 soa_start=0
 rndc_conf=/etc/rndc.conf
@@ -47,3 +45,4 @@ other_slaves=1
 force_random=0
 spf_record=0
 dnssec_info=1
+restart_cmd=systemctl reload named.service

cron/exec_cron.cgi

@@ -33,6 +33,7 @@ else {
 &clean_environment();
 
 # Set cron environment variables
+$ENV{'PATH'} = "/usr/bin:/bin"; 
 foreach $e (&read_envs($job->{'user'})) {
 	$ENV{$1} = $2 if ($e =~ /^(\S+)\s+(.*)$/);
 	}

dhcpd/config-CentOS-Stream-Linux-8.0-ALL

@@ -0,0 +1,16 @@
+start_cmd=systemctl start dhcpd
+stop_cmd=systemctl stop dhcpd
+restart_cmd=service dhcpd restart
+dhcpd_conf=/etc/dhcp/dhcpd.conf
+dhcpd_path=/usr/sbin/dhcpd
+lease_file=/var/lib/dhcpd/dhcpd.leases
+lease_sort=0
+dhcpd_nocols=5
+lease_tz=0
+interfaces_type=redhat
+show_ip=0
+show_mac=0
+group_name=0
+display_max=100
+desc_name=0
+lease_vendor=0

dovecot/config-CentOS-Stream-Linux-8.0-ALL

@@ -0,0 +1,4 @@
+dovecot=/usr/sbin/dovecot
+dovecot_config=/etc/dovecot/dovecot.conf
+init_script=dovecot.service
+pid_file=/run/dovecot/master.pid

dovecot/config-redhat-linux-24.0-ALL

@@ -1,4 +1,4 @@
 dovecot=/usr/sbin/dovecot
 dovecot_config=/etc/dovecot/dovecot.conf /etc/dovecot.conf
 init_script=dovecot.service
-pid_file=/var/run/dovecot/master.pid
+pid_file=/run/dovecot/master.pid

exports/config-CentOS-Stream-Linux-8.0-ALL

@@ -0,0 +1,3 @@
+restart_command=service nfs restart
+exports_file=/etc/exports
+apply_cmd=exportfs -r

fdisk/edit_disk.cgi

@@ -4,7 +4,6 @@
 require './fdisk-lib.pl';
 &ReadParse();
 &can_edit_disk($in{'device'}) || &error($text{'disk_ecannot'});
-$extwidth = 300;
 
 # Get the disk
 @disks = &list_disks_partitions();
@@ -13,6 +12,10 @@ $d || &error($text{'disk_egone'});
 @parts = @{$d->{'parts'}};
 &ui_print_header($d->{'desc'}, $text{'disk_title'}, "", undef,
 		 @disks == 1 ? 1 : 0, @disks == 1 ? 1 : 0);
+$caneditpart =
+		$d->{'table'} ne 'gpt' || 
+			($d->{'table'} eq 'gpt' &&
+				&has_command('parted') && $config{'mode'} ne 'fdisk');
 
 # Work out links to add partitions
 foreach $p (@parts) {
@@ -29,17 +32,22 @@ foreach $p (@parts) {
 		$anyfree++;
 		}
 	}
-if ($regular < 4 || $disk->{'table'} ne 'msdos') {
-	push(@edlinks, "<a href=\"edit_part.cgi?disk=$d->{'index'}&new=1\">".
-		       $text{'index_addpri'}."</a>");
+if ($caneditpart) {
+	if ($regular < 4 || $disk->{'table'} ne 'msdos') {
+		push(@edlinks, "<a href=\"edit_part.cgi?disk=$d->{'index'}&new=1\">".
+			       $text{'index_addpri'}."</a>");
+		}
+	if ($extended) {
+		push(@edlinks, "<a href=\"edit_part.cgi?disk=$d->{'index'}&new=2\">".
+			       $text{'index_addlog'}."</a>");
+		}
+	elsif ($regular < 4 && &supports_extended()) {
+		push(@edlinks, "<a href=\"edit_part.cgi?disk=$d->{'index'}&new=3\">".
+				$text{'index_addext'}."</a>");
+		}
 	}
-if ($extended) {
-	push(@edlinks, "<a href=\"edit_part.cgi?disk=$d->{'index'}&new=2\">".
-		       $text{'index_addlog'}."</a>");
-	}
-elsif ($regular < 4 && &supports_extended()) {
-	push(@edlinks, "<a href=\"edit_part.cgi?disk=$d->{'index'}&new=3\">".
-			$text{'index_addext'}."</a>");
+else {
+	$wantsparted = 1;
 	}
 if ($d->{'table'} eq 'unknown') {
 	# Must create a partition table first
@@ -65,6 +73,12 @@ if ($d->{'table'}) {
 	}
 print &ui_links_row(\@info),"<p>\n";
 
+if ($wantsparted) {
+	my $label = $config{'mode'} eq 'fdisk' ?
+	              'edit_edisk2' : 'edit_edisk';
+	print "<p>$text{$label}</p>\n";
+	}
+
 # Show table of partitions, if any
 if (@parts) {
 	print &ui_links_row(\@edlinks);
@@ -84,16 +98,12 @@ if (@parts) {
 
 		# Create extent images
 		$ext = "";
-		$ext .= sprintf "<img src=images/gap.gif height=10 width=%d>",
-			$extwidth*($p->{'start'} - 1) /
-			$d->{'cylinders'};
-		$ext .= sprintf "<img src=images/%s.gif height=10 width=%d>",
-			$p->{'extended'} ? "ext" : "use",
-			$extwidth*($p->{'end'} - $p->{'start'}) /
-			$d->{'cylinders'};
-		$ext .= sprintf "<img src=images/gap.gif height=10 width=%d>",
-		  $extwidth*($d->{'cylinders'} - ($p->{'end'} - 1)) /
-			    $d->{'cylinders'};
+		$ext1 = int((($p->{'start'} - 1) / $d->{'cylinders'}) * 100) . "%";
+		$ext2 = int((($p->{'end'} - $p->{'start'}) / $d->{'cylinders'}) * 100) . "%";
+		$ext3 = int((($d->{'cylinders'} - ($p->{'end'} - 1)) / $d->{'cylinders'}) * 100) . "%";
+		$ext .= "<img src=images/gap.gif height=10 width='$ext1'>";
+		$ext .= sprintf "<img src=images/%s.gif height=10 width='$ext2'>", $p->{'extended'} ? "ext" : "use";
+		$ext .= "<img src=images/gap.gif height=10 width='$ext3'>";
 
 		# Work out usage
 		@stat = &device_status($p->{'device'});
@@ -116,38 +126,43 @@ if (@parts) {
 	print &ui_columns_end();
 	}
 else {
-	print "<b>$text{'disk_none'}</b><p>\n";
+	print "<p>$text{'disk_none'}</p>\n"
+		if (!$wantsparted);
 	}
 print &ui_links_row(\@edlinks);
 
 # Buttons for IDE params and SMART
-print &ui_hr();
-print &ui_buttons_start();
+my $ui_buttons_content;
 if (&supports_hdparm($d)) {
-	print &ui_buttons_row("edit_hdparm.cgi", $text{'index_hdparm'},
+	$ui_buttons_content = &ui_buttons_row("edit_hdparm.cgi", $text{'index_hdparm'},
 			      $text{'index_hdparmdesc'},
 			      &ui_hidden("disk", $d->{'index'}));
 	}
 if (&supports_smart($d)) {
-	print &ui_buttons_row("../smart-status/index.cgi", $text{'index_smart'},
+	$ui_buttons_content = &ui_buttons_row("../smart-status/index.cgi", $text{'index_smart'},
 			      $text{'index_smartdesc'},
 			      &ui_hidden("drive", $d->{'device'}));
 	}
 if (&supports_relabel($d)) {
 	if ($d->{'table'} eq 'unknown') {
-		print &ui_buttons_row(
+		$ui_buttons_content = &ui_buttons_row(
 			"edit_relabel.cgi", $text{'index_relabel2'},
 			$text{'index_relabeldesc2'},
 			&ui_hidden("device", $d->{'device'}));
 		}
 	else {
-		print &ui_buttons_row(
+		$ui_buttons_content = &ui_buttons_row(
 			"edit_relabel.cgi", $text{'index_relabel'},
 			$text{'index_relabeldesc'},
 			&ui_hidden("device", $d->{'device'}));
 		}
 	}
-print &ui_buttons_end();
+if ($ui_buttons_content) {
+	print &ui_hr();
+	print &ui_buttons_start();
+	print $ui_buttons_content;
+	print &ui_buttons_end();
+}
 
 &ui_print_footer("", $text{'index_return'});
 

fdisk/edit_part.cgi

@@ -111,19 +111,24 @@ $dev = $dinfo->{'prefix'} =~ /^\/dev\/mmcblk.*/ ?
 	$dinfo->{'prefix'}.$np;
 print &ui_table_row($text{'edit_device'}, $dev);
 
+if (!$in{'new'}) {
+	@stat = &device_status($dev);
+	$mounted = $stat[2];
+	}
+
 # Partition type
 if ($pinfo->{'extended'} || $in{'new'} == 3) {
 	# Extended, cannot change
 	print &ui_table_row($text{'edit_type'}, $text{'extended'});
 	}
-elsif ($pinfo->{'edittype'} || $in{'new'}) {
+elsif (($pinfo->{'edittype'} == 1 || $in{'new'}) && !$mounted) {
 	# Can change
 	print &ui_table_row($text{'edit_type'},
 		&ui_select("type",
 			   $in{'new'} ? &default_tag() : $pinfo->{'type'},
 			   [ map { [ $_, &tag_name($_) ] }
 				 (sort { &tag_name($a) cmp &tag_name($b) }
-				       &list_tags()) ]));
+				       &list_tags($pinfo->{'dtable'})) ]));
 	}
 else {
 	# Tool doesn't allow change
@@ -160,9 +165,8 @@ if ($pinfo->{'extended'}) {
 		}
 	}
 elsif (!$in{'new'}) {
-	@stat = &device_status($dev);
 	if (@stat) {
-		$msg = $stat[2] ? 'edit_mount' : 'edit_umount';
+		$msg = $mounted ? 'edit_mount' : 'edit_umount';
 		$msg .= 'vm' if ($stat[1] eq 'swap');
 		$msg .= 'raid' if ($stat[1] eq 'raid');
 		$msg .= 'lvm' if ($stat[1] eq 'lvm');
@@ -199,7 +203,7 @@ if (($has_e2label || $has_xfs_db) && &supports_label($pinfo) && !$in{'new'}) {
 	}
 
 # Show field for partition name
-if (&supports_name($dinfo)) {
+if (&supports_name($dinfo) && !$mounted && $pinfo->{'edittype'} != 2) {
 	print &ui_table_row($text{'edit_name'},
 			&ui_textbox("name", $pinfo->{'name'}, 20));
 	}
@@ -214,24 +218,24 @@ print &ui_table_end();
 if ($in{'new'}) {
 	print &ui_form_end([ [ undef, $text{'create'} ] ]);
 	}
-elsif (@stat && $stat[2]) {
+elsif (@stat && $stat[2] &&
+       $pinfo->{'edittype'} != 2) {
 	print &ui_form_end();
-	print "<b>$text{'edit_inuse'}</b><p>\n";
+	print "$text{'edit_inuse'}\n";
 	}
-else {
+elsif ($pinfo->{'edittype'} != 2) {
 	print &ui_form_end([ $pinfo->{'extended'} ? ( ) :
 				( [ undef, $text{'save'} ] ),
 			     [ 'delete', $text{'delete'} ] ]);
 	}
 
-if (!$in{'new'} && !$pinfo->{'extended'}) {
-	print &ui_hr();
-	print &ui_buttons_start();
+if (!$in{'new'} && !$pinfo->{'extended'} && $pinfo->{'edittype'} != 2) {
+	my $ui_buttons_content;
 
 	if (!@stat || $stat[2] == 0) {
 		# Show form for creating filesystem
 		local $rt = @stat ? $stat[1] : &conv_type($pinfo->{'type'});
-		print &ui_buttons_row("mkfs_form.cgi",
+		$ui_buttons_content = &ui_buttons_row("mkfs_form.cgi",
 			$text{'edit_mkfs2'}, $text{'edit_mkfsmsg2'},
 			&ui_hidden("dev", $dev),
 			&ui_select("type", $rt,
@@ -241,7 +245,7 @@ if (!$in{'new'} && !$pinfo->{'extended'}) {
 
 	if (!$in{'new'} && @stat && $stat[2] == 0 && &can_fsck($stat[1])) {
 		# Show form to fsck filesystem
-		print &ui_buttons_row("fsck_form.cgi",
+		$ui_buttons_content = &ui_buttons_row("fsck_form.cgi",
 			$text{'edit_fsck'},&text('edit_fsckmsg', "<tt>fsck</tt>"),
 			&ui_hidden("dev", $dev)." ".
 			&ui_hidden("type", $stat[1]));
@@ -249,7 +253,7 @@ if (!$in{'new'} && !$pinfo->{'extended'}) {
 
 	if (!$in{'new'} && @stat && $stat[2] == 0 && &can_tune($stat[1])) {
 		# Show form to tune filesystem
-		print &ui_buttons_row("tunefs_form.cgi",
+		$ui_buttons_content = &ui_buttons_row("tunefs_form.cgi",
 			$text{'edit_tune'}, $text{'edit_tunemsg'},
 			&ui_hidden("dev", $dev)." ".
 			&ui_hidden("type", $stat[1]));
@@ -260,7 +264,7 @@ if (!$in{'new'} && !$pinfo->{'extended'}) {
 		# Show form to mount filesystem
 		if ($types[0] eq "swap") {
 			# Swap partition
-			print &ui_buttons_row("../mount/edit_mount.cgi",
+			$ui_buttons_content = &ui_buttons_row("../mount/edit_mount.cgi",
 				$text{'edit_newmount2'},$text{'edit_mountmsg2'},
 				&ui_hidden("type", $types[0]).
 				&ui_hidden("newdev", $dev));
@@ -275,14 +279,24 @@ if (!$in{'new'} && !$pinfo->{'extended'}) {
 			else {
 				$dirsel .= &ui_hidden("type", $types[0]);
 				}
-			print &ui_buttons_row("../mount/edit_mount.cgi",
+			$ui_buttons_content = &ui_buttons_row("../mount/edit_mount.cgi",
 				$text{'edit_newmount'}, $text{'edit_mountmsg'},
 				&ui_hidden("newdev", $dev),
 				$dirsel);
 			}
 		}
 
-	print &ui_buttons_end();
+	if ($ui_buttons_content) {
+		print &ui_hr();
+		print &ui_buttons_start();
+		print $ui_buttons_content;
+		print &ui_buttons_end();
+		}
+	} elsif (!$mounted &&
+	         $pinfo->{'edittype'} == 2) {
+		my $label = $config{'mode'} eq 'fdisk' ?
+		              'edit_eparted2' : 'edit_eparted';
+		print "$text{$label}\n";
 	}
 
 &ui_print_footer("edit_disk.cgi?device=$dinfo->{'device'}",

fdisk/fdisk-lib.pl

@@ -245,8 +245,7 @@ local $devs = join(" ", @devs);
 local ($disk, $m2);
 if ($has_parted) {
 	open(FDISK, join(" ; ",
-		map { "parted $_ unit cyl print 2>/dev/null || ".
-		      "fdisk -l $_ 2>/dev/null" } @devs)." |");
+		map { "parted $_ unit cyl print 2>/dev/null" } @devs)." |");
 	}
 else {
 	open(FDISK, "fdisk -l -u=cylinders $devs 2>/dev/null || fdisk -l $devs 2>/dev/null |");
@@ -506,16 +505,19 @@ while(<FDISK>) {
 				  $disk->{'cylsize'};
 		push(@{$disk->{'parts'}}, $part);
 		}
-	elsif (/(\/dev\/\S+?(\d+))\s+(\d+)\s+(\d+)\s+(\d+)\s+([0-9\.]+[kMGTP])\s+(\S.*)/) {
+	elsif (/(?<dev>\/dev\/\S+?(?<num>\d+))\s+(?<start>\d+)\s+(?<end>\d+)\s+(?<blocks>\d+)\s+(?<size>[0-9\.]+[kMGTP])\s+(?<type>\S.*)/ ||
+	       /(?<dev>\/dev\/\S+?(?<num>\d+))\s+(?<start>\d+)\s+(?<end>\d+)\s+(?<size>[0-9\.]+[kMGTP])\s+(?<type>\S.*)/) {
 		# Partition within the current disk from fdisk (gpt format)
-		local $part = { 'number' => $2,
-                                'device' => $1,
-				'type' => $7,
-				'start' => $3,
-				'end' => $4,
-				'blocks' => $5,
+		local $part = {
+				'number' => "$+{num}",
+				'device' => "$+{dev}",
+				'type' => "$+{type}",
+				'start' => "$+{start}",
+				'end' => "$+{end}",
+				'blocks' => "$+{blocks}",
 				'index' => scalar(@{$disk->{'parts'}}),
-			 	'edittype' => 1, };
+				'dtable' => $disk->{'table'},
+			 	'edittype' => 2, };
 		$part->{'desc'} = &partition_description($part->{'device'});
 		$part->{'size'} = ($part->{'end'} - $part->{'start'} + 1) *
 				  $disk->{'cylsize'};
@@ -861,7 +863,12 @@ undef(@list_disks_partitions_cache);
 # Returns a list of known partition tag numbers
 sub list_tags
 {
-if ($has_parted) {
+my ($fdisk_gpt) = @_;
+if ($fdisk_gpt eq 'gpt') {
+	# fdisk gpt types
+	return sort { $a cmp $b } (keys %fdisk_gpt_tags);
+	}
+elsif ($has_parted) {
 	# Parted types
 	return sort { $a cmp $b } (keys %parted_tags);
 	}
@@ -875,7 +882,7 @@ else {
 # Returns a human-readable version of a tag
 sub tag_name
 {
-return $tags{$_[0]} || $parted_tags{$_[0]} || $hidden_tags{$_[0]};
+return $tags{$_[0]} || $parted_tags{$_[0]} || $fdisk_gpt_tags{$_[0]} || $hidden_tags{$_[0]};
 }
 
 sub default_tag
@@ -1563,6 +1570,14 @@ else { return " $_[2] $in{$_[0]}"; }
 	 'f', 'Windows extended LBA',
 	);
 
+%fdisk_gpt_tags = (
+	'', 'None',
+	'EFI System', 'EFI system partition',
+	'BIOS boot', 'BIOS boot partition',
+	'Linux filesystem', 'Linux filesystem',
+	'Linux LVM', 'Linux LVM',
+	);
+
 %parted_tags = (
 	'', 'None',
 	'fat16', 'Windows FAT16',

fdisk/index.cgi

@@ -9,12 +9,6 @@ require './fdisk-lib.pl';
 # Work out which disks are accessible
 @disks = &list_disks_partitions();
 @disks = grep { $access{'view'} || &can_edit_disk($_->{'device'}) } @disks;
-if (@disks == 1 && &can_edit_disk($disks[0]->{'device'})) {
-	# Just one .. go direct to it's page
-	&redirect("edit_disk.cgi?device=$disks[0]->{'device'}");
-	edit;
-	}
-
 $pdesc = $has_parted ? $text{'index_parted'} : $text{'index_fdisk'};
 &ui_print_header($pdesc, $module_info{'desc'}, "", undef, 1, 1, 0,
 	&help_search_link("fdisk", "man", "doc", "howto"));

fdisk/lang/en

@@ -98,6 +98,10 @@ edit_name=Partition name
 edit_volid=Volume ID
 edit_blocks=$1 blocks
 edit_inuse=This partition cannot be changed as it is currently in use or configured for use.
+edit_eparted=This partition cannot be changed unless <tt>parted</tt> command is installed.
+edit_eparted2=This partition cannot be changed unless <tt>parted</tt> is set as management command in module config.
+edit_edisk=This disk cannot be edited unless <tt>parted</tt> command is installed.
+edit_edisk2=This disk cannot be edited unless <tt>parted</tt> is set as management command in module config.
 edit_mkfs=Create New Filesystem
 edit_mkfs2=Create Filesystem:
 edit_mkfsmsg=Builds a new $1 filesystem on this partition, permanently erasing any existing files. You must do this after creating a new partition or changing an existing one.

gray-theme/gray-theme-lib.pl

@@ -2,8 +2,6 @@
 
 use strict;
 use warnings;
-no warnings 'redefine';
-no warnings 'uninitialized';
 BEGIN { push(@INC, ".."); };
 use WebminCore;
 &init_config();

gray-theme/index.cgi

@@ -2,8 +2,6 @@
 
 use strict;
 use warnings;
-no warnings 'redefine';
-no warnings 'uninitialized';
 require 'gray-theme/gray-theme-lib.pl';
 &ReadParse();
 our ($current_theme, %in);

gray-theme/left.cgi

@@ -3,8 +3,6 @@
 
 use strict;
 use warnings;
-no warnings 'redefine';
-no warnings 'uninitialized';
 require 'gray-theme/gray-theme-lib.pl';
 &ReadParse();
 our ($current_theme, $remote_user, %gconfig);
@@ -232,4 +230,3 @@ sub add_webprefix
 my ($link) = @_;
 return $link =~ /^\// ? &get_webprefix().$link : $link;
 }
-

gray-theme/right.cgi

@@ -3,8 +3,6 @@
 
 use strict;
 use warnings;
-no warnings 'redefine';
-no warnings 'uninitialized';
 require 'gray-theme/gray-theme-lib.pl';
 &ReadParse();
 &load_theme_library();

ipsec/config-CentOS-Stream-Linux-8.0-ALL

@@ -0,0 +1,8 @@
+file=/etc/ipsec.conf
+secrets=/etc/ipsec.secrets
+ipsec=/usr/local/sbin/ipsec
+policies_dir=/etc/ipsec.d/policies
+start_cmd=systemctl start ipsec
+stop_cmd=systemctl stop ipsec
+restart_cmd=systemctl restart ipsec
+logfile=/var/log/messages

iscsi-tgtd/config-CentOS-Stream-Linux-8.0-ALL

@@ -0,0 +1,8 @@
+config_file=/etc/tgt/tgtd.conf
+tgtd=tgtd
+tgtadm=tgtadm
+init_name=tgtd
+tgtadmin=tgt-admin
+start_cmd=systemctl start tgtd
+stop_cmd=systemctl stop tgtd
+restart_cmd=systemctl restart tgtd

ldap-client/config-CentOS-Stream-Linux-8.0-ALL

@@ -0,0 +1,3 @@
+auth_ldap=/etc/nslcd.conf
+secret=/etc/ldap.secret
+init_name=nslcd

ldap-server/config-CentOS-Stream-Linux-8.0-ALL

@@ -0,0 +1,11 @@
+config_file=/etc/openldap/slapd.d
+schema_dir=/etc/openldap/schema
+slapd=slapd
+ldap_user=ldap
+browse_max=100
+start_cmd=systemctl start slapd
+stop_cmd=systemctl stop slapd
+apply_cmd=systemctl restart slapd
+init_name=ldap
+data_dir=/var/lib/ldap
+attr_count=6

logrotate/edit_log.cgi

@@ -143,7 +143,7 @@ print &ui_table_row($text{'edit_mailfl'},
 						$text{'edit_mailfirst'} :
 						$text{'edit_maillast'}) ] ]));
 
-if (&get_logrotate_version() < 3.6) {
+if (&compare_version_numbers(&get_logrotate_version(), 3.6) < 0) {
 	$errors = &find_value("errors", $lconf);
 	print &ui_table_row($text{'edit_errors'},
 			    &ui_opt_textbox("errors", $errors, 30,
@@ -162,7 +162,7 @@ $post = &find_value("postrotate", $lconf);
 print &ui_table_row($text{'edit_post'},
 		    &ui_textarea("post", $post, 3, 60));
 
-if (&get_logrotate_version() >= 3.4) {
+if (&compare_version_numbers(&get_logrotate_version(), 3.4) >= 0) {
 	&yesno_option("sharedscripts", "nosharedscripts", $lconf);
 	}
 

logrotate/save_log.cgi

@@ -178,7 +178,7 @@ else {
 		&save_directive($log, "postrotate");
 		}
 
-	if (&get_logrotate_version() >= 3.4) {
+	if (defined($in{'sharedscripts'})) {
 		&parse_yesno("sharedscripts", "nosharedscripts", $log);
 		}
 

lpadmin/config-CentOS-Stream-Linux-8.0-ALL

@@ -0,0 +1,17 @@
+iface_perms=755
+gs_lib=
+iface_arg=
+gs_path=gs
+spool_dir=/var/spool/cups
+model_path=/usr/share/cups/model /etc/cups/ppd
+gs_fontpath=
+smbclient_path=smbclient
+print_style=cups
+show_status=0
+iface_owner=lp:lp
+sort_mode=0
+driver_style=cups
+stop_cmd=systemctl stop cups
+start_cmd=systemctl start cups
+display_mode=0
+show_jobs=0

lvm/lvm-lib.pl

@@ -405,7 +405,7 @@ if (&get_lvm_version() >= 2) {
 		elsif (/\s+Logical\s+volume\s+([a-z0-9\_]+)/i) {
 			push(@raids, [ $1, undef ]);
 			}
-		elsif (/\s+Logical\s+extents\s+(\d+)\s+to\s+(\d+)/ && @rv) {
+		elsif (/\s+Logical\s+extents\s+(\d+)\s+to\s+(\d+)/ && @raids) {
 			$raids[$#raid]->[1] = $2-$1+1;
 			}
 		}

makedebian.pl

@@ -319,15 +319,13 @@ rm -f /var/lock/subsys/$baseproduct
 
 if [ "\$inetd" != "1" ]; then
 	productucf=Webmin
-	productspace=""
 	if [ "$product" = "usermin" ]; then
 		productucf=Usermin
-		productspace=" "
 	fi
 	if [ "\$justinstalled" = "1" ]; then
 		/etc/$baseproduct/start >/dev/null 2>&1 </dev/null
 		if [ "\$?" != "0" ]; then
-			echo "E: \${productucf} server cannot be started. It is advised to start it manually\n \${productspace} by running \\"/etc/$baseproduct/restart-by-force-kill\\" command"
+			echo "E: \${productucf} server cannot be started. It is advised to start it manually\n   by running \\"/etc/$baseproduct/restart-by-force-kill\\" command"
 		fi
 	else
 		if [ "$product" = "webmin" ]; then
@@ -340,7 +338,7 @@ if [ "\$inetd" != "1" ]; then
 			/etc/$baseproduct/restart >/dev/null 2>&1 </dev/null
 		fi
 		if [ "\$?" != "0" ]; then
-			echo "W: \${productucf} server cannot be restarted. It is advised to restart it manually\n \${productspace} by running \\"/etc/$baseproduct/restart-by-force-kill\\" command when upgrade process is finished"
+			echo "W: \${productucf} server cannot be restarted. It is advised to restart it manually\n   by running \\"/etc/$baseproduct/restart-by-force-kill\\" command when upgrade process is finished"
 		fi
 	fi
 fi
@@ -352,6 +350,7 @@ read answer
 printf "\\n"
 if [ "\\\$answer" = "y" ]; then
 	echo "Removing $ucproduct package .."
+	rm -f /usr/share/$baseproduct/authentic-theme/manifest-*
 	dpkg --remove --force-depends $product
 	systemctlcmd=\\\`which systemctl 2>/dev/null\\\`
 	if [ -x "\\\$systemctlcmd" ]; then
@@ -400,6 +399,7 @@ if [ "\$1" != "upgrade" -a "\$1" != "abort-upgrade" ]; then
 		if [ "$product" = "webmin" ]; then
 			(cd /usr/share/$baseproduct ; WEBMIN_CONFIG=/etc/$baseproduct WEBMIN_VAR=/var/$baseproduct LANG= /usr/share/$baseproduct/run-uninstalls.pl) >/dev/null 2>&1 </dev/null
 		else
+			rm -f /usr/share/$baseproduct/authentic-theme/manifest-*
 			systemctlcmd=\`which systemctl 2>/dev/null\`
 			if [ -x "\$systemctlcmd" ]; then
 				\$systemctlcmd stop $product >/dev/null 2>&1 </dev/null

mount/linux-lib.pl

@@ -1689,31 +1689,6 @@ if (($_[0] eq "nfs") || ($_[0] eq "nfs4")) {
 			     $in{'nfs_host'}, "<pre>$dirlist</pre>"));
 		}
 
-	# Try a test mount to see if filesystem is available
-	$temp = &tempname();
-	&make_dir($temp, 0755);
-	&execute_command("mount -t $_[0] ".
-			 quotemeta("$in{nfs_host}:$in{nfs_dir}")." ".
-			 quotemeta($temp),
-			 undef, \$mout, \$mout);
-	if ($mout =~ /No such file or directory/i) {
-		&error(&text('linux_enfsdir', $in{'nfs_dir'},
-			     $in{'nfs_host'}, "<pre>$dirlist</pre>"));
-		}
-	elsif ($mout =~ /Permission denied/i) {
-		&error(&text('linux_enfsperm', $in{'nfs_dir'}, $in{'nfs_host'}));
-		}
-	elsif ($?) {
-		&error(&text('linux_enfsmount', "<tt>$mout</tt>"));
-		}
-	# It worked! unmount
-	local $umout;
-	&execute_command("umount ".quotemeta($temp), undef, \$umout, \$umout);
-	if ($?) {
-		&error(&text('linux_enfsmount', "<tt>$umout</tt>"));
-		}
-	rmdir(&translate_filename($temp));	# Don't delete mounted files!
-
 	return "$in{nfs_host}:$in{nfs_dir}";
 	}
 elsif ($_[0] eq "auto") {

mysql/config-AlmaLinux-7.0-ALL

@@ -1,5 +1,5 @@
-start_cmd=service mariadb start
-stop_cmd=service mariadb stop
+start_cmd=systemctl start mariadb
+stop_cmd=systemctl stop mariadb
 mysql=/usr/bin/mysql
 mysqldump=/usr/bin/mysqldump
 mysqlimport=/usr/bin/mysqlimport
@@ -20,3 +20,4 @@ my_cnf=/etc/my.cnf
 max_text=1000
 nopwd=0
 webmin_subs=0
+login=root

mysql/config-CentOS-Linux-7.0-ALL

@@ -1,5 +1,5 @@
-start_cmd=service mariadb start
-stop_cmd=service mariadb stop
+start_cmd=systemctl start mariadb
+stop_cmd=systemctl stop mariadb
 mysql=/usr/bin/mysql
 mysqldump=/usr/bin/mysqldump
 mysqlimport=/usr/bin/mysqlimport
@@ -20,3 +20,4 @@ my_cnf=/etc/my.cnf
 max_text=1000
 nopwd=0
 webmin_subs=0
+login=root

mysql/config-CentOS-Stream-Linux-8.0-ALL

@@ -0,0 +1,23 @@
+start_cmd=systemctl start mariadb
+stop_cmd=systemctl stop mariadb
+mysql=/usr/bin/mysql
+mysqldump=/usr/bin/mysqldump
+mysqlimport=/usr/bin/mysqlimport
+mysql_libs=
+mysqladmin=/usr/bin/mysqladmin
+mysqlshow=/usr/bin/mysqlshow
+perpage=25
+style=1
+add_mode=1
+nodbi=0
+access=*: *
+blob_mode=0
+date_subs=0
+passwd_mode=0
+mysql_data=/var/lib/mysql
+max_dbs=50
+my_cnf=/etc/my.cnf
+max_text=1000
+nopwd=0
+webmin_subs=0
+login=root

mysql/config-Redhat-Enterprise-Linux-7.0-ALL

@@ -1,5 +1,5 @@
-start_cmd=service mariadb start
-stop_cmd=service mariadb stop
+start_cmd=systemctl start mariadb
+stop_cmd=systemctl stop mariadb
 mysql=/usr/bin/mysql
 mysqldump=/usr/bin/mysqldump
 mysqlimport=/usr/bin/mysqlimport
@@ -20,3 +20,4 @@ my_cnf=/etc/my.cnf
 max_text=1000
 nopwd=0
 webmin_subs=0
+login=root

mysql/config-Rocky-Linux-7.0-ALL

@@ -1,5 +1,5 @@
-start_cmd=service mariadb start
-stop_cmd=service mariadb stop
+start_cmd=systemctl start mariadb
+stop_cmd=systemctl stop mariadb
 mysql=/usr/bin/mysql
 mysqldump=/usr/bin/mysqldump
 mysqlimport=/usr/bin/mysqlimport
@@ -20,3 +20,4 @@ my_cnf=/etc/my.cnf
 max_text=1000
 nopwd=0
 webmin_subs=0
+login=root

mysql/config-Ubuntu-Linux-18.04-ALL

@@ -1,9 +1,9 @@
-start_cmd=service mysql start
-stop_cmd=service mysql stop
+start_cmd=systemctl start mysql
+stop_cmd=systemctl stop mysql
 mysql=/usr/bin/mysql
 mysqldump=/usr/bin/mysqldump
 mysqlimport=/usr/bin/mysqlimport
-mysql_libs=/usr/local/mysql/lib
+mysql_libs=
 mysqladmin=/usr/bin/mysqladmin
 mysqlshow=/usr/bin/mysqlshow
 perpage=25

mysql/config-debian-linux-10.0-ALL

@@ -0,0 +1,23 @@
+start_cmd=systemctl start mysql
+stop_cmd=systemctl stop mysql
+mysql=/usr/bin/mysql
+mysqldump=/usr/bin/mysqldump
+mysqlimport=/usr/bin/mysqlimport
+mysql_libs=
+mysqladmin=/usr/bin/mysqladmin
+mysqlshow=/usr/bin/mysqlshow
+perpage=25
+style=1
+add_mode=1
+nodbi=0
+access=*: *
+blob_mode=0
+date_subs=0
+passwd_mode=0
+mysql_data=/var/lib/mysql
+max_dbs=50
+my_cnf=/etc/mysql/my.cnf
+max_text=1000
+nopwd=0
+webmin_subs=0
+login=root

mysql/config-redhat-linux-25.0-ALL

@@ -1,5 +1,5 @@
-start_cmd=systemctl start mariadb.service
-stop_cmd=systemctl stop mariadb.service
+start_cmd=systemctl start mariadb
+stop_cmd=systemctl stop mariadb
 mysql=/usr/bin/mysql
 mysqldump=/usr/bin/mysqldump
 mysqlimport=/usr/bin/mysqlimport
@@ -20,3 +20,4 @@ my_cnf=/etc/my.cnf
 max_text=1000
 nopwd=0
 webmin_subs=0
+login=root

phpini/config

@@ -1 +1 @@
-php_ini=/etc/php.ini
+php_ini=/etc/php.ini,/etc/*/*/php*/php.ini,/etc/*/*/*php*/php.ini=Configuration for CLI and CGI	/etc/php-fpm.conf,/etc/*/php*/php-fpm.conf,/etc/*/*/php*/php-fpm.conf=Configuration for FPM

phpini/config-Ubuntu-Linux-20.0-ALL

@@ -0,0 +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>

phpini/config-debian-linux-10.0-ALL

@@ -0,0 +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>

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

postgresql/config-AlmaLinux-7.0-ALL

@@ -3,12 +3,12 @@ psql=/usr/bin/psql
 basedb=template1
 start_cmd=systemctl start postgresql
 stop_cmd=systemctl stop postgresql
-pid_file=/var/run/postmaster*.pid
+pid_file=/var/lib/pgsql/data/postmaster.pid
 perpage=25
 hba_conf=/var/lib/pgsql/data/pg_hba.conf /var/lib/pgsql/*/data/pg_hba.conf
 nodbi=0
 user=postgres
-setup_cmd=postgresql-setup initdb
+setup_cmd=postgresql-setup --initdb
 dump_cmd=/usr/bin/pg_dump
 rstr_cmd=/usr/bin/pg_restore
 repository=/home/db_repository

postgresql/config-CentOS-Linux-7.0-ALL

@@ -3,12 +3,12 @@ psql=/usr/bin/psql
 basedb=template1
 start_cmd=systemctl start postgresql
 stop_cmd=systemctl stop postgresql
-pid_file=/var/run/postmaster*.pid
+pid_file=/var/lib/pgsql/data/postmaster.pid
 perpage=25
 hba_conf=/var/lib/pgsql/data/pg_hba.conf /var/lib/pgsql/*/data/pg_hba.conf
 nodbi=0
 user=postgres
-setup_cmd=postgresql-setup initdb
+setup_cmd=postgresql-setup --initdb
 dump_cmd=/usr/bin/pg_dump
 rstr_cmd=/usr/bin/pg_restore
 repository=/home/db_repository

postgresql/config-CentOS-Stream-Linux-8.0-ALL

@@ -0,0 +1,25 @@
+login=postgres
+psql=/usr/bin/psql
+basedb=template1
+start_cmd=systemctl start postgresql
+stop_cmd=systemctl stop postgresql
+pid_file=/var/lib/pgsql/data/postmaster.pid
+perpage=25
+hba_conf=/var/lib/pgsql/data/pg_hba.conf /var/lib/pgsql/*/data/pg_hba.conf
+nodbi=0
+user=postgres
+setup_cmd=postgresql-setup --initdb
+dump_cmd=/usr/bin/pg_dump
+rstr_cmd=/usr/bin/pg_restore
+repository=/home/db_repository
+sameunix=1
+access=*: *
+blob_mode=0
+add_mode=1
+date_subs=0
+style=0
+max_dbs=50
+simple_sched=0
+access_own=0
+max_text=1000
+webmin_subs=0

postgresql/config-Rocky-Linux-7.0-ALL

@@ -3,12 +3,12 @@ psql=/usr/bin/psql
 basedb=template1
 start_cmd=systemctl start postgresql
 stop_cmd=systemctl stop postgresql
-pid_file=/var/run/postmaster*.pid
+pid_file=/var/lib/pgsql/data/postmaster.pid
 perpage=25
 hba_conf=/var/lib/pgsql/data/pg_hba.conf /var/lib/pgsql/*/data/pg_hba.conf
 nodbi=0
 user=postgres
-setup_cmd=postgresql-setup initdb
+setup_cmd=postgresql-setup --initdb
 dump_cmd=/usr/bin/pg_dump
 rstr_cmd=/usr/bin/pg_restore
 repository=/home/db_repository

postgresql/config-debian-linux-10.0-ALL

@@ -0,0 +1,24 @@
+hba_conf=/etc/postgresql/*/main/pg_hba.conf
+psql=/usr/bin/psql
+start_cmd=systemctl start postgresql
+stop_cmd=systemctl stop postgresql
+basedb=template1
+perpage=25
+plib=
+pass=
+login=postgres
+pid_file=/run/postgresql/*.pid
+nodbi=0
+dump_cmd=/usr/bin/pg_dump
+rstr_cmd=/usr/bin/pg_restore
+sameunix=1
+access=*: *
+blob_mode=0
+add_mode=1
+date_subs=0
+style=0
+max_dbs=50
+simple_sched=0
+access_own=0
+max_text=1000
+webmin_subs=0

proftpd/config-AlmaLinux-7.0-ALL

@@ -8,3 +8,4 @@ stop_cmd=systemctl stop proftpd
 start_cmd=systemctl start proftpd
 defines_file=/etc/sysconfig/proftpd
 defines_name=PROFTPD_OPTIONS
+pid_file=/run/proftpd/proftpd.pid

proftpd/config-CentOS-Linux-7.0-ALL

@@ -8,3 +8,4 @@ stop_cmd=systemctl stop proftpd
 start_cmd=systemctl start proftpd
 defines_file=/etc/sysconfig/proftpd
 defines_name=PROFTPD_OPTIONS
+pid_file=/run/proftpd/proftpd.pid

proftpd/config-CentOS-Stream-Linux-8.0-ALL

@@ -0,0 +1,11 @@
+proftpd_path=/usr/sbin/proftpd
+proftpd_conf=/etc/proftpd.conf
+ftpusers=/etc/ftpusers
+test_config=1
+test_always=0
+test_manual=0
+stop_cmd=systemctl stop proftpd
+start_cmd=systemctl start proftpd
+defines_file=/etc/sysconfig/proftpd
+defines_name=PROFTPD_OPTIONS
+pid_file=/run/proftpd/proftpd.pid

proftpd/config-Rocky-Linux-7.0-ALL

@@ -8,3 +8,4 @@ stop_cmd=systemctl stop proftpd
 start_cmd=systemctl start proftpd
 defines_file=/etc/sysconfig/proftpd
 defines_name=PROFTPD_OPTIONS
+pid_file=/run/proftpd/proftpd.pid

proftpd/config-Ubuntu-Linux

@@ -1,8 +1,8 @@
 proftpd_path=/usr/sbin/proftpd
 proftpd_conf=/etc/proftpd/proftpd.conf
 pid_file=/var/run/proftpd.pid
-start_cmd=/etc/init.d/proftpd start
-stop_cmd=/etc/init.d/proftpd stop
+start_cmd=systemctl start proftpd
+stop_cmd=systemctl stop proftpd
 ftpusers=/etc/ftpusers
 test_config=1
 test_always=0

proftpd/config-debian-linux-10.0-ALL

@@ -0,0 +1,9 @@
+proftpd_path=/usr/sbin/proftpd
+proftpd_conf=/etc/proftpd/proftpd.conf
+pid_file=/var/run/proftpd.pid
+start_cmd=systemctl start proftpd
+stop_cmd=systemctl stop proftpd
+ftpusers=/etc/ftpusers
+test_config=1
+test_always=0
+test_manual=0

proftpd/config-redhat-linux-24.0-ALL

@@ -8,3 +8,4 @@ stop_cmd=systemctl stop proftpd.service
 start_cmd=systemctl start proftpd.service
 defines_file=/etc/sysconfig/proftpd
 defines_name=PROFTPD_OPTIONS
+pid_file=/run/proftpd/proftpd.pid

samba/config-CentOS-Stream-Linux-8.0-ALL

@@ -0,0 +1,17 @@
+list_printers_command=lpc status | grep "[A-z0-9]:" | sed -e 's/://g'
+smb_passwd=/etc/samba/smbpasswd
+dont_convert=-499
+samba_password_program=/usr/bin/smbpasswd
+samba_status_program=/usr/bin/smbstatus
+samba_server=/usr/sbin/smbd
+name_server=/usr/sbin/nmbd
+smb_conf=/etc/samba/smb.conf
+text_lists=0
+run_from_inetd=0
+swat_path=/usr/sbin/swat
+sort_mode=0
+start_cmd=systemctl start smb && systemctl start nmb
+stop_cmd=systemctl stop smb && systemctl stop nmb
+smbgroupedit=/usr/bin/smbgroupedit
+pdbedit=/usr/bin/pdbedit
+net=/usr/bin/net

samba/edit_fperm.cgi

@@ -42,6 +42,9 @@ print &ui_table_row($text{'fperm_forcegrp'},
 print &ui_table_row($text{'fperm_link'},
 	&yesno_input("wide links"));
 
+print &ui_table_row($text{'fperm_unix'},
+	&yesno_input("unix extensions"));
+
 print &ui_table_row($text{'fperm_delro'},
 	&yesno_input("delete readonly"));
 

samba/lang/en

@@ -241,6 +241,7 @@ fperm_notlist=Directories not to list
 fperm_forceuser=Force Unix user
 fperm_forcegrp=Force Unix group
 fperm_link=Allow symlinks outside share?
+fperm_unix=Allow use of Unix extensions?
 fperm_delro=Can delete readonly files?
 fperm_forcefile=Force Unix file mode
 fperm_forcedir=Force Unix directory mode

samba/samba-lib.pl

@@ -508,6 +508,7 @@ foreach $s (@synon) {
 			"socket options","TCP_NODELAY",
 			"strict locking","no",
 			"sync always","no",
+			"unix extensions","yes",
 			"unix password sync","no",
 			"user",undef,
 			"valid chars",undef,

samba/save_fperm.cgi

@@ -26,6 +26,7 @@ $in{create_mode} =~ /^0?[0-7]{3}$/ ||
 &setval("force user", $in{force_user});
 &setval("force group", $in{force_group});
 &setval("wide links", $in{wide_links});
+&setval("unix extensions", $in{unix_extensions});
 
 &modify_share($in{old_name}, $in{old_name});
 &unlock_file($config{'smb_conf'});

sendmail/config-CentOS-Stream-Linux-8.0-ALL

@@ -0,0 +1,33 @@
+sendmail_cf=/etc/mail/sendmail.cf
+sendmail_mc=/etc/mail/sendmail.mc
+sendmail_features=/usr/share/sendmail-cf
+sendmail_pid=/var/run/sendmail.pid	/var/run/sm-client.pid	/run/sendmail.pid
+makemap_path=makemap
+sendmail_command=service sendmail start
+sendmail_stop_command=service sendmail stop
+sendmail_path=/usr/sbin/sendmail
+mail_dir=/var/spool/mail
+perpage=20
+sort_mode=0
+wrap_width=80
+order_mail=0
+smrsh_dir=/etc/smrsh
+track_read=0
+show_to=0
+max_records=200
+top_buttons=1
+mail_file=mbox
+mail_style=0
+mailq_show=Date,From,To,Size,Status
+index_min=1000000
+fwd_mode=0
+mailq_sort=0
+mailq_count=0
+delete_warn=1
+mailq_sort=0
+columns=2
+show_cmts=0
+prefix_cmts=0
+
+mail_type=0
+delete_confirm=1

servers/servers-lib.pl

@@ -33,7 +33,7 @@ our @cluster_modules = ( "cluster-software" );
 our @server_types = (
 		  # Linux sub-types, which have to come first
 		  [ 'asianux', 'Asianux', undef, 'Asianux' ],
-		  [ 'alma', 'Alma Linux', undef, 'Alma' ],
+		  [ 'alma', 'AlmaLinux', undef, 'Alma' ],
 		  [ 'centos', 'CentOS Linux', undef, 'CentOS' ],
 		  [ 'ubuntu', 'Ubuntu Linux', undef, 'Ubuntu' ],
 		  [ 'fedora', 'Fedora Linux', undef, 'Fedora' ],

setup.pl

@@ -249,7 +249,7 @@ else {
 		if (!&has_command("process.exe")) {
 			&errorexit("The command process.exe must be installed to run Webmin on Windows");
 			}
-		if (eval "use Win32::Daemon; 1") {
+		if (!eval "use Win32::Daemon; 1") {
 			&errorexit("The Perl module Win32::Daemon must be installed to run Webmin on Windows");
 			}
 		}

setup.sh

@@ -863,7 +863,9 @@ printf "\n"
 if [ "\$answer" = "y" ]; then
 	$config_dir/stop
 	echo "Running uninstall scripts .."
-	(cd "$wadir" ; WEBMIN_CONFIG=$config_dir WEBMIN_VAR=$var_dir LANG= "$wadir/run-uninstalls.pl") >/dev/null 2>&1 </dev/null
+	if [ -r "$wadir/run-uninstalls.pl" ]; then
+		(cd "$wadir" ; WEBMIN_CONFIG=$config_dir WEBMIN_VAR=$var_dir LANG= "$wadir/run-uninstalls.pl") >/dev/null 2>&1 </dev/null
+	fi
 	echo "Deleting $wadir .."
 	rm -rf "$wadir"
 	echo "Deleting $config_dir .."

spam/config-AlmaLinux-7.0-ALL

@@ -0,0 +1,13 @@
+local_cf=/etc/mail/spamassassin/local.cf
+spamassassin=spamassassin
+sa_learn=sa-learn
+procmailrc=/etc/procmailrc
+amavisdconf=/etc/amavisd/amavisd.conf
+warn_procmail=1
+call_spam=1
+processes=spamd amavisd
+restart_cmd=systemctl restart spamassassin
+procmail_cmd=*
+mode=0
+addto=0
+max_awl=200

spam/config-CentOS-Stream-Linux-8.0-ALL

@@ -0,0 +1,13 @@
+local_cf=/etc/mail/spamassassin/local.cf
+spamassassin=spamassassin
+sa_learn=sa-learn
+procmailrc=/etc/procmailrc
+amavisdconf=/etc/amavisd/amavisd.conf
+warn_procmail=1
+call_spam=1
+processes=spamd amavisd
+restart_cmd=systemctl restart spamassassin
+procmail_cmd=*
+mode=0
+addto=0
+max_awl=200

spam/config-Rocky-Linux-7.0-ALL

@@ -0,0 +1,13 @@
+local_cf=/etc/mail/spamassassin/local.cf
+spamassassin=spamassassin
+sa_learn=sa-learn
+procmailrc=/etc/procmailrc
+amavisdconf=/etc/amavisd/amavisd.conf
+warn_procmail=1
+call_spam=1
+processes=spamd amavisd
+restart_cmd=systemctl restart spamassassin
+procmail_cmd=*
+mode=0
+addto=0
+max_awl=200

spam/config-debian-linux-10.0-ALL

@@ -0,0 +1,13 @@
+local_cf=/etc/spamassassin/local.cf
+spamassassin=spamassassin
+sa_learn=sa-learn
+procmailrc=/etc/procmailrc
+amavisdconf=/etc/amavis/conf.d/20-debian_defaults
+warn_procmail=1
+call_spam=1
+processes=spamd amavisd
+restart_cmd=systemctl restart spamassassin
+procmail_cmd=*
+mode=0
+addto=0
+max_awl=200

spam/config-redhat-linux-24.0-ALL

@@ -0,0 +1,13 @@
+local_cf=/etc/mail/spamassassin/local.cf
+spamassassin=spamassassin
+sa_learn=sa-learn
+procmailrc=/etc/procmailrc
+amavisdconf=/etc/amavisd/amavisd.conf
+warn_procmail=1
+call_spam=1
+processes=spamd amavisd
+restart_cmd=systemctl restart spamassassin
+procmail_cmd=*
+mode=0
+addto=0
+max_awl=200

squid/config-AlmaLinux-7.0-ALL

@@ -4,8 +4,9 @@ cache_dir=/var/spool/squid
 squid_conf=/etc/squid/squid.conf
 pid_file=/run/squid.pid
 cachemgr_path=/usr/*/squid/cachemgr.cgi
-squid_start=service squid start
-squid_stop=service squid stop
+squid_start=systemctl start squid
+squid_stop=systemctl stop squid
+squid_restart=systemctl reload squid
 calamaris=calamaris
 cal_max=50000
 cal_args=-aw

squid/config-CentOS-Stream-Linux-8.0-ALL

@@ -0,0 +1,21 @@
+log_dir=/var/log/squid
+squid_path=squid
+cache_dir=/var/spool/squid
+squid_conf=/etc/squid/squid.conf
+pid_file=/run/squid.pid
+cachemgr_path=/usr/*/squid/cachemgr.cgi
+squid_start=systemctl start squid
+squid_stop=systemctl stop squid
+squid_restart=systemctl reload squid
+calamaris=calamaris
+cal_max=50000
+cal_args=-aw
+crypt_conf=0
+sort_conf=0
+sync_create=0
+sync_delete=0
+sync_modify=1
+cal_fmt=w
+cal_all=1
+restart_pos=0
+squidclient=squidclient

squid/config-Redhat-Enterprise-Linux-7.0-ALL

@@ -4,8 +4,9 @@ cache_dir=/var/spool/squid
 squid_conf=/etc/squid/squid.conf
 pid_file=/run/squid.pid
 cachemgr_path=/usr/*/squid/cachemgr.cgi
-squid_start=service squid start
-squid_stop=service squid stop
+squid_start=systemctl start squid
+squid_stop=systemctl stop squid
+squid_restart=systemctl reload squid
 calamaris=calamaris
 cal_max=50000
 cal_args=-aw

squid/config-Rocky-Linux-7.0-ALL

@@ -4,8 +4,9 @@ cache_dir=/var/spool/squid
 squid_conf=/etc/squid/squid.conf
 pid_file=/run/squid.pid
 cachemgr_path=/usr/*/squid/cachemgr.cgi
-squid_start=service squid start
-squid_stop=service squid stop
+squid_start=systemctl start squid
+squid_stop=systemctl stop squid
+squid_restart=systemctl reload squid
 calamaris=calamaris
 cal_max=50000
 cal_args=-aw

squid/config-Ubuntu-Linux-16.0-ALL

@@ -16,6 +16,6 @@ cal_fmt=w
 cal_all=1
 restart_pos=0
 squidclient=squidclient
-squid_start=service squid start
-squid_stop=service squid stop
-squid_restart=service squid reload
+squid_start=systemctl start squid
+squid_stop=systemctl stop squid
+squid_restart=systemctl reload squid

squid/config-debian-linux-10.0-ALL

@@ -0,0 +1,21 @@
+log_dir=/var/log/squid
+squid_path=squid
+cache_dir=/var/spool/squid
+squid_conf=/etc/squid/squid.conf
+pid_file=/var/run/squid.pid
+cachemgr_path=/usr/lib/cgi-bin/cachemgr.cgi
+calamaris=calamaris
+cal_max=50000
+cal_args=-aw
+crypt_conf=0
+sort_conf=0
+sync_create=0
+sync_delete=0
+sync_modify=1
+cal_fmt=w
+cal_all=1
+restart_pos=0
+squidclient=squidclient
+squid_start=systemctl start squid
+squid_stop=systemctl stop squid
+squid_restart=systemctl reload squid

squid/config-redhat-linux-24.0-ALL

@@ -2,10 +2,11 @@ log_dir=/var/log/squid
 squid_path=squid
 cache_dir=/var/spool/squid
 squid_conf=/etc/squid/squid.conf
-pid_file=/var/run/squid.pid
+pid_file=/run/squid.pid
 cachemgr_path=/usr/*/squid/cachemgr.cgi
-squid_start=systemctl start squid.service
-squid_stop=systemctl stop squid.service
+squid_start=systemctl start squid
+squid_stop=systemctl stop squid
+squid_restart=systemctl reload squid
 calamaris=calamaris
 cal_max=50000
 cal_args=-aw

sshd/config-AlmaLinux-8.0-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-CentOS-Stream-Linux-8.0-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-Rocky-Linux-8.0-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