Fix code block related syntax issues in markdown files

This commit is contained in:
Eric Lippmann 2016-09-01 14:31:39 +02:00
parent 2d32f4a3be
commit c322077aed
5 changed files with 37 additions and 41 deletions

View File

@ -108,8 +108,7 @@ The packages for RHEL/CentOS depend on other packages which are distributed as p
[EPEL repository](http://fedoraproject.org/wiki/EPEL). Please make sure to enable this repository by following [EPEL repository](http://fedoraproject.org/wiki/EPEL). Please make sure to enable this repository by following
[these instructions](http://fedoraproject.org/wiki/EPEL#How_can_I_use_these_extra_packages.3F). [these instructions](http://fedoraproject.org/wiki/EPEL#How_can_I_use_these_extra_packages.3F).
> Please note that installing Icinga Web 2 on **RHEL/CentOS 5** is not supported due to EOL versions of PHP and > Please note that installing Icinga Web 2 on **RHEL/CentOS 5** is not supported due to EOL versions of PHP and PostgreSQL.
> PostgreSQL.
### <a id="installing-from-package-example"></a> Installing Icinga Web 2 ### <a id="installing-from-package-example"></a> Installing Icinga Web 2

View File

@ -28,7 +28,7 @@ to handle authentication and authorization, monitoring data or user preferences.
#### <a id="resources-configuration-database-example"></a> Example #### <a id="resources-configuration-database-example"></a> Example
```` ```
[icingaweb-mysql-tcp] [icingaweb-mysql-tcp]
type = db type = db
db = mysql db = mysql
@ -54,8 +54,7 @@ port = 5432
username = icingaweb username = icingaweb
password = icingaweb password = icingaweb
dbname = icingaweb dbname = icingaweb
```
````
### <a id="resources-configuration-ldap"></a> LDAP ### <a id="resources-configuration-ldap"></a> LDAP
@ -73,7 +72,7 @@ A LDAP resource represents a tree in a LDAP directory. LDAP is usually used for
#### <a id="resources-configuration-ldap-example"></a> Example #### <a id="resources-configuration-ldap-example"></a> Example
```` ```
[ad] [ad]
type = ldap type = ldap
hostname = localhost hostname = localhost
@ -81,8 +80,7 @@ port = 389
root_dn = "ou=people,dc=icinga,dc=org" root_dn = "ou=people,dc=icinga,dc=org"
bind_dn = "cn=admin,ou=people,dc=icinga,dc=org" bind_dn = "cn=admin,ou=people,dc=icinga,dc=org"
bind_pw = admin bind_pw = admin
```
````
### <a id="resources-configuration-ssh"></a> SSH ### <a id="resources-configuration-ssh"></a> SSH
@ -97,11 +95,10 @@ ssh authentication.
#### <a id="resources-configuration-ssh-example"></a> Example #### <a id="resources-configuration-ssh-example"></a> Example
```` ```
[ssh] [ssh]
type = "ssh" type = "ssh"
user = "ssh-user" user = "ssh-user"
private_key = "/etc/icingaweb2/ssh/ssh-user" private_key = "/etc/icingaweb2/ssh/ssh-user"
```
````

View File

@ -22,7 +22,7 @@ For storing preferences in INI files you have to add the following section to th
``` ```
[preferences] [preferences]
type = ini type = ini
```` ```
### <a id="preferences-configuration-db"></a> Store Preferences in a Database ### <a id="preferences-configuration-db"></a> Store Preferences in a Database

View File

@ -25,9 +25,9 @@ environment. This enables developers and users to test Livestatus,
MySQL and PostgreSQL backends as well as the LDAP authentication. All you MySQL and PostgreSQL backends as well as the LDAP authentication. All you
have to do is install Vagrant and run: have to do is install Vagrant and run:
```` ```
vagrant up vagrant up
```` ```
> **Note:** The first boot of the vm takes a fairly long time because > **Note:** The first boot of the vm takes a fairly long time because
> you'll download a plain CentOS base box and Vagrant will automatically > you'll download a plain CentOS base box and Vagrant will automatically
@ -56,6 +56,6 @@ Both LDAP and a MySQL are configured as authentication backend. Please use one o
All software required to run tests is installed in the virtual machine. All software required to run tests is installed in the virtual machine.
In order to run all tests you have to execute the following command: In order to run all tests you have to execute the following command:
```` ```
vagrant ssh -c "icingacli test php unit" vagrant ssh -c "icingacli test php unit"
```` ```

View File

@ -22,11 +22,11 @@ the order of sections in the commandtransports.ini.
A local Icinga instance requires the following directives: A local Icinga instance requires the following directives:
```` ```
[icinga2] [icinga2]
transport = local transport = local
path = /var/run/icinga2/cmd/icinga2.cmd path = /var/run/icinga2/cmd/icinga2.cmd
```` ```
When sending commands to the Icinga instance, Icinga Web 2 opens the file found When sending commands to the Icinga instance, Icinga Web 2 opens the file found
on the local filesystem underneath 'path' and writes the external command to it. on the local filesystem underneath 'path' and writes the external command to it.
@ -36,14 +36,14 @@ on the local filesystem underneath 'path' and writes the external command to it.
A command pipe on a remote host's filesystem can be accessed by configuring a A command pipe on a remote host's filesystem can be accessed by configuring a
SSH based command transport and requires the following directives: SSH based command transport and requires the following directives:
```` ```
[icinga2] [icinga2]
transport = remote transport = remote
path = /var/run/icinga2/cmd/icinga2.cmd path = /var/run/icinga2/cmd/icinga2.cmd
host = example.tld host = example.tld
;port = 22 ; Optional. The default is 22 user = icinga
user = icinga ;port = 22 ; Optional. The default is 22
```` ```
To make this example work, you'll need to permit your web-server's user To make this example work, you'll need to permit your web-server's user
public-key based access to the defined remote host so that Icinga Web 2 can public-key based access to the defined remote host so that Icinga Web 2 can
@ -56,23 +56,23 @@ key file on the local filesystem that is used to access the remote host.
To accomplish this, a new resource is required that is defined in your To accomplish this, a new resource is required that is defined in your
transport's configuration instead of a user: transport's configuration instead of a user:
```` ```
[icinga2] [icinga2]
transport = remote transport = remote
path = /var/run/icinga2/cmd/icinga2.cmd path = /var/run/icinga2/cmd/icinga2.cmd
host = example.tld host = example.tld
;port = 22 ; Optional. The default is 22 resource = example.tld-icinga2
resource = example.tld-icinga2 ;port = 22 ; Optional. The default is 22
```` ```
The resource's configuration needs to be put into the resources.ini file: The resource's configuration needs to be put into the resources.ini file:
```` ```
[example.tld-icinga2] [example.tld-icinga2]
type = ssh type = ssh
user = icinga user = icinga
private_key = /etc/icingaweb2/ssh/icinga private_key = /etc/icingaweb2/ssh/icinga
```` ```
## Configuring transports for different Icinga instances ## Configuring transports for different Icinga instances
@ -81,7 +81,7 @@ define which transport belongs to which Icinga instance by providing the
directive 'instance'. This directive should contain the name of the Icinga directive 'instance'. This directive should contain the name of the Icinga
instance you want to assign to the transport: instance you want to assign to the transport:
```` ```
[icinga1] [icinga1]
... ...
instance = icinga1 instance = icinga1
@ -89,8 +89,8 @@ instance = icinga1
[icinga2] [icinga2]
... ...
instance = icinga2 instance = icinga2
```` ```
Associating a transport to a specific Icinga instance causes this transport to Associating a transport to a specific Icinga instance causes this transport to
be used to send commands to the linked instance only. Transports without a be used to send commands to the linked instance only. Transports without a
linked Icinga instance are utilized to send commands to all instances. linked Icinga instance are utilized to send commands to all instances.