Commit Graph

115 Commits

Author SHA1 Message Date
92e809e1c6 recommit for updates in build 44 2017-07-21 18:38:00 +02:00
74f6e3f6ca Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-21 18:37:25 +02:00
Arne Teuke
35150e65ab syntax 2017-07-21 17:37:42 +01:00
Arne Teuke
72d8f34299 adding selinux control 2017-07-21 17:34:48 +01:00
Arne Teuke
72d4046345 working with certbot still 2017-07-21 17:28:18 +01:00
Arne Teuke
0a36dcedf3 fixed seltype 2017-07-21 17:22:31 +01:00
12ww1160
fcbb5342b6 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !23
2017-07-21 18:19:24 +02:00
5d8c5cff03 recommit for updates in build 42 2017-07-21 18:28:39 +02:00
b5ee3265a9 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-21 18:28:05 +02:00
Arne Teuke
910a2e4fb8 fixed relationship 2017-07-21 17:14:54 +01:00
Arne Teuke
118a7b62ca added index file 2017-07-21 17:11:42 +01:00
12ww1160
0732684ea4 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !22
2017-07-21 18:06:01 +02:00
d70df7efcb recommit for updates in build 41 2017-07-21 18:15:13 +02:00
8ba9ea9028 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-21 18:14:39 +02:00
Arne Teuke
3d60841cbc added index file 2017-07-21 17:04:53 +01:00
12ww1160
fae93a9d02 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !21
2017-07-21 18:02:52 +02:00
7fff54ce74 recommit for updates in build 40 2017-07-21 18:11:57 +02:00
bd97383ea2 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-21 18:11:23 +02:00
Arne Teuke
09372f6865 removing all final config files on certbot level 2017-07-21 16:46:40 +01:00
12ww1160
0b3cd6a427 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !20
2017-07-21 17:38:49 +02:00
10741c6eac recommit for updates in build 38 2017-07-21 17:46:57 +02:00
b3cb6c4268 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-21 17:46:23 +02:00
Arne Teuke
8db53dcf33 re-ordering 2017-07-21 16:24:35 +01:00
Arne Teuke
01324789d2 re-chained certbot 2017-07-21 16:18:10 +01:00
Arne Teuke
0d2f0ae3e8 re-chained certbot 2017-07-21 16:15:59 +01:00
12ww1160
75bc5c6527 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !19
2017-07-21 17:15:50 +02:00
919531809c recommit for updates in build 37 2017-07-21 17:24:59 +02:00
c4c066c972 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-21 17:24:22 +02:00
12ww1160
f407ae809e Merge branch 'jenkins' into 'master'
Jenkins

See merge request !18
2017-07-21 17:11:22 +02:00
abeba0589d recommit for updates in build 36 2017-07-21 17:18:35 +02:00
66f5ec3005 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-21 17:17:57 +02:00
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
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