Commit Graph

85 Commits

Author SHA1 Message Date
12ww1160
917a0a791f Merge branch 'jenkins' into 'master'
Jenkins

See merge request !17
2017-07-21 17:07:20 +02:00
183e17f460 recommit for updates in build 35 2017-07-21 17:16:28 +02:00
605ad60a5c Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-21 17:15:47 +02:00
Arne Teuke
0d2f0ae3e8 re-chained certbot 2017-07-21 16:15:59 +01:00
Arne Teuke
3923a4adc5 changed config to use variables, added parameters 2017-07-21 15:51:28 +01:00
12ww1160
8b49ce3422 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !16
2017-07-21 16:42:52 +02:00
2c6b5f8656 recommit for updates in build 34 2017-07-21 16:51:54 +02:00
018f98921e Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-21 16:51:12 +02:00
Arne Teuke
e6b974ad08 fixed typo 2017-07-21 15:40:41 +01:00
Arne Teuke
c2f38a6816 added and linked certbot 2017-07-21 15:38:51 +01:00
12ww1160
78f105660d Merge branch 'jenkins' into 'master'
Jenkins

See merge request !15
2017-07-21 16:33:24 +02:00
353e7e99cf recommit for updates in build 33 2017-07-21 16:42:28 +02:00
9c7c4fe0f0 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-21 16:41:47 +02:00
Arne Teuke
2543121aba added certbot section 2017-07-21 15:33:05 +01:00
12ww1160
9ec22aa047 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !14
2017-07-21 16:27:16 +02:00
4d4f5636b8 recommit for updates in build 30 2017-07-21 16:34:25 +02:00
e8fc18c163 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-21 16:33:46 +02:00
Arne Teuke
e160b3f919 finished nagios.conf 2017-07-21 15:03:09 +01:00
Arne Teuke
5311e868ee chenged forwarding to allow http as well too 2017-07-21 14:57:05 +01: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
42d17a0d52 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !13
2017-07-21 15:38:40 +02:00
60407116a5 recommit for updates in build 27 2017-07-21 15:47:34 +02:00
69a5e7489a Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-21 15:46:58 +02: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