From 23c1c31a6894228ee8c0ad2d61a4911c75df6ac1 Mon Sep 17 00:00:00 2001 From: Thom Date: Sun, 25 Apr 2021 17:08:12 +0000 Subject: [PATCH 1/5] Update README.md, CONTRIBUTING.md files --- CONTRIBUTING.md | 1 + README.md | 23 +++++++++++++---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 27377de6e6..092b8969f7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -9,6 +9,7 @@ This document is under development and will be continuously improved. * If you want to report several bugs or request several features, open a separate issue for each one of them. # Branches +* If this you are a new user, please send an email to: dev [at] ispconfig [dot] org to receive rights to fork the project. * Please create an issue for each contribution you want to make. * Do not put multiple contributions into a single branch and merge request. Each contribution should have it's own branch. * Do not use the develop branch in your forked project for your contribution. Create a separate branch for each issue. diff --git a/README.md b/README.md index 544c36e7d6..6929b573d1 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,13 @@ # ISPConfig - Hosting Control Panel -![alt text](https://www.ispconfig.org/wp-content/themes/ispconfig/images/ispconfig_logo.png "") \ +![ISPConfig logo](https://www.ispconfig.org/wp-content/themes/ispconfig/images/ispconfig_logo.png "") \ Development branch: [![pipeline status](https://git.ispconfig.org/ispconfig/ispconfig3/badges/develop/pipeline.svg)](https://git.ispconfig.org/ispconfig/ispconfig3/commits/develop) ## Functions - Manage multiple servers from one control panel - Single server, multiserver and mirrored clusters. -- Webserver management (Apache2 and nginx) +- Webserver management - Mailserver management -- DNS server management (BIND and PowerDNS) +- DNS server management - Virtualization (OpenVZ) - Administrator, reseller, client and mailuser login - Open Source software (BSD license) @@ -18,10 +18,12 @@ Development branch: [![pipeline status](https://git.ispconfig.org/ispconfig/ispc - Let's Encrypt: Acme.sh and certbot - SMTP: Postfix - POP3/IMAP: Dovecot -- Spamfilter: Rspamd and Amavis +- Spamfilter: Rspamd and Amavis[^1] - FTP: PureFTPD -- DNS: BIND9 and PowerDNS -- Database: MariaDB and MySQL +- DNS: BIND9 and PowerDNS[^1] +- Database: MariaDB and MySQL[^1] + +[^1]: not actively tested ## Supported operating systems - Debian 9, 10, and testing @@ -29,15 +31,16 @@ Development branch: [![pipeline status](https://git.ispconfig.org/ispconfig/ispc - CentOS 7 and 8 ## Auto-install script -You can install ISPConfig with our official autoinstaller: https://git.ispconfig.org/ispconfig/ispconfig-autoinstaller/-/blob/master/README.md +You can install the "Perfect Server" with ISPConfig using [our official autoinstaller](https://www.howtoforge.com/ispconfig-autoinstall-debian-ubuntu/) ## Migration tool -The Migration Tool helps you to import data from other control panels (currently ISPConfig 2 and 3 – 3.2, Plesk 10 – 12.5, Plesk Onyx, CPanel** and Confixx 3). For more information, see https://www.ispconfig.org/add-ons/ispconfig-migration-tool/ +The Migration Tool helps you to import data from other control panels (currently ISPConfig 2 and 3 – 3.2, Plesk 10 – 12.5, Plesk Onyx, CPanel[^2] and Confixx 3). For more information, see https://www.ispconfig.org/add-ons/ispconfig-migration-tool/ -** The Migration Toolkit contains now beta support for migrating CPanel to ISPConfig. +[^2]: The Migration Toolkit now contains beta support for migrating CPanel to ISPConfig. ## Documentation You can support ISPConfig development by buying the manual: https://www.ispconfig.org/documentation/ ## Contributing -If you like to contribute to the ISPConfig development, please send an email to: dev [at] ispconfig [dot] org. +If you like to contribute to the ISPConfig development, please read the contributing guidelines: [CONTRIBUTING.MD](CONTRIBUTING.md) + -- GitLab From 289322aa5a1dbc14543d4b8c682b3609cd46ea9a Mon Sep 17 00:00:00 2001 From: Thom Date: Sun, 25 Apr 2021 17:18:45 +0000 Subject: [PATCH 2/5] Fix typo --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 092b8969f7..3a4a7de71f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -9,7 +9,7 @@ This document is under development and will be continuously improved. * If you want to report several bugs or request several features, open a separate issue for each one of them. # Branches -* If this you are a new user, please send an email to: dev [at] ispconfig [dot] org to receive rights to fork the project. +* If you are a new user, please send an email to: dev [at] ispconfig [dot] org to receive rights to fork the project. * Please create an issue for each contribution you want to make. * Do not put multiple contributions into a single branch and merge request. Each contribution should have it's own branch. * Do not use the develop branch in your forked project for your contribution. Create a separate branch for each issue. -- GitLab From 5b38de2cbb67bc32b17b80f878d92f94505626fd Mon Sep 17 00:00:00 2001 From: Thom Date: Sun, 25 Apr 2021 17:59:31 +0000 Subject: [PATCH 3/5] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6929b573d1..0c71d1891b 100644 --- a/README.md +++ b/README.md @@ -18,10 +18,10 @@ Development branch: [![pipeline status](https://git.ispconfig.org/ispconfig/ispc - Let's Encrypt: Acme.sh and certbot - SMTP: Postfix - POP3/IMAP: Dovecot -- Spamfilter: Rspamd and Amavis[^1] +- Spamfilter: Rspamd and Amavis - FTP: PureFTPD - DNS: BIND9 and PowerDNS[^1] -- Database: MariaDB and MySQL[^1] +- Database: MariaDB and MySQL [^1]: not actively tested -- GitLab From 5954be8e1768b55918b2568955f85bf8abfcabc2 Mon Sep 17 00:00:00 2001 From: Thom Date: Sun, 25 Apr 2021 19:45:08 +0000 Subject: [PATCH 4/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0c71d1891b..eeb096c3c1 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Development branch: [![pipeline status](https://git.ispconfig.org/ispconfig/ispc - Open Source software (BSD license) ## Supported daemons -- HTTP: Apache2 and nginx +- HTTP: Apache2 and NGINX - HTTP stats: Webalizer, GoAccess and AWStats - Let's Encrypt: Acme.sh and certbot - SMTP: Postfix -- GitLab From 9c446e6a59022c77c4490fab867b6ea86bc246a7 Mon Sep 17 00:00:00 2001 From: Thom Date: Sun, 25 Apr 2021 19:46:29 +0000 Subject: [PATCH 5/5] Add link to license --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index eeb096c3c1..9e0eea359d 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Development branch: [![pipeline status](https://git.ispconfig.org/ispconfig/ispc - DNS server management - Virtualization (OpenVZ) - Administrator, reseller, client and mailuser login -- Open Source software (BSD license) +- Open Source software ([BSD license](LICENSE)) ## Supported daemons - HTTP: Apache2 and NGINX -- GitLab