diff --git a/doc/02-Installation.md b/doc/02-Installation.md index be6bb37af..de494b39d 100644 --- a/doc/02-Installation.md +++ b/doc/02-Installation.md @@ -16,7 +16,6 @@ chapter. * A web server, e.g. Apache or Nginx * PHP version >= 5.6.0 * The following PHP modules must be installed: cURL, gettext, intl, mbstring, OpenSSL and xml -* Default time zone configured for PHP in the php.ini file * LDAP PHP library when using Active Directory or LDAP for authentication * MySQL or PostgreSQL PHP libraries @@ -318,8 +317,6 @@ Check these directories: * `/etc/php.ini` * `/etc/php.d/*.ini` -Most important for icingaweb2 is `date.timezone`. - PHP settings should be stored to: * RedHat / CentOS 7: `/etc/opt/rh/rh-php71/php.d/` diff --git a/doc/20-Advanced-Topics.md b/doc/20-Advanced-Topics.md index 4951d2c72..609b9b3fe 100644 --- a/doc/20-Advanced-Topics.md +++ b/doc/20-Advanced-Topics.md @@ -477,10 +477,9 @@ and all the other steps described above first. 1. Install PHP dependencies: `php`, `php-intl`, `php-imagick`, `php-gd`, `php-mysql`, `php-curl`, `php-mbstring` used by Icinga Web 2. -2. Set a timezone in `php.ini` configuration file. -3. Create a database for Icinga Web 2, i.e. `icingaweb2`. -4. Import the database schema: `mysql -D icingaweb2 < /usr/share/icingaweb2/etc/schema/mysql.schema.sql`. -5. Insert administrator user in the `icingaweb2` database: +2. Create a database for Icinga Web 2, i.e. `icingaweb2`. +3. Import the database schema: `mysql -D icingaweb2 < /usr/share/icingaweb2/etc/schema/mysql.schema.sql`. +4. Insert administrator user in the `icingaweb2` database: `INSERT INTO icingaweb_user (name, active, password_hash) VALUES ('admin', 1, '')`, where `` is the output of `openssl passwd -1 `. 5. Make sure the `ido-mysql` and `api` features are enabled in Icinga 2: `icinga2 feature enable ido-mysql` and diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php index 597aa17e7..27e33924d 100644 --- a/modules/setup/library/Setup/WebWizard.php +++ b/modules/setup/library/Setup/WebWizard.php @@ -575,15 +575,6 @@ class WebWizard extends Wizard implements SetupWizard ) ))); - $set->add(new PhpConfigRequirement(array( - 'condition' => array('date.timezone', true), - 'title' => mt('setup', 'Default Timezone'), - 'description' => sprintf( - mt('setup', 'It is required that a default timezone has been set using date.timezone in %s.'), - php_ini_loaded_file() ?: 'php.ini' - ), - ))); - $set->add(new OSRequirement(array( 'optional' => true, 'condition' => 'linux',