Commit Graph

33 Commits

Author SHA1 Message Date
12ww1160
18f00a47f9 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !7
2017-07-20 18:17:49 +02:00
05036af241 recommit for updates in build 12 2017-07-20 18:26:40 +02:00
04fc1b2f1e Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-20 18:26:09 +02:00
Arne Teuke
6e251a61a2 changed wrong refresh 2017-07-20 17:26:21 +01:00
Arne Teuke
3252eaf33a trying to work my way again through selinux 2017-07-20 17:21:09 +01:00
Arne Teuke
a33a855948 trying to work my way again through selinux 2017-07-20 17:14:42 +01:00
12ww1160
ae0a409e6b Merge branch 'jenkins' into 'master'
Jenkins

See merge request !6
2017-07-20 18:12:25 +02:00
2d7dc8a5c5 recommit for updates in build 11 2017-07-20 18:21:27 +02:00
2db5521c5d Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-20 18:20:54 +02:00
Arne Teuke
0f4d8b1a85 trying to work my way again through selinux 2017-07-20 17:12:18 +01:00
12ww1160
6f84f9b4d0 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !5
2017-07-20 18:05:56 +02:00
33ed2fc013 recommit for updates in build 10 2017-07-20 18:15:02 +02:00
6194f53a12 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-20 18:14:28 +02:00
Arne Teuke
508e672c31 added statuscgi_pol to template 2017-07-20 16:16:51 +01:00
Arne Teuke
8d204947db added statuscgi_pol 2017-07-20 16:15:51 +01:00
12ww1160
3f8a4fb550 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !4
2017-07-20 17:08:28 +02:00
016ec1e6db recommit for updates in build 8 2017-07-20 17:17:24 +02:00
ce00e30ddf Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-20 17:16:51 +02:00
Arne Teuke
aefb0a83a6 undoing array 2017-07-20 15:55:30 +01:00
Arne Teuke
00267d122b testing array 2017-07-20 15:54:56 +01:00
Arne Teuke
4c9cff0e73 added check for nagios_server to access 2017-07-20 15:45:54 +01:00
12ww1160
ae88116c3e Merge branch 'jenkins' into 'master'
Jenkins

See merge request !3
2017-07-20 16:38:54 +02:00
84a42a16a3 recommit for updates in build 4 2017-07-20 16:46:15 +02:00
dc39ed077e Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-20 16:45:40 +02:00
Arne Teuke
8a14684ca2 changed creates rule for exec 2017-07-20 15:10:54 +01:00
Arne Teuke
cb2010e7d2 moved service dependency to access_rules 2017-07-20 15:09:11 +01:00
12ww1160
4f7ca0ad36 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !2
2017-07-20 16:02:17 +02:00
030e5f68f5 recommit for updates in build 3 2017-07-20 16:11:13 +02:00
22bbfac4ca Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-20 16:10:39 +02:00
Arne Teuke
febc8f1a34 re-added all files 2017-07-20 14:47:24 +01:00
12ww1160
4c441a8e1f Merge branch 'jenkins' into 'master'
Jenkins

See merge request !1
2017-07-20 15:41:28 +02:00
3a3e3ceef9 recommit for updates in build 2 2017-07-20 15:47:46 +02:00
Arne Teuke
8db8758970 recommitting to see if git can be fixed 2017-07-20 14:31:19 +01:00