Merge pull request #3594 from Icinga/feature/docs-icinga-com

Update URL to https://icinga.com
This commit is contained in:
Michael Friedrich 2018-10-29 17:49:34 +01:00 committed by GitHub
commit aed2e54834
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 23 additions and 21 deletions

View File

@ -3,7 +3,7 @@
[![Build Status](https://travis-ci.org/Icinga/icingaweb2.png?branch=master)](https://travis-ci.org/Icinga/icingaweb2)
[![Github Tag](https://img.shields.io/github/tag/Icinga/icingaweb2.svg)](https://github.com/Icinga/icingaweb2)
![Icinga Logo](https://www.icinga.com/wp-content/uploads/2014/06/icinga_logo.png)
![Icinga Logo](https://icinga.com/wp-content/uploads/2014/06/icinga_logo.png)
1. [About](#about)
2. [License](#license)
@ -15,11 +15,11 @@
## About
**Icinga Web 2** is the next generation open source monitoring web interface, framework
and command-line interface developed by the [Icinga Project](https://www.icinga.com/), supporting Icinga 2,
and command-line interface developed by the [Icinga Project](https://icinga.com/), supporting Icinga 2,
Icinga Core and any other monitoring backend compatible with the IDO database.
![Icinga Web 2 with Graphite](https://www.icinga.com/wp-content/uploads/2017/11/Icinga-Web-2-graphite.png "Icinga Web 2 with Graphite")
![Icinga Web 2 Sidebar Collapsed](https://www.icinga.com/wp-content/uploads/2017/11/Icinga-Web-2-collapsed-sidebar.png "Icinga Web 2 Sidebar Collapsed")
![Icinga Web 2 with Graphite](https://icinga.com/wp-content/uploads/2017/11/Icinga-Web-2-graphite.png "Icinga Web 2 with Graphite")
![Icinga Web 2 Sidebar Collapsed](https://icinga.com/wp-content/uploads/2017/11/Icinga-Web-2-collapsed-sidebar.png "Icinga Web 2 Sidebar Collapsed")
## License
@ -29,17 +29,19 @@ COPYING file included in the source package.
## Installation
For installing Icinga Web 2 please read [doc/02-Installation.md](doc/02-Installation.md).
For installing Icinga Web 2 please check the [installation chapter](https://icinga.com/docs/icingaweb2/latest/doc/02-Installation/)
in the documentation.
## Documentation
The documentation is located in the [doc/](doc/) directory.
The documentation is located in the [doc/](doc/) directory and also available
on [icinga.com/docs](https://icinga.com/docs/icingaweb2/latest/).
## Support
Check the project website at https://www.icinga.com for status updates. Join the
[community channels](https://www.icinga.com/community/get-involved/) for questions
or ask an Icinga partner for [professional support](https://www.icinga.com/services/support/).
Check the [project website](https://icinga.com) for status updates. Join the
[community channels](https://icinga.com/community/) for questions
or ask an Icinga partner for [professional support](https://icinga.com/support/).
## Contributing

View File

@ -21,7 +21,7 @@
<span>&copy; 2013-<?= date('Y') ?></span>
<?= $this->qlink(
$this->translate('The Icinga Project'),
'https://www.icinga.com',
'https://icinga.com',
null,
array(
'target' => '_blank'
@ -62,7 +62,7 @@
<div class="about-links">
<?= $this->qlink(
null,
'https://github.com/icinga/icingaweb2',
'https://github.com/icinga/icingaweb2/issues',
null,
array(
'target' => '_blank',
@ -72,7 +72,7 @@
) ?>
<?= $this->qlink(
null,
'https://www.icinga.com/support/',
'https://icinga.com/support/',
null,
array(
'target' => '_blank',
@ -82,7 +82,7 @@
) ?>
<?= $this->qlink(
null,
'https://www.icinga.com/about/get-involved/',
'https://icinga.com/community/',
null,
array(
'target' => '_blank',

View File

@ -25,7 +25,7 @@
<?= $this->form ?>
<div id="login-footer">
<p>Icinga Web 2 &copy; 2013-<?= date('Y') ?></p>
<?= $this->qlink($this->translate('icinga.com'), 'https://www.icinga.com') ?>
<?= $this->qlink($this->translate('icinga.com'), 'https://icinga.com') ?>
</div>
</div>
</div>

View File

@ -12,7 +12,7 @@ chapter.
## Installing Requirements <a id="installing-requirements"></a>
* [Icinga 2](https://www.icinga.com/products/icinga-2/) with the IDO database backend (MySQL or PostgreSQL)
* [Icinga 2](https://icinga.com/products/icinga-2/) with the IDO database backend (MySQL or PostgreSQL)
* 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

View File

@ -467,8 +467,8 @@ Finally visit Icinga Web 2 in your browser to login as `icingaadmin` user: `/ici
Prior to creating your own script, please look into the official resources
which may help you already:
* [Puppet module](https://www.icinga.com/products/integrations/puppet/)
* [Chef cookbook](https://www.icinga.com/products/integrations/chef/)
* [Puppet module](https://icinga.com/products/integrations/puppet/)
* [Chef cookbook](https://icinga.com/products/integrations/chef/)
If you are automating the installation of Icinga Web 2, you may want to skip the wizard and do things yourself.
These are the steps you'd need to take assuming you are using MySQL/MariaDB. If you are using PostgreSQL please adapt

View File

@ -111,7 +111,7 @@ If you experience any problems while running SELinux in enforcing mode try to re
problem persists, it is not related to SELinux because in permissive mode SELinux will not deny anything.
When filing a bug report please add the following information additionally to the
[common ones](https://www.icinga.com/icinga/faq/):
[common ones](https://icinga.com/icinga/faq/):
* Output of `semodule -l | grep -e icinga2 -e icingaweb2 -e nagios -e apache`
* Output of `semanage boolean -l | grep icinga`
* Output of `ps -eZ | grep httpd`

View File

@ -1,6 +1,6 @@
# icingaweb2-vendor-zf1
icingaweb2-vendor-zf1 is [Icinga Web 2](https://www.icinga.com/products/icinga-web-2/)'s fork of
icingaweb2-vendor-zf1 is [Icinga Web 2](https://icinga.com/products/icinga-web-2/)'s fork of
[Zend Framework](https://framework.zend.com/) 1 which is
[end-of-life](https://framework.zend.com/blog/2016-06-28-zf1-eol.html) since Sep 28, 2016.
We've reduced the library to the minimum required by Icinga Web 2 and its modules.

View File

@ -19,7 +19,7 @@ The order in which Icinga Web 2 processes the configured transports is defined b
## Use the Icinga 2 API <a id="commandtransports-icinga2-api"></a>
If you're running Icinga 2 it's best to use the [Icinga 2 API](https://www.icinga.com/docs/icinga2/latest/doc/12-icinga2-api/)
If you're running Icinga 2 it's best to use the [Icinga 2 API](https://icinga.com/docs/icinga2/latest/doc/12-icinga2-api/)
for transmitting external commands.
### Icinga 2 Preparations <a id="commandtransports-icinga2-api-preparations"></a>

View File

@ -2,6 +2,6 @@
<p>
It seems that the PHP FPM service is not running. Make sure to start PHP FPM service in order to access Icinga Web 2.
If you upgraded Icinga Web 2 recently, make sure to read the
<a href="https://www.icinga.com/docs/icingaweb2/latest/doc/02-Installation/">docs regarding PHP FPM</a>,
<a href="https://icinga.com/docs/icingaweb2/latest/doc/02-Installation/">docs regarding PHP FPM</a>,
also locally available under <code>/usr/share/icingaweb2/doc/02-Installation.md</code>.
</p>