Commit Graph

64 Commits

Author SHA1 Message Date
69a5e7489a Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-21 15:46:58 +02:00
Arne Teuke
409ec08454 added control for forward.conf 2017-07-21 14:47:12 +01:00
Arne Teuke
d9863d874f added control for forward.conf 2017-07-21 14:43:07 +01:00
12ww1160
d8609065b8 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !12
2017-07-21 15:34:11 +02:00
1fc9ffeacd recommit for updates in build 26 2017-07-21 15:43:26 +02:00
df148ea403 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-21 15:42:53 +02:00
Arne Teuke
46d3b02f76 added control for welcome.conf 2017-07-21 14:05:55 +01:00
12ww1160
090c2b3d3d Merge branch 'jenkins' into 'master'
Jenkins

See merge request !11
2017-07-21 15:01:21 +02:00
00ef7138b3 recommit for updates in build 25 2017-07-21 15:06:15 +02:00
8c9e8e8ec3 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-21 15:05:42 +02:00
Arne Teuke
5d12bf4437 found format options both for hosts and ips 2017-07-21 13:51:07 +01:00
12ww1160
1d1123c44d Merge branch 'jenkins' into 'master'
Jenkins

See merge request !10
2017-07-21 14:45:06 +02:00
4ec7633f97 recommit for updates in build 24 2017-07-21 14:51:33 +02:00
e4c6440f66 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-21 14:51:01 +02:00
Arne Teuke
442fd08f62 testing options both for hosts and ips 2017-07-21 13:44:03 +01:00
Arne Teuke
b95350b8d8 testing options both for hosts and ips 2017-07-21 13:41:33 +01:00
Arne Teuke
a28f890bdd testing options both for hosts and ips 2017-07-21 13:30:09 +01:00
Arne Teuke
de3a7fd4fa testing options both for hosts and ips 2017-07-21 13:20:44 +01:00
Arne Teuke
b37864c7a3 testing options both for hosts and ips 2017-07-21 13:15:47 +01:00
Arne Teuke
5de81e8184 testing options both for hosts and ips 2017-07-21 12:34:48 +01:00
12ww1160
8b8da1ce4e Merge branch 'jenkins' into 'master'
Jenkins

See merge request !9
2017-07-21 13:31:54 +02:00
109eea2716 recommit for updates in build 18 2017-07-21 13:35:04 +02:00
3467a6c555 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-21 13:34:32 +02:00
Arne Teuke
41434c9607 adding options both for hosts and ips 2017-07-21 12:28:50 +01:00
Arne Teuke
544f48d800 adding options both for hosts and ips 2017-07-21 12:21:12 +01:00
Arne Teuke
e402224ff9 trying empty array 2017-07-21 12:06:36 +01:00
12ww1160
884b88a897 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !8
2017-07-21 12:57:56 +02:00
969e377d5d recommit for updates in build 15 2017-07-21 13:06:59 +02:00
7fb245af73 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-21 13:06:26 +02:00
Arne Teuke
49551a3d9a included control for nagios.conf 2017-07-21 11:43:06 +01:00
Arne Teuke
5fcf6031fa updated README 2017-07-20 17:30:38 +01:00
Arne Teuke
6e251a61a2 changed wrong refresh 2017-07-20 17:26:21 +01:00
Arne Teuke
3252eaf33a trying to work my way again through selinux 2017-07-20 17:21:09 +01:00
12ww1160
18f00a47f9 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !7
2017-07-20 18:17:49 +02:00
05036af241 recommit for updates in build 12 2017-07-20 18:26:40 +02:00
04fc1b2f1e Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-20 18:26:09 +02:00
Arne Teuke
a33a855948 trying to work my way again through selinux 2017-07-20 17:14:42 +01:00
12ww1160
ae0a409e6b Merge branch 'jenkins' into 'master'
Jenkins

See merge request !6
2017-07-20 18:12:25 +02:00
2d7dc8a5c5 recommit for updates in build 11 2017-07-20 18:21:27 +02:00
2db5521c5d Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-20 18:20:54 +02:00
Arne Teuke
0f4d8b1a85 trying to work my way again through selinux 2017-07-20 17:12:18 +01:00
12ww1160
6f84f9b4d0 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !5
2017-07-20 18:05:56 +02:00
33ed2fc013 recommit for updates in build 10 2017-07-20 18:15:02 +02:00
6194f53a12 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-20 18:14:28 +02:00
Arne Teuke
508e672c31 added statuscgi_pol to template 2017-07-20 16:16:51 +01:00
Arne Teuke
8d204947db added statuscgi_pol 2017-07-20 16:15:51 +01:00
12ww1160
3f8a4fb550 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !4
2017-07-20 17:08:28 +02:00
016ec1e6db recommit for updates in build 8 2017-07-20 17:17:24 +02:00
ce00e30ddf Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-20 17:16:51 +02:00
Arne Teuke
aefb0a83a6 undoing array 2017-07-20 15:55:30 +01:00