diff --git a/lib/class.ISPConfig.inc.php b/lib/class.ISPConfig.inc.php index 169a1ebd60a44f9e087d58c7a5535817f2bd7ef7..8ffc5b1fb1100e649b30bbb715223c73871c897a 100644 --- a/lib/class.ISPConfig.inc.php +++ b/lib/class.ISPConfig.inc.php @@ -322,25 +322,28 @@ Usage: ispc3-ai.sh [] [...] This script automatically installs all needed packages for an ISPConfig 3 setup using the guidelines from the "Perfect Server Setup" howtos on www.howtoforge.com. Possible arguments are: - --help ->Show this help page - --debug ->Enable verbose logging (logs each command with the exit code) - --channel ->Choose the channel to use for ISPConfig. --channel= + --help ->Show this help page. + --debug ->Enable verbose logging (logs each command with the exit code). + --channel ->Choose the channel to use for ISPConfig: --channel= ->"stable" is the latest ISPConfig release available on www.ispconfig.org ->"dev" is the latest dev-branch from the ISPConfig git repository: https://git.ispconfig.org/ispconfig/ispconfig3/tree/develop - -> The dev channel might contain bugs and less-tested features and should only be used in production by very experienced users. + ->The dev channel might contain bugs and less-tested features and should only be used in production by very experienced users. --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 + --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-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 and 8.2 available). ->--use-php=system disables the sury repository and just installs the system\'s default PHP version. - ->omitting the argument (use all versions) + ->--use-php while omitting the argument, uses all versions. --use-ftp-ports ->This option sets the passive port range for pure-ftpd. You have to specify the port range separated by hyphen, e.g. --use-ftp-ports=40110-40210. ->If not provided the passive port range will not be configured. --use-certbot ->Use Certbot instead of acme.sh for issuing Let\'s Encrypt certificates. Not advised unless you are migrating from an old server that uses Certbot. - --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. + --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. --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. @@ -348,19 +351,19 @@ Possible arguments are: --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-mailman ->Do not install Mailman mailing list manager. - --no-quota ->Disable file system quota - --no-ntp ->Disable NTP setup + --no-quota ->Disable file system quota. + --no-ntp ->Disable NTP setup. --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 - --ssh-port -> Configure the SSH server to listen on a non-default port. Port number must be between 1 and 65535 and can not be in use by other services. e.g. --ssh-port=64 + ->Set up alerts for Monit to be sent to given e-mail address. e.g. --monit-alert-email=me@example.com. + --ssh-port ->Configure the SSH server to listen on a non-default port. Port number must be between 1 and 65535 and can not be in use by other services. e.g. --ssh-port=64. --ssh-permit-root - -> Configure the SSH server whether or not to allow root login. Available options: yes | without-password | no - e.g. --ssh-permit-root=without-password + ->Configure the SSH server whether or not to allow root login: --ssh-permit-root=, e.g. --ssh-permit-root=without-password. --ssh-password-authentication - -> Configure the SSH server whether or not to allow password authentication. Available options: yes | no - e.g. -ssh-password-authentication=no - --ssh-harden -> Configure the SSH server to have a stronger security config. + ->Configure the SSH server whether or not to allow password authentication: --ssh-password-authentication=, e.g. -ssh-password-authentication=no. + --ssh-harden ->Configure the SSH server to have a stronger security config. --unattended-upgrades - ->Install UnattendedUpgrades. You can add extra arguments for automatic cleanup and automatic reboots when necessary with --unattended-upgrades=autoclean,reboot (or only one of them). + ->Install UnattendedUpgrades. You can add extra arguments for automatic cleanup and automatic reboots when necessary: --unattended-upgrades=autoclean,reboot (or only one of them). --i-know-what-i-am-doing ->Prevent the autoinstaller to ask for confirmation before continuing to reconfigure the server. '; diff --git a/lib/os/class.ISPConfigDebianOS.inc.php b/lib/os/class.ISPConfigDebianOS.inc.php index 309971d27cbb89ca0ccfaa9955f4b7a500590496..3e12e769818a3c2c3775a66ef0dd79d3c3ba2e6e 100644 --- a/lib/os/class.ISPConfigDebianOS.inc.php +++ b/lib/os/class.ISPConfigDebianOS.inc.php @@ -116,7 +116,6 @@ class ISPConfigDebianOS extends ISPConfigBaseOS { 'dbconfig-common', 'postfix', 'postfix-mysql', - 'postfix-doc', 'mariadb-client', 'mariadb-server', 'openssl', @@ -133,7 +132,6 @@ class ISPConfigDebianOS extends ISPConfigBaseOS { 'resolvconf', 'clamav', 'clamav-daemon', - 'clamav-docs', 'zip', 'unzip', 'bzip2', @@ -1603,7 +1601,6 @@ mailman-unsubscribe: "|/var/lib/mailman/mail/mailman unsubscribe mailman"'; if(ISPConfig::$WEBSERVER === ISPC_WEBSERVER_APACHE) { $packages = array( 'apache2', - 'apache2-doc', 'apache2-utils', 'libapache2-mod-fcgid', 'apache2-suexec-pristine',