From 8fbfc5f432db7e4f92fac6931944ce80cb57c5b3 Mon Sep 17 00:00:00 2001 From: Ilia <4426533+iliajie@users.noreply.github.com> Date: Sat, 11 Feb 2023 01:03:13 +0300 Subject: [PATCH 1/7] Update README.md --- README.md | 50 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 4eb33b18a..4337e80c1 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,43 @@ -## Contents +  +

+ + Webmin + + + Webmin + +

+  + +

+ Documentation   |   + FAQ   |   + Security   |   + Screenshots   |   + Forum +

+ Downloads + Latest release + Stars + Members + Contributors + Issues + License +

+  + +--- +  + * [Changelog](https://github.com/webmin/webmin/blob/master/CHANGELOG.md) * [About](#about) -* [Installation](#installation)[](https://webmin.com/download.html)[](https://webmin.com/devel.html) -* [Documentation](#documentation) +* [Installation](#installation) * [Development](#development) * [License](#license) -* [中文版](https://github.com/webmin/webmin/blob/master/README-zh.md) - ## About -**Webmin** is a web-based system administration tool for Unix-like servers, and services with over _1,000,000_ installations worldwide. Using it, it is possible to configure operating system internals, such as users, disk quotas, services or configuration files, as well as modify, and control open-source apps, such as BIND DNS Server, Apache HTTP Server, PHP, MySQL, and [many more](https://doxfer.webmin.com/Webmin/Introduction). +**Webmin** is a web-based system administration tool for Unix-like servers, and services with about _1,000,000_ yearly installations worldwide. Using it, it is possible to configure operating system internals, such as users, disk quotas, services or configuration files, as well as modify, and control open-source apps, such as BIND DNS Server, Apache HTTP Server, PHP, MySQL, and many more. [![Quick UI overview 2021](https://user-images.githubusercontent.com/4426533/114315375-61a1c480-9b07-11eb-9aaf-4aa949a39ab7.png)](https://www.youtube.com/watch?v=daYG6O4AsEw) @@ -26,16 +53,7 @@ Webmin includes _116_ [standard modules](https://doxfer.webmin.com/Webmin/Webmin 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](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); - Note: It is highly recommended to [add repository](https://doxfer.webmin.com/Webmin/Installation) to your system for having automatic updates. - - 2. By downloading, extracting [source file](https://prdownloads.sourceforge.net/webadmin/webmin-2.013.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. - 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. - -## 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). +For detailed installation instructions check our guide on [webmin.com/download](https://webmin.com/download) page. ## Development From 31c63b3e2a836b56b580bbbbf751a8a491c0d54e Mon Sep 17 00:00:00 2001 From: iliajie Date: Sat, 11 Feb 2023 14:09:17 +0200 Subject: [PATCH 2/7] Fix to test if locale is supported --- web-lib-funcs.pl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/web-lib-funcs.pl b/web-lib-funcs.pl index d69060d30..2abd91024 100755 --- a/web-lib-funcs.pl +++ b/web-lib-funcs.pl @@ -12913,7 +12913,9 @@ eval { if (!$@ && $locale_system) { $locale_system =~ s/\..*//; $locale_system =~ s/_/-/; - return $locale_system; + my $locales = &list_locales(); + return $locale_system + if ($locales->{$locale_system}); } return $locale_def; } From 26d0638df5626d2725bacdd4e387c4ff4c42e863 Mon Sep 17 00:00:00 2001 From: Ilia <4426533+iliajie@users.noreply.github.com> Date: Sat, 11 Feb 2023 17:44:34 +0300 Subject: [PATCH 3/7] Update README.md to smaller the headers as possible --- README.md | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 4337e80c1..0eceb75d6 100644 --- a/README.md +++ b/README.md @@ -1,32 +1,11 @@   -

- - Webmin - - - Webmin - -

+

Webmin

  - -

- Documentation   |   - FAQ   |   - Security   |   - Screenshots   |   - Forum -

- Downloads - Latest release - Stars - Members - Contributors - Issues - License -

+

Documentation   |   FAQ   |   Security   |   Screenshots   |   Forum

Downloads Latest release Stars Members Contributors Issues License

  --- +   * [Changelog](https://github.com/webmin/webmin/blob/master/CHANGELOG.md) From c929fd9adec1a2189d65d514a49244c445c93b10 Mon Sep 17 00:00:00 2001 From: Ilia <4426533+iliajie@users.noreply.github.com> Date: Sat, 11 Feb 2023 17:50:57 +0300 Subject: [PATCH 4/7] Update README.md with palette dependent screenshot --- README.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0eceb75d6..ebca71402 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,14 @@ **Webmin** is a web-based system administration tool for Unix-like servers, and services with about _1,000,000_ yearly installations worldwide. Using it, it is possible to configure operating system internals, such as users, disk quotas, services or configuration files, as well as modify, and control open-source apps, such as BIND DNS Server, Apache HTTP Server, PHP, MySQL, and many more. -[![Quick UI overview 2021](https://user-images.githubusercontent.com/4426533/114315375-61a1c480-9b07-11eb-9aaf-4aa949a39ab7.png)](https://www.youtube.com/watch?v=daYG6O4AsEw) +

+ + Dashboard screenshot + + + Dashboard screenshot + +

Usability can be expanded by installing modules, which can be custom made. Aside from this, there are two other major projects that extend its functionality: From 23731b17ea2b941235edb9f340eaf5aae831af30 Mon Sep 17 00:00:00 2001 From: Ilia <4426533+iliajie@users.noreply.github.com> Date: Sat, 11 Feb 2023 17:54:36 +0300 Subject: [PATCH 5/7] Update README.md with better screenshot for dark palette --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ebca71402..c77b0687f 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Dashboard screenshot - Dashboard screenshot + Dashboard screenshot

From 660b94ceb52d8768f2170a6b473a818e21cba2b6 Mon Sep 17 00:00:00 2001 From: iliajie Date: Sat, 11 Feb 2023 20:18:37 +0200 Subject: [PATCH 6/7] Fix to drop useless test --- setup-repos.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/setup-repos.sh b/setup-repos.sh index 7d81373b4..fccf572d2 100755 --- a/setup-repos.sh +++ b/setup-repos.sh @@ -169,12 +169,8 @@ deb) esac # Could not setup -if [ "$?" != "0" ]; then - echo "${RED}Error:${NORMAL} Could not setup repositories!" -else - if [ ! -x "/usr/bin/webmin" ]; then - echo "Webmin package can now be installed using ${GREEN}${BOLD}${ITALIC}$install_cmd webmin${NORMAL} command." - fi +if [ ! -x "/usr/bin/webmin" ]; then + echo "Webmin package can now be installed using ${GREEN}${BOLD}${ITALIC}$install_cmd webmin${NORMAL} command." fi exit 0 From 7c1c3b22fb439db8617c435ffcea8da325dab704 Mon Sep 17 00:00:00 2001 From: iliajie Date: Sat, 11 Feb 2023 20:39:04 +0200 Subject: [PATCH 7/7] Fix to properly detect derivatives when setting up repos #1834 --- setup-repos.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/setup-repos.sh b/setup-repos.sh index fccf572d2..bbf0f905b 100755 --- a/setup-repos.sh +++ b/setup-repos.sh @@ -50,16 +50,19 @@ if [ -z "$osid" ]; then echo "${RED}Error:${NORMAL} Failed to detect OS!" exit 1 fi -osid=$(echo "$osid" | sed 's/\s.*$//') + +# Derivatives precise test +osid_debian_like=$(echo "$osid" | grep debian) +osid_rhel_like=$(echo "$osid" | grep rhel) # Setup OS dependent -if [ "$osid" = "debian" ]; then +if [ -n "$osid_debian_like" ]; then package_type=deb install_cmd="apt-get install" install="$install_cmd --quiet --assume-yes" clean="apt-get clean" update="apt-get update" -elif [ "$osid" = "rhel" ]; then +elif [ -n "$osid_rhel_like" ]; then package_type=rpm if command -pv dnf 1>/dev/null 2>&1; then install_cmd="dnf install" @@ -70,6 +73,9 @@ elif [ "$osid" = "rhel" ]; then install="$install_cmd -y" clean="yum clean all" fi +else + echo "${RED}Error:${NORMAL} Unknown OS : $osid" + exit fi # Ask first @@ -100,7 +106,7 @@ fi # Check if GPG command is installed -if [ "$osid" = "debian" ]; then +if [ -n "$osid_debian_like" ]; then if [ ! -x /usr/bin/gpg ]; then $update 1>/dev/null 2>&1 $install gnupg 1>/dev/null 2>&1