]> granicus.if.org Git - icinga2/commitdiff
icinga.com: Update everything else
authorMichael Friedrich <michael.friedrich@icinga.com>
Thu, 18 Oct 2018 07:50:53 +0000 (09:50 +0200)
committerMichael Friedrich <michael.friedrich@icinga.com>
Thu, 18 Oct 2018 07:50:53 +0000 (09:50 +0200)
26 files changed:
INSTALL.md
NEWS
README.md
choco/icinga2.nuspec.cmake
cmake/InstallConfig.cmake
cmake/SetFullDir.cmake
contrib/GPLHeader
contrib/discover-api.py
contrib/discover.py
doc/01-about.md
doc/02-getting-started.md
doc/03-monitoring-basics.md
doc/06-distributed-monitoring.md
doc/11-cli-commands.md
doc/12-icinga2-api.md
doc/13-addons.md
doc/15-troubleshooting.md
doc/16-upgrading-icinga-2.md
doc/icinga2.8
etc/icinga2/scripts/mail-host-notification.sh
etc/icinga2/scripts/mail-service-notification.sh
lib/config/config_lexer.ll
lib/config/config_parser.yy
lib/remote/apilistener.cpp
plugins/README.md
tools/syntax/vim/syntax/icinga2.vim

index 10c3cd40a50613d885d6e34d3c512009be2cadb1..e0573e0ec324a8105a106ee37d31449ec252c4fe 100644 (file)
@@ -7,7 +7,7 @@ of operating systems.
 Please check the documentation in the [doc/](doc/) directory for a current list
 of available packages and detailed installation instructions.
 
-The online documentation is available on [icinga.com/docs](https://www.icinga.com/docs/)
+The online documentation is available on [icinga.com/docs](https://icinga.com/docs/)
 and will guide you step by step.
 
 There are a number of known caveats when installing from source such as
diff --git a/NEWS b/NEWS
index ef80fe4766060e7e3631778391fd48499b9f7f4c..3cc501a7af4e55b358d6e1696d111f3981ee0d8f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1 +1 @@
-News for this application can be found on the project website at https://www.icinga.com
+News for this application can be found on the project website at https://icinga.com
index 595af36fe875dad47ec02ad7c3940f01b175b0e4..0a08c12c673e1cac0f67755ef965de70d9143fe5 100644 (file)
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 # Icinga 2
 
-![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)
 
 #### Table of Contents
 
@@ -21,11 +21,11 @@ network resources, notifies users of outages, and generates performance data for
 Scalable and extensible, Icinga 2 can monitor large, complex environments across
 multiple locations.
 
-Icinga 2 as monitoring core works best with [Icinga Web 2](https://www.icinga.com/products/icinga-web-2/)
+Icinga 2 as monitoring core works best with [Icinga Web 2](https://icinga.com/products/icinga-web-2/)
 as web interface.
 
-More information can be found at [www.icinga.com](https://www.icinga.com/products/icinga-2/)
-and inside the [documentation](https://www.icinga.com/docs/icinga2/latest/).
+More information can be found at [icinga.com](https://icinga.com/products/icinga-2/)
+and inside the [documentation](https://icinga.com/docs/icinga2/latest/).
 
 ## Licensing
 
@@ -58,9 +58,9 @@ is also available on https://docs.icinga.com
 
 ## Support
 
-Check the project website at https://www.icinga.com for status updates. Join the
-[community channels](https://www.icinga.com/community) for questions
-or ask an Icinga partner for [professional support](https://www.icinga.com/services/support/).
+Check the project website at 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/services/support/).
 
 ## Contributing
 
index 2fa56d64ad860927cd6c71f365f4c4d0f4c6dee2..59af944f43b834fe29552108984665810c4c958c 100755 (executable)
     <owners>Icinga Development Team</owners>\r
     <summary>icinga2 - Monitoring Agent for Windows</summary>\r
     <description>Icinga 2 is an open source monitoring platform which notifies users about host and service outages.</description>\r
-    <projectUrl>https://www.icinga.com/</projectUrl>\r
+    <projectUrl>https://icinga.com/</projectUrl>\r
     <tags>icinga2 agent monitoring admin</tags>\r
-    <licenseUrl>https://www.icinga.com/resources/faq/</licenseUrl>\r
+    <licenseUrl>https://icinga.com/resources/faq/</licenseUrl>\r
     <releaseNotes>https://github.com/Icinga/icinga2/blob/master/ChangeLog</releaseNotes>\r
     <docsUrl>https://docs.icinga.com/icinga2/</docsUrl>\r
     <bugTrackerUrl>https://github.com/Icinga/icinga2/issues</bugTrackerUrl>\r
     <packageSourceUrl>https://github.com/Icinga/icinga2</packageSourceUrl>\r
     <projectSourceUrl>https://github.com/Icinga/icinga2</projectSourceUrl>\r
     <requireLicenseAcceptance>false</requireLicenseAcceptance>\r
-    <iconUrl>https://www.icinga.com/wp-content/uploads/2015/05/icinga_icon_128x128.png</iconUrl>\r
+    <iconUrl>https://icinga.com/wp-content/uploads/2015/05/icinga_icon_128x128.png</iconUrl>\r
   </metadata>\r
   <files>\r
     <file src="${CMAKE_CURRENT_BINARY_DIR}/chocolateyInstall.ps1" target="tools" />\r
index aa39b9dfbcec6bf06bcf3a3e2bc625fb5114c7ef..3f24b39d025358e3d7287a9a5af9493f37be5be0 100644 (file)
@@ -1,5 +1,5 @@
 # Icinga 2
-# Copyright (C) 2012-2018 Icinga Development Team (https://www.icinga.com)
+# Copyright (C) 2012-2018 Icinga Development Team (https://icinga.com)
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
index bd63a68bf8e2dea029eb5459d93a10e89a9e0ffd..3e9e2236a9bb10f1014e4b59c6ea702d368af67e 100644 (file)
@@ -1,5 +1,5 @@
 # Icinga 2
-# Copyright (C) 2018 Icinga Development Team (https://www.icinga.com)
+# Copyright (C) 2018 Icinga Development Team (https://icinga.com)
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
index 6bc8a95ba0e04793550ee0bf3a1da14b29608c53..3fd58b1064ea6981b2c509338b0d894b576fe419 100644 (file)
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Icinga 2                                                                   *
- * Copyright (C) 2012-2018 Icinga Development Team (https://www.icinga.com/)  *
+ * Copyright (C) 2012-2018 Icinga Development Team (https://icinga.com/)  *
  *                                                                            *
  * This program is free software; you can redistribute it and/or              *
  * modify it under the terms of the GNU General Public License                *
index 9c3dd6a200ebccb76049f40e953395536ef794e8..27f06e6c7b67fa713b3ab3a0cdc3a1b9942f5c38 100755 (executable)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # Icinga 2
-# Copyright (C) 2012-2018 Icinga Development Team (https://www.icinga.com/)
+# Copyright (C) 2012-2018 Icinga Development Team (https://icinga.com/)
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
index a49b62c958afa0fc70688cceb624c23a0d8f9668..2a8618a78727488676c56ba427d623f893fd1ad0 100755 (executable)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # Icinga 2
-# Copyright (C) 2012-2018 Icinga Development Team (https://www.icinga.com/)
+# Copyright (C) 2012-2018 Icinga Development Team (https://icinga.com/)
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
index efd65b67e39b1c60c716120ced5be5da6c242b2a..554c077b9d922af384670a9ac4b5282e6b30694d 100644 (file)
@@ -17,9 +17,9 @@ LICENSE file included in the source package.
 
 ## Support  <a id="support"></a>
 
-Check the project website at [icinga.com](https://www.icinga.com) for status updates. Join the
+Check the project website at [icinga.com](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://www.icinga.com/services/support/).
+or ask an Icinga partner for [professional support](https://icinga.com/services/support/).
 
 ## Contribute  <a id="contribute"></a>
 
@@ -40,4 +40,4 @@ file.
 ## What's New <a id="whats-new"></a>
 
 The Icinga 2 Changelog is located [here](https://github.com/Icinga/icinga2/blob/master/CHANGELOG.md).
-Please follow our release announcements on [icinga.com](https://www.icinga.com/blog/) too.
+Please follow our release announcements on [icinga.com](https://icinga.com/blog/) too.
index 244a797de19bccf99bc475dc5899b021f43e4291..285544e70949cc1b5ae0984031e17fa29f1646ba 100644 (file)
@@ -1003,10 +1003,10 @@ rc-service icinga2 restart
 
 ### Installing Icinga Web 2 <a id="installing-icingaweb2"></a>
 
-Please consult the [installation documentation](https://www.icinga.com/docs/icingaweb2/latest/doc/02-Installation/)
+Please consult the [installation documentation](https://icinga.com/docs/icingaweb2/latest/doc/02-Installation/)
 for further instructions on how to install Icinga Web 2.
 
-The Icinga 2 API can be defined as [command transport](https://www.icinga.com/docs/icingaweb2/latest/modules/monitoring/doc/05-Command-Transports/)
+The Icinga 2 API can be defined as [command transport](https://icinga.com/docs/icingaweb2/latest/modules/monitoring/doc/05-Command-Transports/)
 in Icinga Web 2 >= 2.4.
 
 ## Addons <a id="install-addons"></a>
index a4775c69f0477731cf2fc8b80bca0ef7bc555e87..3c44b67c5188f522a8b8426ddbe7c871d2d07488 100644 (file)
@@ -2227,7 +2227,7 @@ in the service object then.
 > **Note**
 >
 > Keep in mind that the values are still visible with the [debug console](11-cli-commands.md#cli-command-console)
-> and the inspect mode in the [Icinga Director](https://www.icinga.com/docs/director/latest/).
+> and the inspect mode in the [Icinga Director](https://icinga.com/docs/director/latest/).
 
 You can also set global environment variables in the application's
 sysconfig configuration file, e.g. `HOME` or specific library paths
index fa1bcdb6775d1089a8531ec19b982ba343657465..44e1ae2e343cab3351d006d63b3c0f781f1e49d0 100644 (file)
@@ -1209,14 +1209,14 @@ section where you can find detailed information on extending the setup.
 
 
 If you are eager to start fresh instead you might take a look into the
-[Icinga Director](https://www.icinga.com/docs/director/latest/).
+[Icinga Director](https://icinga.com/docs/director/latest/).
 
 ## Scenarios <a id="distributed-monitoring-scenarios"></a>
 
 The following examples should give you an idea on how to build your own
 distributed monitoring environment. We've seen them all in production
 environments and received feedback from our [community](https://icinga.com/community/)
-and [partner support](https://www.icinga.com/services/support/) channels:
+and [partner support](https://icinga.com/services/support/) channels:
 
 * Single master with clients.
 * HA master with clients as command endpoint.
index a6a625e5fe53e45ff871dd949a90c5929c3af8f4..886dff5ea7d2ea894164ec11c25943f0f38d33f7 100644 (file)
@@ -55,7 +55,7 @@ Global options:
   -X [ --script-debugger ]  whether to enable the script debugger
 
 Report bugs at <https://github.com/Icinga/icinga2>
-Icinga home page: <https://www.icinga.com/>
+Icinga home page: <https://icinga.com/>
 ```
 
 
@@ -165,7 +165,7 @@ Global options:
   -X [ --script-debugger ]  whether to enable the script debugger
 
 Report bugs at <https://github.com/Icinga/icinga2>
-Icinga home page: <https://www.icinga.com/>
+Icinga home page: <https://icinga.com/>
 ```
 
 ## CLI command: Ca <a id="cli-command-ca"></a>
@@ -200,7 +200,7 @@ Global options:
   -X [ --script-debugger ]  whether to enable the script debugger
 
 Report bugs at <https://github.com/Icinga/icinga2>
-Icinga home page: <https://www.icinga.com/>
+Icinga home page: <https://icinga.com/>
 ```
 
 ## CLI command: Console <a id="cli-command-console"></a>
@@ -254,7 +254,7 @@ Command options:
   --sandbox                 enable sandbox mode
 
 Report bugs at <https://github.com/Icinga/icinga2>
-Icinga home page: <https://www.icinga.com/>
+Icinga home page: <https://icinga.com/>
 ```
 
 
@@ -394,7 +394,7 @@ Command options:
   --close-stdio             do not log to stdout (or stderr) after startup
 
 Report bugs at <https://github.com/Icinga/icinga2>
-Icinga home page: <https://www.icinga.com/>
+Icinga home page: <https://icinga.com/>
 ```
 
 ### Config Files <a id="cli-command-daemon-config-files"></a>
@@ -467,7 +467,7 @@ Global options:
   -X [ --script-debugger ]  whether to enable the script debugger
 
 Report bugs at <https://github.com/Icinga/icinga2>
-Icinga home page: <https://www.icinga.com/>
+Icinga home page: <https://icinga.com/>
 ```
 
 ## CLI command: Object <a id="cli-command-object"></a>
@@ -509,7 +509,7 @@ Global options:
   -X [ --script-debugger ]  whether to enable the script debugger
 
 Report bugs at <https://github.com/Icinga/icinga2>
-Icinga home page: <https://www.icinga.com/>
+Icinga home page: <https://icinga.com/>
 ```
 
 ## CLI command: Pki <a id="cli-command-pki"></a>
@@ -556,7 +556,7 @@ Global options:
   -X [ --script-debugger ]  whether to enable the script debugger
 
 Report bugs at <https://github.com/Icinga/icinga2>
-Icinga home page: <https://www.icinga.com/>
+Icinga home page: <https://icinga.com/>
 ```
 
 ## CLI command: Troubleshoot <a id="cli-command-troubleshoot"></a>
@@ -600,7 +600,7 @@ Command options:
   --include-vars            Print all Variables (like `variable list`)
 
 Report bugs at <https://github.com/Icinga/icinga2>
-Icinga home page: <https://www.icinga.com/>
+Icinga home page: <https://icinga.com/>
 ```
 
 ## CLI command: Variable <a id="cli-command-variable"></a>
@@ -633,7 +633,7 @@ Global options:
   -X [ --script-debugger ]  whether to enable the script debugger
 
 Report bugs at <https://github.com/Icinga/icinga2>
-Icinga home page: <https://www.icinga.com/>
+Icinga home page: <https://icinga.com/>
 ```
 
 ## Enabling/Disabling Features <a id="enable-features"></a>
index c26ef937daf8bbcf2a157cd9175aa7e65707fd24..8709438d16dece96718cc44ea88832c5909dc9b1 100644 (file)
@@ -1875,7 +1875,7 @@ There are a couple of existing clients which can be used with the Icinga 2 API:
 
 * [curl](https://curl.haxx.se/) or any other HTTP client really
 * [Icinga 2 console (CLI command)](12-icinga2-api.md#icinga2-api-clients-cli-console)
-* [Icinga Web 2 Director](https://www.icinga.com/products/icinga-web-2-modules/)
+* [Icinga Web 2 Director](https://icinga.com/products/icinga-web-2-modules/)
 
 Demo cases:
 
index 7a7e81d2283730a967040067e4a5f27f851193e1..eaf1af8582ace398b1574bb8961e2088f3b16f5e 100644 (file)
@@ -102,7 +102,7 @@ is even simpler these days.
 * Configure the logstash `nagios` output to send passive traps to Icinga 2 using the external command pipe.
 * Execute a plugin to check Graylog alert streams.
 
-More details can be found in [this blog post](https://www.icinga.com/2014/12/02/team-icinga-at-osmc-2014/).
+More details can be found in [this blog post](https://icinga.com/2014/12/02/team-icinga-at-osmc-2014/).
 
 ## Notification Scripts and Interfaces <a id="notification-scripts-interfaces"></a>
 
@@ -116,19 +116,19 @@ There's a variety of resources available, for example different notification scr
 * Ticket systems
 * etc.
 
-Additionally external services can be [integrated with Icinga 2](https://www.icinga.com/products/integrations/):
+Additionally external services can be [integrated with Icinga 2](https://icinga.com/products/integrations/):
 
-* [Pagerduty](https://www.icinga.com/partners/pagerduty/)
-* [VictorOps](https://www.icinga.com/partners/victorops/)
-* [StackStorm](https://www.icinga.com/partners/stackstorm/)
+* [Pagerduty](https://icinga.com/partners/pagerduty/)
+* [VictorOps](https://icinga.com/partners/victorops/)
+* [StackStorm](https://icinga.com/partners/stackstorm/)
 
-More information can be found on the [Icinga Website](https://www.icinga.com/).
+More information can be found on the [Icinga Website](https://icinga.com/).
 
 ## Configuration Management Tools <a id="configuration-tools"></a>
 
 If you require your favourite configuration tool to export the Icinga 2 configuration, please get in
 touch with their developers. The Icinga project does not provide a configuration web interface
-yet. Follow the [Icinga Blog](https://www.icinga.com/blog/) for updates on this topic.
+yet. Follow the [Icinga Blog](https://icinga.com/blog/) for updates on this topic.
 
 If you're looking for puppet manifests, chef cookbooks, ansible recipes, etc. -- we're happy
 to integrate them upstream, so please get in touch with the [Icinga team](https://icinga.com/community/).
index e4758921fd683bf96ec138819737649ebc7ddd9e..8ccfda8956742863a29d3aca40b147e74e1d6070 100644 (file)
@@ -18,8 +18,8 @@ findings and details please.
        * `icinga2 --version`
        * `icinga2 feature list`
        * `icinga2 daemon -C`
-       * [Icinga Web 2](https://www.icinga.com/products/icinga-web-2/) version (screenshot from System - About)
-       * [Icinga Web 2 modules](https://www.icinga.com/products/icinga-web-2-modules/) e.g. the Icinga Director (optional)
+       * [Icinga Web 2](https://icinga.com/products/icinga-web-2/) version (screenshot from System - About)
+       * [Icinga Web 2 modules](https://icinga.com/products/icinga-web-2-modules/) e.g. the Icinga Director (optional)
 * Configuration insights:
        * Provide complete configuration snippets explaining your problem in detail
        * Your [icinga2.conf](04-configuring-icinga-2.md#icinga2-conf) file
@@ -568,7 +568,7 @@ trying because you probably have a problem that requires manual intervention.
 
 ### Late Check Results <a id="late-check-results"></a>
 
-[Icinga Web 2](https://www.icinga.com/products/icinga-web-2/) provides
+[Icinga Web 2](https://icinga.com/products/icinga-web-2/) provides
 a dashboard overview for `overdue checks`.
 
 The REST API provides the [status](12-icinga2-api.md#icinga2-api-status) URL endpoint with some generic metrics
@@ -584,7 +584,7 @@ You can also calculate late check results via the REST API:
 * Compare the timestamp with the current time and add `check_interval` multiple times (change it to see which results are really late, like five times check_interval)
 
 You can use the [icinga2 console](11-cli-commands.md#cli-command-console) to connect to the instance, fetch all data
-and calculate the differences. More infos can be found in [this blogpost](https://www.icinga.com/2016/08/11/analyse-icinga-2-problems-using-the-console-api/).
+and calculate the differences. More infos can be found in [this blogpost](https://icinga.com/2016/08/11/analyse-icinga-2-problems-using-the-console-api/).
 
 ```
 # ICINGA2_API_USERNAME=root ICINGA2_API_PASSWORD=icinga icinga2 console --connect 'https://localhost:5665/'
@@ -879,7 +879,7 @@ critical/config: Error: Cannot make SSL context for cert path: 'C:\ProgramData\i
 ```
 
 A technical analysis and solution for re-creating the public CA certificate is
-available in [this advisory](https://www.icinga.com/2017/08/30/advisory-for-ssl-problems-with-leading-zeros-on-openssl-1-1-0/).
+available in [this advisory](https://icinga.com/2017/08/30/advisory-for-ssl-problems-with-leading-zeros-on-openssl-1-1-0/).
 
 
 ## Cluster and Clients Troubleshooting <a id="troubleshooting-cluster"></a>
index bc15462bb9e6e3f9275fc509a9ada68c3ba87ba1..9809066d9052d45c64a863b199577a0a294f1d6b 100644 (file)
@@ -402,10 +402,10 @@ attributes. More details can be found [here](08-advanced-topics.md#check-flappin
 ## Upgrading to v2.7 <a id="upgrading-to-2-7"></a>
 
 v2.7.0 provided new notification scripts and commands. Please ensure to
-update your configuration accordingly. An advisory has been published [here](https://www.icinga.com/2017/08/23/advisory-for-icinga-2-v2-7-update-and-mail-notification-scripts/).
+update your configuration accordingly. An advisory has been published [here](https://icinga.com/2017/08/23/advisory-for-icinga-2-v2-7-update-and-mail-notification-scripts/).
 
 In case are having troubles with OpenSSL 1.1.0 and the
-public CA certificates, please read [this advisory](https://www.icinga.com/2017/08/30/advisory-for-ssl-problems-with-leading-zeros-on-openssl-1-1-0/)
+public CA certificates, please read [this advisory](https://icinga.com/2017/08/30/advisory-for-ssl-problems-with-leading-zeros-on-openssl-1-1-0/)
 and check the [troubleshooting chapter](15-troubleshooting.md#troubleshooting).
 
 If Icinga 2 fails to start with an empty reference to `$ICINGA2_CACHE_DIR`
index f9ea45bb7fc7f3eb9fd975d2bfd26b43b415e00d..ca177eefdee5dbe1a7f1085ef8ec7e8861c56b40 100644 (file)
@@ -90,9 +90,9 @@ Detach from the controlling terminal.
 .SH "REPORTING BUGS"
 Report bugs at <https://github.com/Icinga/icinga2>
 .br
-Icinga home page: <https://www.icinga.com/>
+Icinga home page: <https://icinga.com/>
 .SH COPYRIGHT
-Copyright \(co 2012\-2014 Icinga Development Team (https://www.icinga.com)
+Copyright \(co 2012\-2014 Icinga Development Team (https://icinga.com)
 License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl2.html>
 .br
 This is free software: you are free to change and redistribute it.
index cecb2d75474318389b5d4785b149e2a74e6834a6..781fee3553a7031ac560dac367365727c5760805 100755 (executable)
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (C) 2012-2018 Icinga Development Team (https://www.icinga.com/)
+# Copyright (C) 2012-2018 Icinga Development Team (https://icinga.com/)
 # Except of function urlencode which is Copyright (C) by Brian White (brian@aljex.com) used under MIT license 
 
 PROG="`basename $0`"
index c53d4d02226ae58b57d8e66d0557317a9d5b3adf..d4a1944dc6d1854fc32ecc81cdc678d3966cfb7a 100755 (executable)
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (C) 2012-2018 Icinga Development Team (https://www.icinga.com/)
+# Copyright (C) 2012-2018 Icinga Development Team (https://icinga.com/)
 # Except of function urlencode which is Copyright (C) by Brian White (brian@aljex.com) used under MIT license
 
 PROG="`basename $0`"
index 899280ff77338c114c290571c474927e15a53f3d..5fae7aabc06237baaee3ac364306ba3686ccceff 100644 (file)
@@ -1,7 +1,7 @@
 %{
 /******************************************************************************
  * Icinga 2                                                                   *
- * Copyright (C) 2012-2018 Icinga Development Team (https://www.icinga.com/)  *
+ * Copyright (C) 2012-2018 Icinga Development Team (https://icinga.com/)  *
  *                                                                            *
  * This program is free software; you can redistribute it and/or              *
  * modify it under the terms of the GNU General Public License                *
index 5db8f5598e3878d5227c9dd3f5f7d4c8650956a2..bad5796bd712ef94ac6c5daac517b964e9d9f8d5 100644 (file)
@@ -3,7 +3,7 @@
  
 /******************************************************************************
  * Icinga 2                                                                   *
- * Copyright (C) 2012-2018 Icinga Development Team (https://www.icinga.com/)  *
+ * Copyright (C) 2012-2018 Icinga Development Team (https://icinga.com/)  *
  *                                                                            *
  * This program is free software; you can redistribute it and/or              *
  * modify it under the terms of the GNU General Public License                *
index dcaf8521858733023f6c9defb510bbb01a0420c1..504ad77e2b1a3bd80603809e23d2d1bac1629920 100644 (file)
@@ -149,7 +149,7 @@ void ApiListener::OnConfigLoaded()
        CopyCertificateFile(oldCaPath, defaultCaPath);
 
        if (!oldCertPath.IsEmpty() && !oldKeyPath.IsEmpty() && !oldCaPath.IsEmpty()) {
-               Log(LogWarning, "ApiListener", "Please read the upgrading documentation for v2.8: https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/");
+               Log(LogWarning, "ApiListener", "Please read the upgrading documentation for v2.8: https://icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/");
        }
 
        /* set up SSL context */
index f524f31aba51f2d45d0369562c143fecbe4a853b..0a34bffd86a45b4ef9df3641c1dffad3cdc35593 100644 (file)
@@ -34,7 +34,7 @@ A critical state always overwrites a warning state, meaning the check would be c
 ### License
 
 Icinga 2  
-Copyright (C) 2012-2018 Icinga Development Team (https://www.icinga.com/)
+Copyright (C) 2012-2018 Icinga Development Team (https://icinga.com/)
 
 This program is free software; you can redistribute it and/or  
 modify it under the tems of the GNU General Public License  
index 33d17867121ec6300e2da0a65f14ed3a132e0c54..0374c7b5a4fb757eb83b44564c18838a5be83a3f 100644 (file)
@@ -96,7 +96,7 @@ syn keyword           icinga2ObjAttr          contained       timeout times tls_handshake_timeout tls_p
 syn keyword            icinga2ObjAttr          contained       types update_interval user user_groups username users volatile zone
 syn match              icinga2ObjAttr          contained       "\(vars.\w\+\)"
 
-" keywords: https://www.icinga.com/docs/icinga2/latest/doc/17-language-reference/#reserved-keywords
+" keywords: https://icinga.com/docs/icinga2/latest/doc/17-language-reference/#reserved-keywords
 syn keyword            icinga2Keyword          object template include include_recursive include_zones library
 syn keyword            icinga2Keyword          const var this globals locals use default ignore_on_error
 syn keyword            icinga2Keyword          current_filename current_line apply to where import assign
@@ -107,7 +107,7 @@ syn keyword         icinga2Keyword          ignore function return in
 syn match              icinga2AssignCond       contained       "\(assign[ \t]\+\where\|ignore[ \t]\+\where\)"
 
 
-" Documentation reference: https://www.icinga.com/docs/icinga2/latest/doc/18-library-reference/
+" Documentation reference: https://icinga.com/docs/icinga2/latest/doc/18-library-reference/
 
 " Global functions
 syn keyword    icinga2GFunction        contained       regex match cidr_match range len union intersection keys string
@@ -257,7 +257,7 @@ syn  match         icinga2Operators "[ \t]\+\(/=\)\+"
 " ### Global settings
 
 " Global constants
-" https://www.icinga.com/docs/icinga2/snapshot/doc/17-language-reference/#icinga-2-specific-constants
+" https://icinga.com/docs/icinga2/snapshot/doc/17-language-reference/#icinga-2-specific-constants
 
 " Path specific constants
 syn keyword    icinga2PathConstant     CacheDir ConfigDir DataDir IncludeConfDir InitRunDir LocalStateDir LogDir ModAttrPath