From 456c4e8f474b88d484895caa5dcc3dee02c54fef Mon Sep 17 00:00:00 2001 From: "Dr. Yves Kreis" Date: Mon, 7 Aug 2023 10:38:13 +0200 Subject: [PATCH] Typos --- ispconfig.ai.php | 2 +- lib/class.ISPConfig.inc.php | 14 +++++++------- lib/os/class.ISPConfigDebianOS.inc.php | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ispconfig.ai.php b/ispconfig.ai.php index eb3a52b..ec04141 100644 --- a/ispconfig.ai.php +++ b/ispconfig.ai.php @@ -12,7 +12,7 @@ try { ISPConfigLog::setLogPriority(ISPConfigLog::PRIO_INFO); ISPConfig::run(); } catch(Exception $e) { - ISPConfigLog::error('Exception occured: ' . get_class($e) . ' -> ' . $e->getMessage(), true); + ISPConfigLog::error('Exception occurred: ' . get_class($e) . ' -> ' . $e->getMessage(), true); //var_dump($e); exit; } \ No newline at end of file diff --git a/lib/class.ISPConfig.inc.php b/lib/class.ISPConfig.inc.php index e76e720..169a1eb 100644 --- a/lib/class.ISPConfig.inc.php +++ b/lib/class.ISPConfig.inc.php @@ -329,16 +329,16 @@ Possible arguments are: ->"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. --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. + --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. - ->ommiting the argument (use 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. + ->omitting the argument (use 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 adviced unless you are migrating from a old server that uses Certbot. + --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-dns ->Do not use ISPConfig on this server to manage DNS entries. Bind will be installed for local DNS caching / resolving only. @@ -352,12 +352,12 @@ Possible arguments are: --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 send to given e-mail address. e.g. --monit-alert-email=me@example.com + ->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 wether 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. Available options: yes | without-password | no - e.g. --ssh-permit-root=without-password --ssh-password-authentication - -> Configure the SSH server wether or not to allow password authentication. Available options: yes | no - e.g. -ssh-password-authentication=no + -> 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. --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). diff --git a/lib/os/class.ISPConfigDebianOS.inc.php b/lib/os/class.ISPConfigDebianOS.inc.php index be4f0dd..309971d 100644 --- a/lib/os/class.ISPConfigDebianOS.inc.php +++ b/lib/os/class.ISPConfigDebianOS.inc.php @@ -41,7 +41,7 @@ class ISPConfigDebianOS extends ISPConfigBaseOS { if($mode == 'prepare') { $cmd = 'DEBIAN_FRONTEND="noninteractive" apt-get update -qq -y'; } elseif($mode == 'update') { - // for updating all updateable packages + // for updating all updatable packages $cmd = 'DEBIAN_FRONTEND="noninteractive" apt-get dist-upgrade -o Dpkg::Options::="--force-overwrite" -qq -y'; } elseif($mode == 'install' || $mode == 'partly_update') { // for installing / updating specific packages @@ -228,7 +228,7 @@ class ISPConfigDebianOS extends ISPConfigBaseOS { if($result === false) { throw new ISPConfigOSException('Command ' . $cmd . ' failed.'); } - // When --use-php=system is given, there is no alternative for php-fpm.sock and it throws an error. + // When --use-php=system is given, there is no alternative for php-fpm.sock, and it throws an error. if(ISPConfig::wantsPHP() !== 'system') { $cmd = 'update-alternatives --set php-fpm.sock /run/php/php' . $this->getSystemPHPVersion() . '-fpm.sock'; $result = $this->exec($cmd); -- GitLab