Commit Graph

282 Commits

Author SHA1 Message Date
12ww1160
781ff40dda Merge branch 'jenkins' into 'master'
Jenkins

See merge request !40
2017-07-23 15:03:54 +02:00
0812a3559d recommit for updates in build 64 2017-07-23 15:13:13 +02:00
bbe68dcd5f Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-23 15:12:41 +02:00
Arne Teuke
101aa23b1b changed logic for http vs https and removed index+ welcome file control 2017-07-23 13:32:28 +01:00
Arne Teuke
9ddc12c8ee changed logig for http vs https and removed index+ welcome file control 2017-07-23 13:28:28 +01:00
12ww1160
9aaacb664d Merge branch 'jenkins' into 'master'
Jenkins

See merge request !39
2017-07-23 14:23:05 +02:00
f8c596b9bc recommit for updates in build 63 2017-07-23 14:32:43 +02:00
c901400ce9 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-23 14:32:10 +02:00
12ww1160
80b0ebe81e Merge branch 'jenkins' into 'master'
Jenkins

See merge request !38
2017-07-23 14:20:41 +02:00
d203cd8781 recommit for updates in build 62 2017-07-23 14:28:46 +02:00
69e710be7f Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-23 14:28:15 +02:00
Arne Teuke
382b1988f2 added nagios directories 2017-07-23 12:49:04 +01:00
12ww1160
60016a8ac9 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !37
2017-07-23 13:40:30 +02:00
f8530f8c1a recommit for updates in build 61 2017-07-23 13:49:19 +02:00
e7e34d1ad8 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-23 13:48:47 +02:00
Arne Teuke
0a369179b7 typos 2017-07-23 12:38:08 +01:00
12ww1160
fdf5f4d6fd Merge branch 'jenkins' into 'master'
Jenkins

See merge request !36
2017-07-23 13:30:08 +02:00
9920bc9caa recommit for updates in build 60 2017-07-23 13:38:25 +02:00
eeb0c453b5 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-23 13:37:53 +02:00
Arne Teuke
da29fe89ef typos 2017-07-23 12:27:50 +01:00
Arne Teuke
07a34ae113 fixed layout reference 2017-07-23 12:22:06 +01:00
12ww1160
23a99dc196 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !35
2017-07-23 13:18:58 +02:00
8085b97dae recommit for updates in build 59 2017-07-23 13:28:03 +02:00
4984dc49df Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-23 13:27:32 +02:00
12ww1160
5cc2f6579d Merge branch 'jenkins' into 'master'
Jenkins

See merge request !34
2017-07-23 13:13:16 +02:00
2810fd55eb recommit for updates in build 58 2017-07-23 13:22:21 +02:00
d808eb3d59 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-23 13:21:48 +02:00
Arne Teuke
0da8fe5d88 fixed layout reference 2017-07-23 12:07:05 +01:00
12ww1160
dc0f9e3f0b Merge branch 'jenkins' into 'master'
Jenkins

See merge request !33
2017-07-23 12:59:25 +02:00
61ed808f50 recommit for updates in build 57 2017-07-23 13:07:20 +02:00
ab245b09ae Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-23 13:06:47 +02:00
Arne Teuke
f4d17ac803 added control for nagios_ssl vhost 2017-07-23 11:58:27 +01:00
Arne Teuke
d337cae1e5 added control for nagios_ssl vhost 2017-07-23 11:54:58 +01:00
12ww1160
e82d7af66b Merge branch 'jenkins' into 'master'
Jenkins

See merge request !32
2017-07-23 12:49:06 +02:00
f0067d9e35 recommit for updates in build 56 2017-07-23 12:58:37 +02:00
75274ff8df Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-23 12:58:06 +02:00
12ww1160
66a5f85bac Merge branch 'jenkins' into 'master'
Jenkins

See merge request !31
2017-07-23 12:29:44 +02:00
b58dd84265 recommit for updates in build 54 2017-07-23 12:18:44 +02:00
Arne Teuke
98711530f9 cert creation works 2017-07-23 11:18:25 +01:00
e39b4963b7 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-23 12:18:10 +02:00
Arne Teuke
f012535113 added fw control to certs 2017-07-23 11:07:10 +01:00
Arne Teuke
a8c21b8822 re-enabled firewall control 2017-07-23 11:05:19 +01:00
12ww1160
8cac856d57 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !30
2017-07-23 12:00:44 +02:00
9547dbb7a7 recommit for updates in build 53 2017-07-23 12:08:29 +02:00
54b4c48628 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-23 12:07:54 +02:00
Arne Teuke
36e167f6a2 removed www option 2017-07-23 11:00:29 +01:00
12ww1160
11f2313195 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !29
2017-07-23 11:57:11 +02:00
4334dae94d recommit for updates in build 52 2017-07-23 12:05:34 +02:00
73e99e3f56 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-23 12:04:59 +02:00
12ww1160
a3e6588cc8 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !28
2017-07-23 11:51:46 +02:00