From e4b6675224bfb1eac8ddb424a29e91fcde7d6e17 Mon Sep 17 00:00:00 2001 From: Thom Date: Sat, 2 Dec 2023 13:17:33 +0100 Subject: [PATCH 1/2] Do not install jailkit and pureftpd if --no-web is given (#118) --- lib/class.ISPConfig.inc.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/class.ISPConfig.inc.php b/lib/class.ISPConfig.inc.php index 5e1347b..e03e562 100644 --- a/lib/class.ISPConfig.inc.php +++ b/lib/class.ISPConfig.inc.php @@ -144,6 +144,8 @@ class ISPConfig { public static function shallInstall($what) { if(isset($_GET['no-'.$what]) && $_GET['no-'.$what]) { return false; + } elseif(($what == 'jailkit' || $what == 'ftp') && isset($_GET['no-web']) && $_GET['no-web']) { + return false; } else { return true; } -- GitLab From b75550e2281c17e0ff78e7dfddfe06e1e4628ae4 Mon Sep 17 00:00:00 2001 From: Thom Date: Sat, 2 Dec 2023 13:24:32 +0100 Subject: [PATCH 2/2] Fix interpunction --- lib/class.ISPConfig.inc.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/class.ISPConfig.inc.php b/lib/class.ISPConfig.inc.php index e03e562..a841801 100644 --- a/lib/class.ISPConfig.inc.php +++ b/lib/class.ISPConfig.inc.php @@ -334,8 +334,8 @@ Possible arguments are: --lang ->Use language for ISPConfig installation. Specify with --lang=en|de (only en (English) and de (German) supported currently). --interactive ->Don\'t install ISPConfig in non-interactive mode. ->This is needed if you want to use expert mode, e.g. to install a slave server that shall be integrated into an existing multiserver setup. - --use-nginx ->Use nginx webserver instead of apache2. - --use-amavis ->Use amavis instead of rspamd for mail filtering. + --use-nginx ->Use NGINX webserver instead of Apache2. + --use-amavis ->Use Amavis instead of Rspamd for mail filtering. --use-unbound ->Use unbound instead of bind9 for local resolving. Only allowed if --no-dns is set. --use-php ->Use specific PHP versions, comma separated, instead of installing multiple PHP, e.g. --use-php=7.4,8.0 (5.6, 7.0, 7.1, 7.2, 7.3, 7.4, 8.0, 8.1, 8.2 and 8.3 available). ->--use-php=system disables the sury repository and just installs the system\'s default PHP version. @@ -346,18 +346,18 @@ Possible arguments are: --no-web ->Do not use ISPConfig on this server to manage webserver setting and don\'t install nginx/apache or pureftpd. ->This will also prevent installing an ISPConfig UI and implies --no-roundcube as well as --no-pma. --no-mail ->Do not use ISPConfig on this server to manage mailserver settings. - ->This will install postfix for sending system mails, but not dovecot and not configure any settings for ISPConfig mail. It implies --no-mailman. + ->This will install Postfix for sending system mails, but not dovecot and not configure any settings for ISPConfig mail. It implies --no-mailman. --no-dns ->Do not use ISPConfig on this server to manage DNS entries. Bind will be installed for local DNS caching / resolving only. --no-local-dns ->Do not install local DNS caching / resolving via bind. --no-firewall ->Do not install ufw and tell ISPConfig to not manage firewall settings on this server. --no-roundcube ->Do not install roundcube webmail. --roundcube ->Install Roundcube even when --no-mail is used. Manual configuration of Roundcube config is needed. - --no-pma ->Do not install PHPMyAdmin on this server. + --no-pma ->Do not install phpMyAdmin on this server. --no-mailman ->Do not install Mailman mailing list manager. --no-quota ->Disable file system quota. --no-ntp ->Disable NTP setup. --no-jailkit ->Do not install jailkit. - --no-ftp ->Do not install pure-ftpd server. + --no-ftp ->Do not install Pure-FTPd server. --monit ->Install Monit and set it up to monitor installed services. Supported services: Apache2, NGINX, MariaDB, pure-ftpd-mysql, php-fpm, ssh, named, Postfix, Dovecot, rspamd. --monit-alert-email ->Set up alerts for Monit to be sent to given e-mail address. e.g. --monit-alert-email=me@example.com. -- GitLab