From 4618bc1122e8989911ddaf94e7e653cbaad06f2c Mon Sep 17 00:00:00 2001 From: Ilia Rostovtsev Date: Tue, 11 May 2021 17:54:13 +0300 Subject: [PATCH 1/9] Use universal MySQL/MariaDB config file location --- mysql/config-Ubuntu-Linux-18.04-ALL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql/config-Ubuntu-Linux-18.04-ALL b/mysql/config-Ubuntu-Linux-18.04-ALL index 3bb4a9497..825a3035f 100644 --- a/mysql/config-Ubuntu-Linux-18.04-ALL +++ b/mysql/config-Ubuntu-Linux-18.04-ALL @@ -16,7 +16,7 @@ date_subs=0 passwd_mode=0 mysql_data=/var/lib/mysql max_dbs=50 -my_cnf=/etc/mysql/mysql.cnf +my_cnf=/etc/mysql/my.cnf max_text=1000 nopwd=0 webmin_subs=0 From 097ab1a16b6367885c4ebc18e3cc60c5c20ddda7 Mon Sep 17 00:00:00 2001 From: Ilia Rostovtsev Date: Tue, 11 May 2021 18:07:25 +0300 Subject: [PATCH 2/9] Fix default view for databases set as table --- mysql/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql/config b/mysql/config index e5b6fb381..6d81b8690 100644 --- a/mysql/config +++ b/mysql/config @@ -8,7 +8,7 @@ mysqlshow=/usr/local/mysql/bin/mysqlshow login=root mysql_libs=/usr/local/mysql/lib mysqladmin=/usr/local/mysql/bin/mysqladmin -style=0 +style=1 add_mode=1 nodbi=0 access=*: * From 90708a102f8b4eea536a80518ee6bfa837ef8f5b Mon Sep 17 00:00:00 2001 From: Ilia Rostovtsev Date: Wed, 12 May 2021 02:14:07 +0300 Subject: [PATCH 3/9] Alma -> AlmaLinux --- .../{config-Alma-Linux-7.0-ALL => config-AlmaLinux-Linux-7.0-ALL} | 0 .../{config-Alma-Linux-6.0-ALL => config-AlmaLinux-Linux-6.0-ALL} | 0 .../{config-Alma-Linux-7.0-ALL => config-AlmaLinux-Linux-7.0-ALL} | 0 .../{config-Alma-Linux-7.0-ALL => config-AlmaLinux-Linux-7.0-ALL} | 0 .../{config-Alma-Linux-7.0-ALL => config-AlmaLinux-Linux-7.0-ALL} | 0 .../{config-Alma-Linux-7.0-ALL => config-AlmaLinux-Linux-7.0-ALL} | 0 .../{config-Alma-Linux-6.0-ALL => config-AlmaLinux-Linux-6.0-ALL} | 0 .../{config-Alma-Linux-7.0-ALL => config-AlmaLinux-Linux-7.0-ALL} | 0 .../{config-Alma-Linux-7.0-ALL => config-AlmaLinux-Linux-7.0-ALL} | 0 .../{config-Alma-Linux-7.0-ALL => config-AlmaLinux-Linux-7.0-ALL} | 0 .../{config-Alma-Linux-7.0-ALL => config-AlmaLinux-Linux-7.0-ALL} | 0 .../{config-Alma-Linux-7.0-ALL => config-AlmaLinux-Linux-7.0-ALL} | 0 .../{config-Alma-Linux-7.0-ALL => config-AlmaLinux-Linux-7.0-ALL} | 0 .../{config-Alma-Linux-7.0-ALL => config-AlmaLinux-Linux-7.0-ALL} | 0 .../{config-Alma-Linux-7.0-ALL => config-AlmaLinux-Linux-7.0-ALL} | 0 .../{config-Alma-Linux-7.0-ALL => config-AlmaLinux-Linux-7.0-ALL} | 0 .../{config-Alma-Linux-6.0-ALL => config-AlmaLinux-Linux-6.0-ALL} | 0 .../{config-Alma-Linux-7.0-ALL => config-AlmaLinux-Linux-7.0-ALL} | 0 18 files changed, 0 insertions(+), 0 deletions(-) rename apache/{config-Alma-Linux-7.0-ALL => config-AlmaLinux-Linux-7.0-ALL} (100%) rename bind8/{config-Alma-Linux-6.0-ALL => config-AlmaLinux-Linux-6.0-ALL} (100%) rename dhcpd/{config-Alma-Linux-7.0-ALL => config-AlmaLinux-Linux-7.0-ALL} (100%) rename exports/{config-Alma-Linux-7.0-ALL => config-AlmaLinux-Linux-7.0-ALL} (100%) rename ipsec/{config-Alma-Linux-7.0-ALL => config-AlmaLinux-Linux-7.0-ALL} (100%) rename iscsi-tgtd/{config-Alma-Linux-7.0-ALL => config-AlmaLinux-Linux-7.0-ALL} (100%) rename ldap-client/{config-Alma-Linux-6.0-ALL => config-AlmaLinux-Linux-6.0-ALL} (100%) rename ldap-server/{config-Alma-Linux-7.0-ALL => config-AlmaLinux-Linux-7.0-ALL} (100%) rename lpadmin/{config-Alma-Linux-7.0-ALL => config-AlmaLinux-Linux-7.0-ALL} (100%) rename mysql/{config-Alma-Linux-7.0-ALL => config-AlmaLinux-Linux-7.0-ALL} (100%) rename postgresql/{config-Alma-Linux-7.0-ALL => config-AlmaLinux-Linux-7.0-ALL} (100%) rename proftpd/{config-Alma-Linux-7.0-ALL => config-AlmaLinux-Linux-7.0-ALL} (100%) rename samba/{config-Alma-Linux-7.0-ALL => config-AlmaLinux-Linux-7.0-ALL} (100%) rename sendmail/{config-Alma-Linux-7.0-ALL => config-AlmaLinux-Linux-7.0-ALL} (100%) rename squid/{config-Alma-Linux-7.0-ALL => config-AlmaLinux-Linux-7.0-ALL} (100%) rename syslog-ng/{config-Alma-Linux-7.0-ALL => config-AlmaLinux-Linux-7.0-ALL} (100%) rename syslog/{config-Alma-Linux-6.0-ALL => config-AlmaLinux-Linux-6.0-ALL} (100%) rename xinetd/{config-Alma-Linux-7.0-ALL => config-AlmaLinux-Linux-7.0-ALL} (100%) diff --git a/apache/config-Alma-Linux-7.0-ALL b/apache/config-AlmaLinux-Linux-7.0-ALL similarity index 100% rename from apache/config-Alma-Linux-7.0-ALL rename to apache/config-AlmaLinux-Linux-7.0-ALL diff --git a/bind8/config-Alma-Linux-6.0-ALL b/bind8/config-AlmaLinux-Linux-6.0-ALL similarity index 100% rename from bind8/config-Alma-Linux-6.0-ALL rename to bind8/config-AlmaLinux-Linux-6.0-ALL diff --git a/dhcpd/config-Alma-Linux-7.0-ALL b/dhcpd/config-AlmaLinux-Linux-7.0-ALL similarity index 100% rename from dhcpd/config-Alma-Linux-7.0-ALL rename to dhcpd/config-AlmaLinux-Linux-7.0-ALL diff --git a/exports/config-Alma-Linux-7.0-ALL b/exports/config-AlmaLinux-Linux-7.0-ALL similarity index 100% rename from exports/config-Alma-Linux-7.0-ALL rename to exports/config-AlmaLinux-Linux-7.0-ALL diff --git a/ipsec/config-Alma-Linux-7.0-ALL b/ipsec/config-AlmaLinux-Linux-7.0-ALL similarity index 100% rename from ipsec/config-Alma-Linux-7.0-ALL rename to ipsec/config-AlmaLinux-Linux-7.0-ALL diff --git a/iscsi-tgtd/config-Alma-Linux-7.0-ALL b/iscsi-tgtd/config-AlmaLinux-Linux-7.0-ALL similarity index 100% rename from iscsi-tgtd/config-Alma-Linux-7.0-ALL rename to iscsi-tgtd/config-AlmaLinux-Linux-7.0-ALL diff --git a/ldap-client/config-Alma-Linux-6.0-ALL b/ldap-client/config-AlmaLinux-Linux-6.0-ALL similarity index 100% rename from ldap-client/config-Alma-Linux-6.0-ALL rename to ldap-client/config-AlmaLinux-Linux-6.0-ALL diff --git a/ldap-server/config-Alma-Linux-7.0-ALL b/ldap-server/config-AlmaLinux-Linux-7.0-ALL similarity index 100% rename from ldap-server/config-Alma-Linux-7.0-ALL rename to ldap-server/config-AlmaLinux-Linux-7.0-ALL diff --git a/lpadmin/config-Alma-Linux-7.0-ALL b/lpadmin/config-AlmaLinux-Linux-7.0-ALL similarity index 100% rename from lpadmin/config-Alma-Linux-7.0-ALL rename to lpadmin/config-AlmaLinux-Linux-7.0-ALL diff --git a/mysql/config-Alma-Linux-7.0-ALL b/mysql/config-AlmaLinux-Linux-7.0-ALL similarity index 100% rename from mysql/config-Alma-Linux-7.0-ALL rename to mysql/config-AlmaLinux-Linux-7.0-ALL diff --git a/postgresql/config-Alma-Linux-7.0-ALL b/postgresql/config-AlmaLinux-Linux-7.0-ALL similarity index 100% rename from postgresql/config-Alma-Linux-7.0-ALL rename to postgresql/config-AlmaLinux-Linux-7.0-ALL diff --git a/proftpd/config-Alma-Linux-7.0-ALL b/proftpd/config-AlmaLinux-Linux-7.0-ALL similarity index 100% rename from proftpd/config-Alma-Linux-7.0-ALL rename to proftpd/config-AlmaLinux-Linux-7.0-ALL diff --git a/samba/config-Alma-Linux-7.0-ALL b/samba/config-AlmaLinux-Linux-7.0-ALL similarity index 100% rename from samba/config-Alma-Linux-7.0-ALL rename to samba/config-AlmaLinux-Linux-7.0-ALL diff --git a/sendmail/config-Alma-Linux-7.0-ALL b/sendmail/config-AlmaLinux-Linux-7.0-ALL similarity index 100% rename from sendmail/config-Alma-Linux-7.0-ALL rename to sendmail/config-AlmaLinux-Linux-7.0-ALL diff --git a/squid/config-Alma-Linux-7.0-ALL b/squid/config-AlmaLinux-Linux-7.0-ALL similarity index 100% rename from squid/config-Alma-Linux-7.0-ALL rename to squid/config-AlmaLinux-Linux-7.0-ALL diff --git a/syslog-ng/config-Alma-Linux-7.0-ALL b/syslog-ng/config-AlmaLinux-Linux-7.0-ALL similarity index 100% rename from syslog-ng/config-Alma-Linux-7.0-ALL rename to syslog-ng/config-AlmaLinux-Linux-7.0-ALL diff --git a/syslog/config-Alma-Linux-6.0-ALL b/syslog/config-AlmaLinux-Linux-6.0-ALL similarity index 100% rename from syslog/config-Alma-Linux-6.0-ALL rename to syslog/config-AlmaLinux-Linux-6.0-ALL diff --git a/xinetd/config-Alma-Linux-7.0-ALL b/xinetd/config-AlmaLinux-Linux-7.0-ALL similarity index 100% rename from xinetd/config-Alma-Linux-7.0-ALL rename to xinetd/config-AlmaLinux-Linux-7.0-ALL From 459e4f9ef1acb9d91e07212791f870540b4d1515 Mon Sep 17 00:00:00 2001 From: Adam W <35391288+A-damW@users.noreply.github.com> Date: Fri, 14 May 2021 14:00:01 -0700 Subject: [PATCH 4/9] Update twofactor.html --- webmin/help/twofactor.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webmin/help/twofactor.html b/webmin/help/twofactor.html index 8058942ca..f5214a15f 100644 --- a/webmin/help/twofactor.html +++ b/webmin/help/twofactor.html @@ -17,7 +17,7 @@ in the Webmin Users module. The available two-factor providers are : website and link it to their smartphone.

Google Authenticator -
This is a smartphone app that implements the standard TOPT protocol. Each +
This is a smartphone app that implements the standard TOTP protocol. Each user must scan a QR code using the app to link their tokens with the Webmin server.

From 2ea7d3083d3ce61de0836719cae51eb1aad6bfe4 Mon Sep 17 00:00:00 2001 From: Adam W <35391288+A-damW@users.noreply.github.com> Date: Fri, 14 May 2021 14:00:40 -0700 Subject: [PATCH 5/9] Update twofactor.ca.html --- webmin/help/twofactor.ca.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webmin/help/twofactor.ca.html b/webmin/help/twofactor.ca.html index 9bc50d163..dfc90a730 100644 --- a/webmin/help/twofactor.ca.html +++ b/webmin/help/twofactor.ca.html @@ -17,7 +17,7 @@ factors al mòdul d'Usuaris de Webmin. Els proveïdors disponibles són: un compte al lloc web d'Authy i enllaçar-lo al seu smartphone.

Google Authenticator -
Aquesta és una aplicació que implementa el protocol estàndard TOPT. +
Aquesta és una aplicació que implementa el protocol estàndard TOTP. Cada usuari ha d'escanejar un codi QR utilitzant l'aplicació per enllaçar els seus testimonis amb el servidor Webmin.

From 7b70397092bf18e82ce9642e93d098a6c3e2f8c0 Mon Sep 17 00:00:00 2001 From: Adam W <35391288+A-damW@users.noreply.github.com> Date: Fri, 14 May 2021 14:00:53 -0700 Subject: [PATCH 6/9] Update twofactor.fr.html --- webmin/help/twofactor.fr.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webmin/help/twofactor.fr.html b/webmin/help/twofactor.fr.html index b6321b0b6..1cca44f1b 100644 --- a/webmin/help/twofactor.fr.html +++ b/webmin/help/twofactor.fr.html @@ -11,6 +11,6 @@ Les fournisseurs à deux facteurs disponibles sont:
Chaque utilisateur doit créer un compte sur le site Web d'Authy et le lier à son smartphone.


Google Authenticator -
Il s'agit d'une application pour smartphone qui implémente le protocole TOPT standard.
+
Il s'agit d'une application pour smartphone qui implémente le protocole TOTP standard.
Chaque utilisateur doit scanner un code QR à l'aide de l'application pour lier ses jetons au serveur Webmin.
From 2623d301b07ab8ea653924717ace5a8ae91a86e3 Mon Sep 17 00:00:00 2001 From: Adam W <35391288+A-damW@users.noreply.github.com> Date: Fri, 14 May 2021 14:01:06 -0700 Subject: [PATCH 7/9] Update twofactor.ms.html --- webmin/help/twofactor.ms.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webmin/help/twofactor.ms.html b/webmin/help/twofactor.ms.html index aa16b2198..fb3909aaa 100644 --- a/webmin/help/twofactor.ms.html +++ b/webmin/help/twofactor.ms.html @@ -16,9 +16,9 @@ dalam modul Webmin Pengguna. Pembekal dua-faktor yang sedia ada ialah:      untuk menguruskan pengguna dua-faktor. Setiap pengguna perlu mewujudkan akaun pada laman web Authy dan menghubungkan kepada telefon pintar mereka.

Pengesah Google
-
Ini adalah satu aplikasi telefon pintar yang melaksanakan protokol TOPT standard. setiap +
Ini adalah satu aplikasi telefon pintar yang melaksanakan protokol TOTP standard. setiap      pengguna perlu mengimbas kod QR dengan menggunakan aplikasi bagi menghubungkan token mereka dengan Pelayan Webmin.

-