Commit Graph

106 Commits

Author SHA1 Message Date
de3bea84c4 recommit for updates in build 9 2018-04-20 11:50:58 +02:00
14bf86b115 Merge branch 'master' of gitlab.confdroid.com:12ww1160/cd_apache into HEAD 2018-04-20 11:50:26 +02:00
Arne Teuke
be8985caf3 adds firewall requirememt 2018-04-20 11:50:50 +02:00
58e6948571 recommit for updates in build 8 2018-04-20 11:41:16 +02:00
Arne Teuke
2e35b87cc1 fixes typo 2018-04-20 11:41:13 +02:00
646f3292b7 Merge branch 'master' of gitlab.confdroid.com:12ww1160/cd_apache into HEAD 2018-04-20 11:40:45 +02:00
a23a3bc4c1 recommit for updates in build 7 2018-04-20 11:36:16 +02:00
Arne Teuke
5977dab8c8 fixes typo 2018-04-20 11:36:10 +02:00
e4b622d624 Merge branch 'master' of gitlab.confdroid.com:12ww1160/cd_apache into HEAD 2018-04-20 11:35:45 +02:00
Arne Teuke
dddb9afc18 adds fw rules here to ensure fw is managed on apache lavel instead application level 2018-04-20 11:30:48 +02:00
12ww1160
6b176d0f82 Merge branch 'jenkins' into 'master'
Jenkins

See merge request 12ww1160/cd_apache!19
2018-04-20 10:37:53 +02:00
3e4c6a15e5 recommit for updates in build 5 2018-04-20 10:32:51 +02:00
Arne Teuke
1c46f1634d adds empty index.html 2018-04-20 10:32:45 +02:00
daa771bb0a Merge branch 'master' of gitlab.confdroid.com:12ww1160/cd_apache into HEAD 2018-04-20 10:32:20 +02:00
12ww1160
0a19f4c748 Merge branch 'jenkins' into 'master'
Jenkins

See merge request 12ww1160/cd_apache!18
2018-04-20 10:07:08 +02:00
0ea5a3a769 recommit for updates in build 4 2018-04-20 10:06:28 +02:00
Arne Teuke
e68298bc5c adds nagios target 2018-04-20 10:06:12 +02:00
de60531cb6 Merge branch 'master' of gitlab.confdroid.com:12ww1160/cd_apache into HEAD 2018-04-20 10:05:45 +02:00
Arne Teuke
f33df4d2b2 Merge branch 'jenkins' into 'master'
Jenkins

See merge request 12ww1160/cd_apache!17
2018-04-10 13:22:42 +02:00
921eeddd76 recommit for updates in build 3 2018-04-10 13:21:33 +02:00
2345d262b2 Merge branch 'master' of gitlab.confdroid.com:12ww1160/cd_apache into HEAD 2018-04-10 13:21:06 +02:00
Arne Teuke
1118729c96 updates README 2018-04-10 13:20:56 +02:00
Arne Teuke
3a2477ad25 Merge branch 'jenkins' into 'master'
Jenkins

See merge request 12ww1160/cd_apache!16
2018-04-10 13:07:02 +02:00
62260e329b recommit for updates in build 2 2018-04-10 13:06:02 +02:00
Arne Teuke
bb2f896c47 Merge branch 'jenkins' into 'master'
Jenkins

See merge request 12ww1160/cd_apache!15
2018-04-10 13:05:26 +02:00
Arne Teuke
84ca8d72b9 updates README 2018-04-10 13:05:24 +02:00
406a049bce recommit for updates in build 1 2018-04-10 12:56:53 +02:00
Arne Teuke
5009ae57d9 added dev branch 2018-04-10 12:56:10 +02:00
12ww1160
355409a1c9 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !14
2017-07-11 19:20:12 +02:00
692569d700 recommit for updates in build 20 2017-07-11 19:27:24 +02:00
7ffd5ccb81 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_apache into HEAD 2017-07-11 19:26:59 +02:00
Arne Teuke
4296733d3e more improved testing 2017-07-11 18:26:50 +01:00
Arne Teuke
387ab193a9 more improved testing 2017-07-11 18:24:39 +01:00
Arne Teuke
eacdc6522b updated README 2017-07-11 18:14:21 +01:00
Arne Teuke
08da1c5e70 finalised this stage 2017-07-11 18:12:23 +01:00
Arne Teuke
19a1a86f2a finalised this stage 2017-07-11 18:06:45 +01:00
12ww1160
d9a2c491f1 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !13
2017-07-11 19:05:30 +02:00
5556fd1ec6 recommit for updates in build 17 2017-07-11 19:12:52 +02:00
0c3938b583 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_apache into HEAD 2017-07-11 19:12:29 +02:00
12ww1160
9589be79c6 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !12
2017-07-11 19:01:30 +02:00
c1963582f0 recommit for updates in build 16 2017-07-11 19:08:47 +02:00
eaf17e5f1e Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_apache into HEAD 2017-07-11 19:08:24 +02:00
Arne Teuke
8345322978 added one more step 2017-07-11 18:01:19 +01:00
12ww1160
6a67c02f3c Merge branch 'jenkins' into 'master'
Jenkins

See merge request !11
2017-07-11 18:59:27 +02:00
f1988c6272 recommit for updates in build 14 2017-07-11 19:01:52 +02:00
Arne Teuke
114dd0f0b5 removed stale FileList 2017-07-11 17:57:22 +01:00
Arne Teuke
7ba28eca8e updated README and version 2017-07-11 17:56:04 +01:00
12ww1160
1183def439 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !10
2017-07-11 18:46:16 +02:00
3764f0bef1 recommit for updates in build 12 2017-07-11 18:53:37 +02:00
89ffb153dc Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_apache into HEAD 2017-07-11 18:53:13 +02:00