Commit Graph

179 Commits

Author SHA1 Message Date
b4b988a68c Merge branch 'master' of gitlab.confdroid.com:12ww1160/cd_apache into HEAD 2018-08-26 17:42:26 +02:00
Arne Teuke
9800b1e585 updates the package selection to be overridable, and up's the version 2018-08-26 17:42:08 +02:00
52a7b063c5 recommit for updates in build 16 2018-08-26 16:59:39 +02:00
076120630c Merge branch 'master' of gitlab.confdroid.com:12ww1160/cd_apache into HEAD 2018-08-26 16:59:07 +02:00
Arne Teuke
4e9b86a23a updates README 2018-08-26 16:58:47 +02:00
Arne Teuke
2e9afa8349 updates mode 2018-04-29 13:27:51 +02:00
0cbf406e0c recommit for updates in build 15 2018-04-29 13:27:23 +02:00
4ce542ccae Merge branch 'master' of gitlab.confdroid.com:12ww1160/cd_apache into HEAD 2018-04-29 13:26:52 +02:00
6561f83e57 recommit for updates in build 14 2018-04-22 13:37:29 +02:00
Arne Teuke
b81fe03781 updates frewall boolean 2018-04-22 13:37:24 +02:00
eb183ca328 Merge branch 'master' of gitlab.confdroid.com:12ww1160/cd_apache into HEAD 2018-04-22 13:36:53 +02:00
919da3fa12 recommit for updates in build 13 2018-04-20 15:36:40 +02:00
Arne Teuke
f04a11e023 adds host 2018-04-20 15:36:33 +02:00
6c2f4e9464 Merge branch 'master' of gitlab.confdroid.com:12ww1160/cd_apache into HEAD 2018-04-20 15:36:08 +02:00
b1c568cd74 recommit for updates in build 12 2018-04-20 15:06:29 +02:00
Arne Teuke
e4b2e01417 updates ssl.conf template 2018-04-20 15:06:22 +02:00
68a9a200b7 Merge branch 'master' of gitlab.confdroid.com:12ww1160/cd_apache into HEAD 2018-04-20 15:05:58 +02:00
2bb44883ae recommit for updates in build 11 2018-04-20 14:34:38 +02:00
Arne Teuke
af6b2bce18 updates ssl.conf template 2018-04-20 14:34:34 +02:00
8d33fc6488 Merge branch 'master' of gitlab.confdroid.com:12ww1160/cd_apache into HEAD 2018-04-20 14:34:07 +02:00
bda93d7ed4 recommit for updates in build 10 2018-04-20 14:28:23 +02:00
Arne Teuke
50bfdc5516 updates ssl.conf template 2018-04-20 14:28:20 +02:00
699ff62dfd Merge branch 'master' of gitlab.confdroid.com:12ww1160/cd_apache into HEAD 2018-04-20 14:27:52 +02:00
de3bea84c4 recommit for updates in build 9 2018-04-20 11:50:58 +02:00
Arne Teuke
be8985caf3 adds firewall requirememt 2018-04-20 11:50:50 +02:00
14bf86b115 Merge branch 'master' of gitlab.confdroid.com:12ww1160/cd_apache into HEAD 2018-04-20 11:50:26 +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