update change log

Re-read SSL certs on USR1 signal
Further caching of SSL contexts
2026-02-06 15:32:20 +00:00 · 2022-09-18 11:36:26 -07:00 · 2022-09-17 17:47:16 -07:00 · 2022-09-17 17:32:28 -07:00 · 2022-09-17 16:40:12 -07:00 · 2022-09-17 16:31:37 -07:00
728 changed files with 5011 additions and 1058 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,44 @@
 ## Changelog

+#### 2.001 (September, 2022)
+* Fix missing origins and action for direct rules in FirewallD module
+* Removed the need for a full restart when updating SSH keys
+* Improved the Javascript for redirects to HTTPS
+
+#### 2.000 (August 21, 2022)
+* Add to enforce HTTP Strict Transport Security (HSTS) policy in SSL enabled mode
+* Add better `http` to `https` redirects when SSL is enabled
+* Add support for installing multiple versions of Webmin on `systemd` systems
+* Add support for AMD CPU thermisters #1714
+* Add better support for Webmin minor (release) versions upgrades
+* Add Webmin and Usermin configuration modules display minor (release) version
+* Add Mint Linux support
+* Add latest Authentic 20.00 [theme update](https://github.com/webmin/authentic-theme/releases/tag/20.00) with number of bug fixes
+* Fix to also restart dependent services (i.e. `fail2ban`) upon `firewalld` restart
+* Fix to preserve service state for Webmin and Usermin upon package upgrades (i.e. don't start stopped)
+* Fix Bind module config incorrectly updated upon Webmin upgrades on CentOS 7
+
+#### 1.999 (August 4, 2022)
+* Fix to allow IPv6 addresses for slaves in BIND module
+* Fix to send `HUP` signal on reload with `systemd`
+* Fix icons in Servers Index module for newer distros (Alma and Rocky)
+* Fix to remove depricated option `UsePrivilegeSeparation` with OpenSSH 7.5+
+* Fix Oracle Linux support
+* Fix Ubuntu release notes links
+* Add Webmin release note message
+* Add latest Authentic [theme update](https://github.com/webmin/authentic-theme/releases/tag/19.99) with number of bug fixes
+
+#### 1.998 (July 25, 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
+* Fix version detection bug for Log File Rotation module
+* Add improvements to Partitions on Local Disks module
+* Add better support for CentOS Stream Linux for new installs
+* Add improvements for searching and naming global PHP configs files
+* Add support for unix extensions option for Samba module https://github.com/webmin/webmin/issues/1695
+* Add latest Authentic [theme update](https://github.com/webmin/authentic-theme/releases/tag/19.98) 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
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 ## Contents
 * [Changelog](https://github.com/webmin/webmin/blob/master/CHANGELOG.md)
 * [About](#about)
-* [Installation](#installation)[<img src="https://github.com/webmin-devel/webmin/blob/master/media/download-23x14-stable.png?raw=true" title="Stable Versions">](http://webmin.com/download.html)[<img src="https://github.com/webmin-devel/webmin/blob/master/media/download-23x14-devel.png?raw=true" title="Development Versions">](http://webmin.com/devel.html)
+* [Installation](#installation)[<img src="https://github.com/webmin-devel/webmin/blob/master/media/download-23x14-stable.png?raw=true" title="Stable Versions">](https://webmin.com/download.html)[<img src="https://github.com/webmin-devel/webmin/blob/master/media/download-23x14-devel.png?raw=true" title="Development Versions">](https://webmin.com/devel.html)
 * [Documentation](#documentation)
 * [Development](#development)
 * [License](#license)
@@ -28,11 +28,11 @@ Perl 5.10 or higher.
 ## Installation
 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);
+ 1. By downloading a pre-built package, available for different distributions (CentOS, Fedora, SuSE, Mandriva, Debian, Ubuntu, Solaris and [other](https://www.webmin.com/support.html)) under [latest release assets](https://github.com/webmin/webmin/releases/latest) or from our [download page](https://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.
-  <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>
+ 2. By downloading, extracting [source file](https://prdownloads.sourceforge.net/webadmin/webmin-2.000.tar.gz), and running [_setup.sh_](https://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](https://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
 Complete set of documentation for Webmin and all of its modules can be found at out [Wiki page](https://doxfer.webmin.com/Webmin/Main_Page).
@@ -41,7 +41,7 @@ Complete set of documentation for Webmin and all of its modules can be found at

 ### Lead developer

-* [Jamie Cameron](http://www.webmin.com/about.html) [![](https://github.com/webmin-devel/webmin/blob/master/media/linkedin-15x15.png?raw=true)](https://www.linkedin.com/in/jamiecameron2)
+* [Jamie Cameron](https://www.webmin.com/about.html) [![](https://github.com/webmin-devel/webmin/blob/master/media/linkedin-15x15.png?raw=true)](https://www.linkedin.com/in/jamiecameron2)

 ### Developers
 * [Ilia Rostovtsev](https://github.com/iliajie)
--- a/WebminCore.pm
+++ b/WebminCore.pm
--- a/acl/lang/af.auto
+++ b/acl/lang/af.auto
@@ -354,6 +354,7 @@ sessions_actions=Optrede..
 sessions_all=Alle sessies..
 sessions_logouts=Toon ook afgemelde sessies..
 sessions_state=staat
+sessions_action=Aksies
 sessions_this=Hierdie aanmelding
 sessions_in=Aangemeld
 sessions_out=Uitgeteken
--- a/acl/lang/ar.auto
+++ b/acl/lang/ar.auto
@@ -242,6 +242,7 @@ sessions_actions=أجراءات..
 sessions_all=كل الجلسات..
 sessions_logouts=اعرض أيضًا جلسات تسجيل الخروج..
 sessions_state=حالة
+sessions_action=أجراءات
 sessions_this=هذا تسجيل الدخول
 sessions_in=تسجيل الدخول
 sessions_out=تسجيل الخروج
--- a/acl/lang/be.auto
+++ b/acl/lang/be.auto
@@ -354,6 +354,7 @@ sessions_actions=Дзеянні..
 sessions_all=Усе сеансы..
 sessions_logouts=Таксама паказаць выходныя сесіі.
 sessions_state=Дзярж
+sessions_action=Дзеянні
 sessions_this=Гэта ўваход
 sessions_in=Ўвайшлі ў
 sessions_out=Выйшаў
--- a/acl/lang/bg.auto
+++ b/acl/lang/bg.auto
@@ -11,6 +11,7 @@ save_eunixname=Потребителското име '$1' не е потреби
 sync_modify=Преименувайте съответстващия потребител на Webmin, когато потребител на Unix е преименуван.

 sessions_all=Всички сесии..
+sessions_action=Действия

 sql_nocache0=Кеш връзки към база данни
 sql_nocache1=Отворете нова връзка за всяко търсене
--- a/acl/lang/ca.auto
+++ b/acl/lang/ca.auto
@@ -11,6 +11,7 @@ save_eunixname=El nom d'usuari '$1' no és un usuari Unix, per la qual cosa no e
 sync_modify=Canvieu el nom de l'usuari Webmin coincident quan es canvia el nom d'un usuari Unix.

 sessions_all=Totes les sessions..
+sessions_action=Accions

 sql_nocache0=Connexions de memòria cau a la base de dades
 sql_nocache1=Obriu una connexió nova per a cada cerca
--- a/acl/lang/cs.auto
+++ b/acl/lang/cs.auto
@@ -64,6 +64,7 @@ sessions_actions=Akce..
 sessions_all=Všechny relace..
 sessions_logouts=Zobrazit také odhlášené relace.
 sessions_state=Stát
+sessions_action=Akce
 sessions_this=Toto přihlášení
 sessions_in=Přihlášen
 sessions_out=Odhlásit
--- a/acl/lang/da.auto
+++ b/acl/lang/da.auto
@@ -11,6 +11,7 @@ save_eunixname=Brugernavnet '$1' er ikke en Unix-bruger, og kan derfor ikke brug
 sync_modify=Omdøb den matchende Webmin-bruger, når en Unix-bruger omdøbes.

 sessions_all=Alle sessioner..
+sessions_action=Handlinger

 sql_nocache0=Cache-forbindelser til databasen
 sql_nocache1=Åbn en ny forbindelse til hvert opslag
--- a/acl/lang/de.auto
+++ b/acl/lang/de.auto
@@ -1,6 +1,7 @@
 sync_modify=Benennen Sie den passenden Webmin-Benutzer um, wenn ein Unix-Benutzer umbenannt wird.

 sessions_all=Alle Sitzungen..
+sessions_action=Aktionen

 sql_nocache0=Cache-Verbindungen zur Datenbank
 sql_nocache1=Öffnen Sie für jede Suche eine neue Verbindung
--- a/acl/lang/el.auto
+++ b/acl/lang/el.auto
@@ -11,6 +11,7 @@ save_eunixname=Το όνομα χρήστη '$1' δεν είναι χρήστη
 sync_modify=Μετονομάστε τον αντίστοιχο χρήστη Webmin όταν μετονομάζεται ένας χρήστης Unix.

 sessions_all=Όλες οι συνεδρίες..
+sessions_action=Ενέργειες

 sql_nocache0=Συνδέσεις προσωρινής μνήμης με βάση δεδομένων
 sql_nocache1=Ανοίξτε μια νέα σύνδεση για κάθε αναζήτηση
--- a/acl/lang/es.auto
+++ b/acl/lang/es.auto
@@ -16,6 +16,7 @@ sessions_actions=Comportamiento..
 sessions_all=Todas las sesiones..
 sessions_logouts=Mostrar también sesiones cerradas.
 sessions_state=Estado
+sessions_action=Comportamiento
 sessions_this=Este inicio de sesión
 sessions_in=Conectado
 sessions_out=Desconectado
--- a/acl/lang/eu.auto
+++ b/acl/lang/eu.auto
@@ -60,6 +60,7 @@ sessions_actions=Ekintzak..
 sessions_all=Saio guztiak..
 sessions_logouts=Erakutsi itxitako saioak ere..
 sessions_state=Estatu
+sessions_action=Ekintzak
 sessions_this=Saioa hasiera
 sessions_in=Saioa hasi
 sessions_out=Saioa amaitu
--- a/acl/lang/fa.auto
+++ b/acl/lang/fa.auto
@@ -115,6 +115,7 @@ sessions_actions=اقدامات..
 sessions_all=تمام جلسات..
 sessions_logouts=همچنین جلسات ورود به سیستم را نشان دهید..
 sessions_state=دولت
+sessions_action=اقدامات
 sessions_this=این ورود
 sessions_in=وارد شده
 sessions_out=خارج شد
--- a/acl/lang/fi.auto
+++ b/acl/lang/fi.auto
@@ -354,6 +354,7 @@ sessions_actions=Toiminnot..
 sessions_all=Kaikki istunnot..
 sessions_logouts=Näytä myös kirjautuneet istunnot..
 sessions_state=Osavaltio
+sessions_action=Toiminnot
 sessions_this=Tämä kirjautuminen
 sessions_in=Kirjautunut sisään
 sessions_out=Kirjautunut ulos
--- a/acl/lang/fr.auto
+++ b/acl/lang/fr.auto
@@ -57,6 +57,7 @@ unix_header=Paramètres d'authentification utilisateur Unix
 unix_utable=Utilisateurs Unix autorisés

 sessions_all=Toutes les séances..
+sessions_action=Actions

 udeletes_jerr=Échec de l'ajout d'utilisateurs au groupe

--- a/acl/lang/he.auto
+++ b/acl/lang/he.auto
@@ -354,6 +354,7 @@ sessions_actions=פעולות..
 sessions_all=כל המפגשים..
 sessions_logouts=הראה גם הפעלות לא מחוברות..
 sessions_state=מדינה
+sessions_action=פעולות
 sessions_this=כניסה זו
 sessions_in=מחובר
 sessions_out=התנתק
--- a/acl/lang/hr.auto
+++ b/acl/lang/hr.auto
@@ -65,6 +65,7 @@ sessions_actions=Akcije..
 sessions_all=Sve sesije..
 sessions_logouts=Prikaži i odjavljene sesije..
 sessions_state=država
+sessions_action=Radnje
 sessions_this=Ova prijava
 sessions_in=Prijavljeni
 sessions_out=Odjavljen
--- a/acl/lang/hu.auto
+++ b/acl/lang/hu.auto
@@ -91,6 +91,7 @@ sessions_actions=Hozzászólások..
 sessions_all=Minden ülés..
 sessions_logouts=A kijelentkezett munkamenetek megjelenítése is
 sessions_state=Állapot
+sessions_action=Akciók
 sessions_this=Ez a bejelentkezés
 sessions_in=Bejelentkezve
 sessions_out=Kilépett
--- a/acl/lang/it.auto
+++ b/acl/lang/it.auto
@@ -40,6 +40,7 @@ sessions_actions=Azioni..
 sessions_all=Tutte le sessioni..
 sessions_logouts=Mostra anche sessioni disconnesse.
 sessions_state=Stato
+sessions_action=Azioni
 sessions_this=Questo login
 sessions_in=Connesso
 sessions_out=Disconnesso
--- a/acl/lang/ja.auto
+++ b/acl/lang/ja.auto
@@ -62,6 +62,7 @@ sessions_actions=行動..
 sessions_all=すべてのセッション。
 sessions_logouts=ログアウトしたセッションも表示します。
 sessions_state=状態
+sessions_action=行動
 sessions_this=このログイン
 sessions_in=ログイン済み
 sessions_out=ログアウトしました
--- a/acl/lang/ko.auto
+++ b/acl/lang/ko.auto
@@ -62,6 +62,7 @@ sessions_actions=행위..
 sessions_all=모든 세션..
 sessions_logouts=로그 아웃 된 세션도 표시하십시오.
 sessions_state=상태
+sessions_action=행위
 sessions_this=이 로그인
 sessions_in=로그인
 sessions_out=로그 아웃
--- a/acl/lang/lt.auto
+++ b/acl/lang/lt.auto
@@ -354,6 +354,7 @@ sessions_actions=Veiksmai..
 sessions_all=Visi užsiėmimai..
 sessions_logouts=Taip pat rodyti atsijungusius seansus..
 sessions_state=Valstybė
+sessions_action=Veiksmai
 sessions_this=Šis prisijungimas
 sessions_in=Prisijungęs
 sessions_out=Atsijungęs
--- a/acl/lang/lv.auto
+++ b/acl/lang/lv.auto
@@ -354,6 +354,7 @@ sessions_actions=Darbības..
 sessions_all=Visas sesijas..
 sessions_logouts=Rādīt arī atteikšanās sesijas..
 sessions_state=Valsts
+sessions_action=Darbības
 sessions_this=Šī pieteikšanās
 sessions_in=Pieteicies
 sessions_out=Izlogojies
--- a/acl/lang/ms.auto
+++ b/acl/lang/ms.auto
@@ -16,6 +16,7 @@ sessions_actions=Tindakan..
 sessions_all=Semua sesi..
 sessions_logouts=Juga tunjukkan sesi log keluar..
 sessions_state=Negeri
+sessions_action=Tindakan
 sessions_this=Log masuk ini
 sessions_in=Log masuk
 sessions_out=Logged out
--- a/acl/lang/mt.auto
+++ b/acl/lang/mt.auto
@@ -354,6 +354,7 @@ sessions_actions=Azzjonijiet..
 sessions_all=Is-sessjonijiet kollha..
 sessions_logouts=Uri wkoll sessjonijiet illoggjati..
 sessions_state=Stat
+sessions_action=Azzjonijiet
 sessions_this=Dan id-dħul
 sessions_in=Dħalt
 sessions_out=Dħalt
--- a/acl/lang/nl.auto
+++ b/acl/lang/nl.auto
@@ -39,6 +39,7 @@ sessions_actions=Acties..
 sessions_all=Alle sessies..
 sessions_logouts=Toon ook uitgelogde sessies..
 sessions_state=Staat
+sessions_action=Acties
 sessions_this=Deze login
 sessions_in=Ingelogd
 sessions_out=Uitgelogd
--- a/acl/lang/no.auto
+++ b/acl/lang/no.auto
@@ -1,6 +1,7 @@
 sync_modify=Gi nytt navn til den samsvarende Webmin-brukeren når en Unix-bruker får nytt navn.

 sessions_all=Alle økter..
+sessions_action=Handlinger

 sql_nocache0=Cache-tilkoblinger til databasen
 sql_nocache1=Åpne en ny forbindelse for hvert oppslag
--- a/acl/lang/pl.auto
+++ b/acl/lang/pl.auto
@@ -14,6 +14,7 @@ sessions_actions=Działania..
 sessions_all=Wszystkie sesje...
 sessions_logouts=Pokaż także wylogowane sesje.
 sessions_state=Stan
+sessions_action=działania
 sessions_this=Ten login
 sessions_in=Zalogowany
 sessions_out=Wylogowano
--- a/acl/lang/pt.auto
+++ b/acl/lang/pt.auto
@@ -330,6 +330,7 @@ sessions_actions=Ações..
 sessions_all=Todas as sessões..
 sessions_logouts=Mostrar também sessões desconectadas.
 sessions_state=Estado
+sessions_action=Ações
 sessions_this=Este login
 sessions_in=Logado
 sessions_out=Desconectado
--- a/acl/lang/pt_BR.auto
+++ b/acl/lang/pt_BR.auto
@@ -58,6 +58,7 @@ sessions_actions=Ações..
 sessions_all=Todas as sessões..
 sessions_logouts=Mostrar também sessões desconectadas.
 sessions_state=Estado
+sessions_action=Ações
 sessions_this=Este login
 sessions_in=Logado
 sessions_out=Desconectado
--- a/acl/lang/ro.auto
+++ b/acl/lang/ro.auto
@@ -354,6 +354,7 @@ sessions_actions=Acțiuni..
 sessions_all=Toate sesiunile..
 sessions_logouts=Arată, de asemenea, sesiuni deconectate..
 sessions_state=Stat
+sessions_action=Acțiuni
 sessions_this=Această autentificare
 sessions_in=Conectat
 sessions_out=Delogat
--- a/acl/lang/ru.auto
+++ b/acl/lang/ru.auto
@@ -62,6 +62,7 @@ sessions_actions=Действия..
 sessions_all=Все сеансы..
 sessions_logouts=Также показать сеансы выхода из системы.
 sessions_state=состояние
+sessions_action=Действия
 sessions_this=Этот логин
 sessions_in=Войти в систему
 sessions_out=Вышли из
--- a/acl/lang/sk.auto
+++ b/acl/lang/sk.auto
@@ -107,6 +107,7 @@ sessions_actions=Akcia..
 sessions_all=Všetky relácie..
 sessions_logouts=Zobraziť aj odhlásené relácie.
 sessions_state=Štát
+sessions_action=Akcie
 sessions_this=Toto prihlásenie
 sessions_in=Prihlásený
 sessions_out=Odhlasený
--- a/acl/lang/sl.auto
+++ b/acl/lang/sl.auto
@@ -354,6 +354,7 @@ sessions_actions=Ukrepi..
 sessions_all=Vse seje..
 sessions_logouts=Prikaži tudi odjavne seje.
 sessions_state=Država
+sessions_action=Dejanja
 sessions_this=Ta prijava
 sessions_in=Prijavljeni
 sessions_out=Odjavljeni
--- a/acl/lang/sv.auto
+++ b/acl/lang/sv.auto
@@ -62,6 +62,7 @@ sessions_actions=Handlingar..
 sessions_all=Alla sessioner..
 sessions_logouts=Visa även utloggade sessioner..
 sessions_state=stat
+sessions_action=Åtgärder
 sessions_this=Den här inloggningen
 sessions_in=Inloggad
 sessions_out=Utloggad
--- a/acl/lang/th.auto
+++ b/acl/lang/th.auto
@@ -354,6 +354,7 @@ sessions_actions=การดำเนินการ..
 sessions_all=ทุกวาระ..
 sessions_logouts=แสดงเซสชันการออกจากระบบด้วย..
 sessions_state=สถานะ
+sessions_action=การกระทำ
 sessions_this=เข้าสู่ระบบนี้
 sessions_in=เข้าสู่ระบบ
 sessions_out=ออกจากระบบ
--- a/acl/lang/tr.auto
+++ b/acl/lang/tr.auto
@@ -123,6 +123,7 @@ sessions_actions=Hareketler..
 sessions_all=Tüm oturumlar..
 sessions_logouts=Oturumu kapatılmış oturumları da göster..
 sessions_state=Durum
+sessions_action=Hareketler
 sessions_this=Bu giriş
 sessions_in=Giriş
 sessions_out=Çıkış yapıldı
--- a/acl/lang/uk.auto
+++ b/acl/lang/uk.auto
@@ -349,6 +349,7 @@ sessions_actions=Дії..
 sessions_all=Всі сеанси..
 sessions_logouts=Показати також сеанси виходу з системи..
 sessions_state=Держава
+sessions_action=Дії
 sessions_this=Це логін
 sessions_in=Увійшли в
 sessions_out=Вийшли з системи
--- a/acl/lang/ur.auto
+++ b/acl/lang/ur.auto
@@ -354,6 +354,7 @@ sessions_actions=عمل..
 sessions_all=تمام سیشنز..
 sessions_logouts=لاگ آؤٹ سیشن بھی دکھائیں..
 sessions_state=حالت
+sessions_action=اعمال
 sessions_this=یہ لاگ ان
 sessions_in=لاگ ان
 sessions_out=لاگ آؤٹ
--- a/acl/lang/vi.auto
+++ b/acl/lang/vi.auto
@@ -354,6 +354,7 @@ sessions_actions=Hành động..
 sessions_all=Tất cả các phiên..
 sessions_logouts=Cũng hiển thị các phiên đăng xuất..
 sessions_state=Tiểu bang
+sessions_action=Hành động
 sessions_this=Thông tin đăng nhập này
 sessions_in=Đăng nhập
 sessions_out=Đăng xuất
--- a/acl/lang/zh.auto
+++ b/acl/lang/zh.auto
@@ -163,6 +163,7 @@ sessions_actions=动作..
 sessions_all=所有会议..
 sessions_logouts=同时显示注销的会话。
 sessions_state=州
+sessions_action=行动
 sessions_this=此登录名
 sessions_in=登录
 sessions_out=登出
--- a/acl/lang/zh_TW.auto
+++ b/acl/lang/zh_TW.auto
@@ -141,6 +141,7 @@ sessions_actions=動作..
 sessions_all=所有會議..
 sessions_logouts=還顯示註銷的會話。
 sessions_state=州
+sessions_action=行動
 sessions_this=此登錄名
 sessions_in=登錄
 sessions_out=登出
--- a/apache/config-AlmaLinux-7.0-ALL
+++ b/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
--- a/apache/config-CentOS-Stream-Linux-8.0-ALL
+++ b/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
--- a/apache/config-Fedora-Linux-20.00-ALL
+++ b/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
--- a/apache/config-Oracle-Linux-8.0-ALL
+++ b/apache/config-Oracle-Linux-8.0-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
--- a/apache/config-Redhat-Enterprise-Linux-7.0-ALL
+++ b/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
--- a/apache/config-Rocky-Linux-7.0-ALL
+++ b/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
--- a/apache/config-debian-linux-10.0-ALL
+++ b/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
--- a/apache/config-debian-linux-7.0-9.0
+++ b/apache/config-debian-linux-7.0-9.0
--- a/apache/config-redhat-linux-24.0-ALL
+++ b/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
--- a/apache/show.cgi
+++ b/apache/show.cgi
@@ -68,8 +68,8 @@ print "<table border><tr><td $cb><pre>\n\n";
 &show_directives($conf, 0);
 print "</pre></td></tr></table>\n";
 print "</td></tr>\n";
-
-if ($in{'virt'} || $in{'file'} || defined($in{'idx'})) {
+if ($access{'types'} eq '*' &&
+   ($in{'virt'} || $in{'file'} || defined($in{'idx'}))) {
 	print "<tr>\n";
 	print "<td><form action=manual_form.cgi>";
 	print "<input type=submit name=these value='$text{'show_these'}'>";
--- a/bin/webmin
+++ b/bin/webmin
@@ -69,7 +69,7 @@ sub main {
                    read_file($mod, \%mod_info);
                    my $mod_ver = $mod_info{'version_actual'} || $mod_info{'version'};
                    my $mod_desc = $mod_info{'desc'};
-                    if ($mod_ver && $prod_ver && $mod_desc && $mod_ver ne $prod_ver) {
+                    if ($mod_ver && $prod_ver && $mod_desc && $prod_ver !~ /^$mod_ver/) {
                        say  CYAN, "  $module_type: ", RESET if (!$head++);
                        my ($mod_dir) = $mod =~ m/$prod_root\/(.*?)\//;
                        push(@minfo, {'desc' => $mod_desc, 'ver' => $mod_ver, 'dir' => $mod_dir});
@@ -105,13 +105,18 @@ sub main {
            my $ver1 = "$root/version";
            my $ver2 = "$opt{'config'}/version";
            my $ver = read_file_contents($ver1) || read_file_contents($ver2);
+            my $verrel_file = "$root/release";
+            my $verrel = -r $verrel_file ? read_file_contents($verrel_file) : "";
+            if ($verrel) {
+                $verrel = ":@{[trim($verrel)]}";
+            }
            $ver = trim($ver);
            if ($ver) {
                if ($opt{'version'}) {
-                    say $ver;
+                    say "$ver$verrel";
                    exit 0;
                } else {
-                    say CYAN, "Webmin: ", RESET, &$ver_checked($versions_remote{'webmin'}, $ver), DARK " [$root]", RESET;
+                    say CYAN, "Webmin: ", RESET, &$ver_checked($versions_remote{'webmin'}, "$ver$verrel"), DARK " [$root]", RESET;
                }
            } else {
                say RED, "Error: ", RESET, "Cannot determine Webmin version";
@@ -153,7 +158,12 @@ sub main {
                        my $uver1 = "$uroot/version";
                        my $uver2 = "$wmumconfig/version";
                        my $uver = read_file_contents($uver1) || read_file_contents($uver2);
-                        $uver = trim($uver);
+                        my $uverrel_file = "$uroot/release";
+                        my $uverrel      = -r $uverrel_file ? read_file_contents($uverrel_file) : "";
+                        if ($uverrel) {
+                            $uverrel = ":@{[trim($uverrel)]}";
+                        }
+                        $uver = trim($uver) . $uverrel;
                        if ($uver) {
                            say CYAN, "Usermin: ", RESET, &$ver_checked($versions_remote{'usermin'}, $uver), DARK " [$uroot]", RESET;
                            my ($udir, @uthemes, @umods);
--- a/bind8/bind8-lib.pl
+++ b/bind8/bind8-lib.pl
@@ -2834,13 +2834,14 @@ foreach my $slave (@slaves) {
 	my @otherslaves;
 	if ($config{'other_slaves'}) {
 		@otherslaves = grep { $_ ne '' }
-				  map { &to_ipaddress($_->{'host'}) }
+				  map { &to_ipaddress($_->{'host'}) ||
+					&to_ip6address($_->{'host'}) }
 				      grep { $_ ne $slave } @slaves;
 		}
 	if ($config{'extra_slaves'}) {
 		push(@otherslaves,
 		     grep { $_ ne '' } 
-                          map { &to_ipaddress($_) }
+                          map { &to_ipaddress($_) || &to_ip6address($_) }
 			      split(/\s+/, $config{'extra_slaves'}));
 		}
 	if ($moreslaves) {
--- a/bind8/conf_rndc.cgi
+++ b/bind8/conf_rndc.cgi
@@ -35,7 +35,7 @@ if (!$? && $out !~ /failed/) {
 print &ui_form_start("save_rndc.cgi", "post");
 my $ex = -s $config{'rndc_conf'};
 print &text($ex ? 'rndc_rusure' : 'rndc_rusure2',
-	    "<tt>$config{'rndc_conf'}</tt>"),"<p>\n";
+	    "<tt>$config{'rndc_conf'}</tt>"),"<br>\n";
 print &ui_submit($text{'rndc_ok'});
 print &ui_form_end();

--- a/bind8/config-AlmaLinux-6.0-ALL
+++ b/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,8 @@ dnssectools_rollmgr_pidfile=/var/run/rollmgr.pid
 force_random=0
 spf_record=0
 dnssec_info=1
+start_cmd=systemctl start named
+stop_cmd=systemctl stop named
+restart_cmd=systemctl reload named
+chroot=
+auto_chroot=
--- a/bind8/config-Redhat-Enterprise-Linux-6.0-ALL
+++ b/bind8/config-Redhat-Enterprise-Linux-6.0-ALL
@@ -42,7 +42,7 @@ keygen=dnssec-keygen
 signzone=dnssec-signzone
 checkconf=named-checkconf
 other_slaves=1
-restart_cmd=restart
+restart_cmd=service named restart
 keygen=dnssec-keygen
 tmpl_dnssec=0
 dnssec_period=21
@@ -54,3 +54,5 @@ dnssectools_rollmgr_pidfile=/var/run/rollmgr.pid
 force_random=0
 spf_record=0
 dnssec_info=1
+chroot=
+auto_chroot=
--- a/bind8/config-redhat-linux-24.0-ALL
+++ b/bind8/config-redhat-linux-24.0-ALL
@@ -3,8 +3,6 @@ named_path=/usr/sbin/named
 named_conf=/etc/named.conf
 show_list=1
 records_order=0
-start_cmd=systemctl start named.service
-stop_cmd=systemctl stop named.service
 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/named.pid
+pid_file=/run/named/named.pid
 whois_cmd=whois
 short_names=0
 updserial_def=0
@@ -28,12 +26,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
@@ -44,6 +40,15 @@ 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
+stop_cmd=systemctl stop named
+restart_cmd=systemctl reload named
+chroot=
+auto_chroot=
--- a/bind8/config-CentOS-Stream-Linux-8.0-ALL
+++ b/bind8/config-CentOS-Stream-Linux-8.0-ALL
@@ -0,0 +1,58 @@
+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
+stop_cmd=systemctl stop named
+restart_cmd=systemctl reload named
+chroot=
+auto_chroot=
--- a/bind8/config-Oracle-Linux-8.0-ALL
+++ b/bind8/config-Oracle-Linux-8.0-ALL
@@ -0,0 +1,58 @@
+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
+stop_cmd=systemctl stop named
+restart_cmd=systemctl reload named
+chroot=
+auto_chroot=
--- a/bind8/config-Redhat-Enterprise-Linux-6.0-7.0
+++ b/bind8/config-Redhat-Enterprise-Linux-6.0-7.0
@@ -42,7 +42,7 @@ keygen=dnssec-keygen
 signzone=dnssec-signzone
 checkconf=named-checkconf
 other_slaves=1
-restart_cmd=restart
+restart_cmd=service named restart
 keygen=dnssec-keygen
 tmpl_dnssec=0
 dnssec_period=21
--- a/bind8/config-Redhat-Enterprise-Linux-8.0-ALL
+++ b/bind8/config-Redhat-Enterprise-Linux-8.0-ALL
@@ -3,8 +3,6 @@ named_path=/usr/sbin/named
 named_conf=/etc/named.conf
 show_list=1
 records_order=0
-start_cmd=/etc/rc.d/init.d/named start
-stop_cmd=/etc/rc.d/init.d/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/named.pid
+pid_file=/run/named/named.pid
 whois_cmd=whois
 short_names=0
 updserial_def=0
@@ -28,12 +26,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
@@ -44,6 +40,15 @@ 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
+stop_cmd=systemctl stop named
+restart_cmd=systemctl reload named
+chroot=
+auto_chroot=
--- a/bind8/config-Rocky-Linux-6.0-ALL
+++ b/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,8 @@ dnssectools_rollmgr_pidfile=/var/run/rollmgr.pid
 force_random=0
 spf_record=0
 dnssec_info=1
+start_cmd=systemctl start named
+stop_cmd=systemctl stop named
+restart_cmd=systemctl reload named
+chroot=
+auto_chroot=
--- a/bind8/config-Scientific-Linux-6.0-ALL
+++ b/bind8/config-Scientific-Linux-6.0-ALL
@@ -43,7 +43,7 @@ keygen=dnssec-keygen
 signzone=dnssec-signzone
 checkconf=named-checkconf
 other_slaves=1
-restart_cmd=restart
+restart_cmd=service named restart
 force_random=0
 spf_record=0
 dnssec_info=1
--- a/bind8/config-debian-linux-10.0-ALL
+++ b/bind8/config-debian-linux-10.0-ALL
@@ -1,10 +1,8 @@
 soa_style=1
 named_path=/usr/sbin/named
-named_conf=/etc/named.conf
+named_conf=/etc/bind/named.conf
 show_list=1
 records_order=0
-start_cmd=/etc/rc.d/init.d/named start
-stop_cmd=/etc/rc.d/init.d/named stop
 max_zones=50
 rev_def=0
 support_aaaa=1
@@ -12,7 +10,6 @@ allow_comments=0
 allow_wild=1
 allow_long=0
 master_ttl=1
-pid_file=/var/run/named/named.pid
 whois_cmd=whois
 short_names=0
 updserial_def=0
@@ -30,9 +27,13 @@ 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/rndc.conf
+rndc_conf=/etc/bind/rndc.conf
 rndcconf_cmd=rndc-confgen
 largezones=0
 checkzone=named-checkzone
@@ -43,3 +44,7 @@ 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
--- a/bind8/config-debian-linux-3.1-9.0
+++ b/bind8/config-debian-linux-3.1-9.0
--- a/bind8/config-redhat-linux
+++ b/bind8/config-redhat-linux
@@ -1,44 +0,0 @@
-soa_style=1
-named_path=/usr/sbin/named
-named_conf=/etc/named.conf
-show_list=1
-records_order=0
-start_cmd=/etc/rc.d/init.d/named start
-stop_cmd=/etc/rc.d/init.d/named stop
-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
-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
-force_random=0
-spf_record=0
-dnssec_info=1
--- a/bind8/config-redhat-linux-7.0-ALL
+++ b/bind8/config-redhat-linux-7.0-ALL
@@ -3,8 +3,6 @@ named_path=/usr/sbin/named
 named_conf=/etc/named.conf
 show_list=1
 records_order=0
-start_cmd=/etc/rc.d/init.d/named start
-stop_cmd=/etc/rc.d/init.d/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/named.pid
+pid_file=/run/named/named.pid
 whois_cmd=whois
 short_names=0
 updserial_def=0
@@ -28,12 +26,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
-auto_chroot=sh -c '. /etc/sysconfig/named ; echo "$ROOTDIR"'
+slave_dir=/var/named/slaves
 no_pid_chroot=0
 soa_start=0
 rndc_conf=/etc/rndc.conf
@@ -44,6 +40,15 @@ 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
+stop_cmd=systemctl stop named
+restart_cmd=systemctl reload named
+chroot=
+auto_chroot=
--- a/bind8/config-redhat-linux-ALL-6.0
+++ b/bind8/config-redhat-linux-ALL-6.0
@@ -0,0 +1,58 @@
+soa_style=1
+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
+allow_comments=0
+allow_wild=1
+allow_long=0
+master_ttl=1
+pid_file=/var/run/named.pid /run/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
+restart_cmd=service named restart
+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
+chroot=
+auto_chroot=
--- a/bind8/config-windows
+++ b/bind8/config-windows
@@ -35,7 +35,7 @@ largezones=0
 auto_chroot=
 pid_file=c:/windows/system32/dns/etc/named.pid
 default_prins=
-restart_cmd=restart
+restart_cmd=sc restart named
 file_perms=
 extra_reverse=
 default_master=
--- a/bind8/list_slaves.cgi
+++ b/bind8/list_slaves.cgi
@@ -46,9 +46,10 @@ if (@servers) {
 	print &ui_columns_end();
 	print &ui_links_row(\@links);
 	print &ui_form_end([ [ "delete", $text{'slaves_delete'} ] ]);
+	print "<p>";
 	}
 else {
-	print "<b>$text{'slaves_none'}</b><p>\n";
+	print "<p>$text{'slaves_none'}</p>\n";
 	}

 # Get all Webmin servers and groups
@@ -108,7 +109,7 @@ if (@addservers || @groups) {
 	print &ui_form_end([ [ undef, $text{'slaves_ok'} ] ]);
 	}
 else {
-	print "<b>",&text('slaves_need', '../servers/'),"</b><p>\n";
+	print "<p>",&text('slaves_need', '../servers/'),"</p>\n";
 	}

 &ui_print_footer("", $text{'index_return'});
--- a/bind8/slave_add.cgi
+++ b/bind8/slave_add.cgi
@@ -88,18 +88,6 @@ foreach my $s (@add) {
 		next;
 		}

-	# Check for needed Webmin versions
-	my $rver = &remote_foreign_call($s, "bind8", "get_webmin_version");
-	if ($rver < 1.202) {
-		print &text('add_eversion', $s->{'host'}, 1.202),"<p>\n";
-		next;
-		}
-	if ($s->{'bind8_view'} && $s->{'bind8_view'} =~ /\s/ &&
-	    $rver < 1.422) {
-		print &text('add_eversion2', $s->{'host'}, 1.422),"<p>\n";
-		next;
-		}
-
 	# Check for non-IP name
 	if (&check_ipaddress($s->{'host'}) && $in{'name_def'}) {
 		print &text('add_eipaddr', $s->{'host'}),"<p>\n";
--- a/cfengine/list_hosts.cgi
+++ b/cfengine/list_hosts.cgi
@@ -16,7 +16,7 @@ foreach $h (@hosts) {
 	next if (!$s);
 	push(@titles, &server_name($s));
 	push(@links, "edit_host.cgi?id=$h->{'id'}");
-	push(@icons, "@{[&get_webprefix()]}/servers/images/$s->{'type'}.gif");
+	push(@icons, "@{[&get_webprefix()]}/servers/images/$s->{'type'}.svg");
 	$gothost{$h->{'id'}}++;
 	}
 if (@links) {
--- a/cluster-software/edit_pack.cgi
+++ b/cluster-software/edit_pack.cgi
@@ -84,7 +84,7 @@ print &ui_buttons_end();
 # Show hosts with the package
 print &ui_hr();
 print &ui_subheading($text{'edit_hosts'});
-@icons = map { "/servers/images/$_->{'type'}.gif" } @got;
+@icons = map { "/servers/images/$_->{'type'}.svg" } @got;
@links = map { "edit_host.cgi?id=$_->{'id'}" } @got;
@titles = map { ($_->{'desc'} ? $_->{'desc'} :
 		 $_->{'realhost'} ? "$_->{'realhost'}:$_->{'port'}" :
--- a/cluster-software/index.cgi
+++ b/cluster-software/index.cgi
@@ -30,7 +30,7 @@ foreach $h (@hosts) {
 				     "$s->{'host'}:$s->{'port'}")."<br>".
 		      &text('index_count', $count));
 	push(@links, "edit_host.cgi?id=$h->{'id'}");
-	push(@icons, "@{[&get_webprefix()]}/servers/images/$s->{'type'}.gif");
+	push(@icons, "@{[&get_webprefix()]}/servers/images/$s->{'type'}.svg");
 	push(@installed, $count);
 	$gothost{$h->{'id'}}++;
 	}
--- a/cluster-useradmin/edit_group.cgi
+++ b/cluster-useradmin/edit_group.cgi
@@ -94,8 +94,8 @@ foreach $h (@hosts) {
 	if ($og) {
 		local ($s) = grep { $_->{'id'} == $h->{'id'} } @servers;
 		push(@icons, &get_webprefix() ?
-			(&get_webprefix()."/servers/images/".$s->{'type'}.".gif") :
-			("../servers/images/".$s->{'type'}.".gif"));
+			(&get_webprefix()."/servers/images/".$s->{'type'}.".svg") :
+			("../servers/images/".$s->{'type'}.".svg"));
 		push(@links, "edit_host.cgi?id=$h->{'id'}");
 		push(@titles, $s->{'desc'} ? $s->{'desc'} : $s->{'host'});
 		}
--- a/cluster-useradmin/edit_user.cgi
+++ b/cluster-useradmin/edit_user.cgi
@@ -409,8 +409,8 @@ foreach $h (@hosts) {
 	if ($ou) {
 		local ($s) = grep { $_->{'id'} == $h->{'id'} } @servers;
 		push(@icons, &get_webprefix() ?
-			(&get_webprefix()."/servers/images/".$s->{'type'}.".gif") :
-			("../servers/images/".$s->{'type'}.".gif"));
+			(&get_webprefix()."/servers/images/".$s->{'type'}.".svg") :
+			("../servers/images/".$s->{'type'}.".svg"));
 		push(@links, "edit_host.cgi?id=$h->{'id'}");
 		push(@titles, $s->{'desc'} ? $s->{'desc'} : $s->{'host'});
 		}
--- a/cluster-useradmin/index.cgi
+++ b/cluster-useradmin/index.cgi
@@ -27,7 +27,7 @@ foreach $h (@hosts) {
 	push(@titles, &server_name($s));
 	push(@links, $link);
 	push(@icons, &get_webprefix()."/servers/images/".
-		     $s->{'type'}.".gif");
+		     $s->{'type'}.".svg");
 	push(@installed, @{$h->{'packages'}});
 	$gothost{$h->{'id'}}++;
 	}
--- a/cluster-usermin/edit_mod.cgi
+++ b/cluster-usermin/edit_mod.cgi
@@ -186,7 +186,7 @@ print "</tr></table>\n";
 # Show hosts with the module or theme
 print &ui_hr();
 print &ui_subheading($text{'edit_hosts'});
-@icons = map { "/servers/images/$_->{'type'}.gif" } @got;
+@icons = map { "/servers/images/$_->{'type'}.svg" } @got;
@links = map { "edit_host.cgi?id=$_->{'id'}" } @got;
@titles = map { &server_name($_).
 	        ($_->{'module'}->{'version'} ? " ($text{'host_version2'} $_->{'module'}->{'version'})" : "") } @got;
--- a/cluster-usermin/index.cgi
+++ b/cluster-usermin/index.cgi
@@ -25,7 +25,7 @@ foreach $h (@hosts) {
 	push(@titles, &server_name($s)."<br>".
 		      &text('index_version', $h->{'version'}));
 	push(@links, "edit_host.cgi?id=$h->{'id'}");
-	push(@icons, "@{[&get_webprefix()]}/servers/images/$s->{'type'}.gif");
+	push(@icons, "@{[&get_webprefix()]}/servers/images/$s->{'type'}.svg");
 	$gothost{$h->{'id'}}++;
 	}
 if (@links) {
--- a/cluster-webmin/edit_group.cgi
+++ b/cluster-webmin/edit_group.cgi
@@ -147,7 +147,7 @@ print "</tr></table>\n";
 # Show hosts with the group
 print &ui_hr();
 print &ui_subheading($text{'group_hosts'});
-@icons = map { "/servers/images/$_->{'type'}.gif" } @got;
+@icons = map { "/servers/images/$_->{'type'}.svg" } @got;
@links = map { "edit_host.cgi?id=$_->{'id'}" } @got;
@titles = map { &server_name($_) } @got;
 &icons_table(\@links, \@titles, \@icons);
--- a/cluster-webmin/edit_mod.cgi
+++ b/cluster-webmin/edit_mod.cgi
@@ -235,7 +235,7 @@ print "</tr></table>\n";
 # Show hosts with the module or theme
 print &ui_hr();
 print &ui_subheading($text{'edit_hosts'});
-@icons = map { "/servers/images/$_->{'type'}.gif" } @got;
+@icons = map { "/servers/images/$_->{'type'}.svg" } @got;
@links = map { "edit_host.cgi?id=$_->{'id'}" } @got;
@titles = map { &server_name($_).
 	        ($_->{'module'}->{'version'} ? " ($text{'host_version2'} $_->{'module'}->{'version'})" : "") } @got;
--- a/cluster-webmin/edit_user.cgi
+++ b/cluster-webmin/edit_user.cgi
@@ -211,7 +211,7 @@ print "</tr></table>\n";
 # Show hosts with the user
 print &ui_hr();
 print &ui_subheading($text{'user_hosts'});
-@icons = map { "/servers/images/$_->{'type'}.gif" } @got;
+@icons = map { "/servers/images/$_->{'type'}.svg" } @got;
@links = map { "edit_host.cgi?id=$_->{'id'}" } @got;
@titles = map { &server_name($_) } @got;
 &icons_table(\@links, \@titles, \@icons);
--- a/cluster-webmin/index.cgi
+++ b/cluster-webmin/index.cgi
@@ -27,7 +27,7 @@ foreach $h (@hosts) {
 	push(@titles, &server_name($s)."<br>".
 		      &text('index_version', $h->{'version'}));
 	push(@links, "edit_host.cgi?id=$h->{'id'}");
-	push(@icons, "@{[&get_webprefix()]}/servers/images/$s->{'type'}.gif");
+	push(@icons, "@{[&get_webprefix()]}/servers/images/$s->{'type'}.svg");
 	$gothost{$h->{'id'}}++;
 	}
 if (@links) {
--- a/config-lib.pl
+++ b/config-lib.pl
@@ -59,8 +59,8 @@ foreach $o (@lang_order_list) {

 # Call any config pre-load function
 if (&foreign_func_exists($module, 'config_pre_load')) {
-	&foreign_call($module, "config_pre_load", \%info, \@info_order)
-	&foreign_call($module, "config_pre_load", \%einfo)
+	&foreign_call($module, "config_pre_load", \%info, \@info_order);
+	&foreign_call($module, "config_pre_load", \%einfo);
 	}

@info_order = &unique(@info_order);
@@ -276,6 +276,15 @@ if ($section) {
 	@info_order = &config_in_section($section, \@info_order, \%info);
 	}

+# If config fields are conditional (not displayed)
+# make sure to preserve system default values to
+# prevent changing behaviour of a module
+if (&foreign_exists($module) &&
+    &foreign_require($module) &&
+    &foreign_func_exists($module, 'config_pre_load')) {
+	&foreign_call($module, "config_pre_load", \%info, \@info_order);
+	}
+
 # Actually parse the inputs
 foreach my $c (@info_order) {
 	next if ($canconfig && !$canconfig->{$c});
--- a/copyconfig.pl
+++ b/copyconfig.pl
@@ -113,30 +113,51 @@ foreach $m (@mods) {
 	}
 print join(" ", @newmods),"\n";

-# read_file(file, array)
-# Fill an associative array with name=value pairs from a file
+# read_file(file, &hash, [&order], [lowercase], [split-char])
+# Fill the given hash reference with name=value pairs from a file.
 sub read_file
 {
-local($arr);
-$arr = $_[1];
-open(ARFILE, "<".$_[0]) || return 0;
+my ($file, $hash, $order, $lowercase, $split) = @_;
+$split = "=" if (!defined($split));
+open(ARFILE, $file) || return 0;
+local $_;
 while(<ARFILE>) {
 	s/\r|\n//g;
-        if (!/^#/ && /^([^=]+)=(.*)$/) { $$arr{$1} = $2; }
+	my $cmt = index($_, "#");
+	my $eq = index($_, $split);
+	if ($cmt != 0 && $eq >= 0) {
+		my $n = substr($_, 0, $eq);
+		my $v = substr($_, $eq+1);
+		chomp($v);
+		$hash->{$lowercase ? lc($n) : $n} = $v;
+		push(@$order, $n) if ($order);
+        	}
        }
 close(ARFILE);
 return 1;
 }
- 
-# write_file(file, array)
-# Write out the contents of an associative array as name=value lines
+
+# write_file(file, &data-hash, [join-char])
+# Write out the contents of a hash as name=value lines.
 sub write_file
 {
-local($arr);
-$arr = $_[1];
-open(ARFILE, ">".$_[0]);
-foreach $k (keys %$arr) {
-        print ARFILE "$k=$$arr{$k}\n";
-        }
+my ($file, $data_hash, $join_char) = @_;
+my (%old, @order);
+my $join = defined($join_char) ? $join_char : "=";
+&read_file($file, \%old, \@order);
+open(ARFILE, ">$file") || die "open of $file failed : $!";
+my %done;
+foreach $k (@order) {
+	if (exists($data_hash->{$k}) && !$done{$k}++) {
+		(print ARFILE $k,$join,$data_hash->{$k},"\n") ||
+			die "write to $file failed : $!";
+		}
+	}
+foreach $k (keys %{$data_hash}) {
+	if (!exists($old{$k}) && !$done{$k}++) {
+		(print ARFILE $k,$join,$data_hash->{$k},"\n") ||
+			die "write to $file failed : $!";
+		}
+	}
 close(ARFILE);
 }
--- a/cron/exec_cron.cgi
+++ b/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+(.*)$/);
 	}
--- a/cron/lang/zh
+++ b/cron/lang/zh
@@ -1,18 +1,18 @@
-index_title=定时自动作业
+index_title=定时任务
 index_user=用户
 index_active=激活？
 index_command=命令
-index_none=此系统中没有自动作业存在
-index_none2=没有你可以访问的自动作业。
-index_create=创建新的定时自动作业
-index_allow=控制用户对自动作业的访问
-index_return=自动作业列表
+index_none=此系统中没有定时任务存在
+index_none2=没有你可以访问的定时任务。
+index_create=创建新的定时任务
+index_allow=控制用户对定时任务的访问
+index_return=定时任务列表

-edit_title=编辑自动作业
-create_title=创建自动作业
-edit_ecannot=您未被允许编辑此用户的自动作业
-edit_details=作业详细信息
-edit_user=以此身份执行自动作业
+edit_title=编辑
+create_title=创建
+edit_ecannot=您未被允许编辑此用户的定时任务
+edit_details=任务详细信息
+edit_user=以此身份执行
 edit_active=激活？
 edit_commands=命令
 edit_command=命令
@@ -26,59 +26,59 @@ edit_weekdays=周
 edit_all=全部
 edit_selected=已选择的…
 edit_run=立即执行
-edit_return=自动作业
+edit_return=定时任务
 edit_ctrl=注意：按Ctrl键并单击（或者在Mac系统中按Command键并单击）来选择分钟、小时、天和月或取消选择。
 edit_special1=按选择的时间表运行…
 edit_special0=按下面选择的时间运行…
 edit_special_hourly=每小时
-edit_special_daily=每天（在午夜）
-edit_special_weekly=每周（在星期日）
-edit_special_monthly=每月（在第一天）
-edit_special_yearly=每年（在1月1日）
-edit_special_reboot=当系统启动时
+edit_special_daily=每天（早0点）
+edit_special_weekly=每周末（星期日）
+edit_special_monthly=每月初（1日）
+edit_special_yearly=每年初（1月1日）
+edit_special_reboot=系统启动时

-save_err=保存自动作业失败
+save_err=保存定时任务失败
 save_ecmd=您没有输入要执行的命令
 save_euser=您必须选择一个用户
 save_euser2=用户 '$1' 不存在
-save_eallow=用户 '$1' 未被允许访问自动作业
-save_ecannot=您未被允许为 '$1' 创建或编辑自动作业
+save_eallow=用户 '$1' 未被允许访问定时任务
+save_ecannot=您未被允许为 '$1' 创建或编辑定时任务
 save_enone=您没有选择任何要执行的 $1

-allow_title=控制自动作业访问权限
-allow_desc=此表单允许您控制哪些用户可以创建和运行自动作业。
-allow_ecannot=您不能控制用户对自动作业的访问权限
+allow_title=控制定时任务访问权限
+allow_desc=此表单允许您控制哪些用户可以创建和运行定时任务。
+allow_ecannot=您不能控制用户对定时任务的访问权限
 allow_all1=拒绝全部用户
 allow_all2=拒绝除 root 外的所有用户
 allow_all3=允许所有用户
-allow_allow=只允许列出的用户
-allow_deny=只拒绝列出的用户
+allow_allow=只允许列出的用户 （白名单）
+allow_deny=只拒绝列出的用户 （黑名单）

 env_name=变量名称
 env_value=值
 env_ename='$1' 不是有效的变量名称

-exec_title=执行自动作业
-exec_ecannot=你未被允许为此用户执行自动作业
+exec_title=执行定时任务
+exec_ecannot=你未被允许为此用户执行定时任务
 exec_cmd=命令 $1 的输出结果…
 exec_none=没有输出结果产生

-acl_users=可以为下列用户编辑自动作业
+acl_users=可以为下列用户编辑定时任务
 acl_all=全部用户
 acl_this=当前Webmin用户
 acl_only=仅限于这些用户
 acl_except=除这些用户之外的全部用户
-acl_control=可以控制用户对自动作业的访问？
+acl_control=可以控制用户对定时任务的访问？
 acl_uid=UID在此范围内的用户
 acl_gid=此主要组下的用户

-log_modify=已修改 $1 的自动作业
-log_modify_l=已修改 $1 的自动作业“$2”
-log_create=已创建 $1 的自动作业
-log_create_l=已创建 $1 的自动作业“$2”
-log_delete=已删除 $1 的自动作业
-log_exec=已以 $1 身份执行自动作业
-log_exec_l=以 $1 身份执行自动作业“$2”
-log_allow=已改变用户对自动作业的访问权限
+log_modify=已修改 $1 的定时任务
+log_modify_l=已修改 $1 的定时任务“$2”
+log_create=已创建 $1 的定时任务
+log_create_l=已创建 $1 的定时任务“$2”
+log_delete=已删除 $1 的定时任务
+log_exec=已以 $1 身份执行定时任务
+log_exec_l=以 $1 身份执行定时任务“$2”
+log_allow=已改变用户对定时任务的访问权限

-ecopy=在新的自动作业配置中发现错误：$1 $2
+ecopy=在新的定时任务配置中发现错误：$1 $2
--- a/cron/module.info.zh
+++ b/cron/module.info.zh
@@ -1 +1 @@
-desc_zh=定时自动作业 (Cron)
+desc_zh=定时任务 (Cron)
--- a/dhcpd/config-CentOS-Stream-Linux-8.0-ALL
+++ b/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
--- a/dhcpd/config-Oracle-Linux-8.0-ALL
+++ b/dhcpd/config-Oracle-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
--- a/dovecot/config-CentOS-Stream-Linux-8.0-ALL
+++ b/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
--- a/dovecot/config-Oracle-Linux-8.0-ALL
+++ b/dovecot/config-Oracle-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
--- a/dovecot/config-redhat-linux-24.0-ALL
+++ b/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
--- a/exports/config-CentOS-Stream-Linux-8.0-ALL
+++ b/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
--- a/exports/config-Oracle-Linux-8.0-ALL
+++ b/exports/config-Oracle-Linux-8.0-ALL
@@ -0,0 +1,3 @@
+restart_command=service nfs restart
+exports_file=/etc/exports
+apply_cmd=exportfs -r
--- a/fail2ban/fail2ban-lib.pl
+++ b/fail2ban/fail2ban-lib.pl
@@ -502,7 +502,14 @@ else {
 # Force the fail2ban server to re-read its config
 sub restart_fail2ban_server
 {
-my $out = &backquote_logged("$config{'client_cmd'} reload 2>&1 </dev/null");
+my ($force_restart) = @_;
+my $out;
+$out = &backquote_logged("$config{'client_cmd'} reload 2>&1 </dev/null")
+	if (!$force_restart);
+if ($? || $force_restart) {
+	&stop_fail2ban_server();
+	$out = &start_fail2ban_server();
+}
 return $? ? $out : undef;
 }

@@ -511,8 +518,8 @@ return $? ? $out : undef;
 sub list_all_config_files
 {
 my @rv;
-push(@rv, "$config{'config_dir'}/fail2ban.conf");
 push(@rv, "$config{'config_dir'}/fail2ban.local");
+push(@rv, "$config{'config_dir'}/fail2ban.conf");
 push(@rv, glob("$config{'config_dir'}/filter.d/*.conf"));
 push(@rv, glob("$config{'config_dir'}/filter.d/*.local"));
 push(@rv, glob("$config{'config_dir'}/action.d/*.conf"));
@@ -521,7 +528,7 @@ push(@rv, "$config{'config_dir'}/jail.conf");
 push(@rv, "$config{'config_dir'}/jail.local");
 push(@rv, glob("$config{'config_dir'}/jail.d/*.conf"));
 push(@rv, glob("$config{'config_dir'}/jail.d/*.local"));
-return grep { -r $_ } @rv;
+return grep { -r $_ || $_ =~ /fail2ban\.local$/ } @rv;
 }

 sub lock_all_config_files
--- a/fdisk/edit_disk.cgi
+++ b/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'});

--- a/Show More
+++ b/Show More