Commit dc8f6d13 authored by Jens Langhammer's avatar Jens Langhammer

fix style issues

parent 53a9f0fd
Pipeline #2770 failed with stage
in 45 seconds
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (2.2.8)
apipie-bindings (0.0.18)
CFPropertyList (2.3.6)
apipie-bindings (0.2.2)
json (>= 1.2.1)
oauth
rest-client (>= 1.6.5, < 3.0.0)
domain_name (0.5.20161021)
domain_name (0.5.20180417)
unf (>= 0.0.5, < 1.0.0)
facter (2.4.6)
CFPropertyList (~> 2.2.6)
facter (2.5.1)
CFPropertyList (~> 2.2)
fast_gettext (1.1.2)
git (1.3.0)
github-markup (1.4.0)
hiera (3.2.1)
github-markup (2.0.0)
hiera (3.4.3)
http-cookie (1.0.3)
domain_name (~> 0.5)
json (2.0.2)
json_pure (1.8.3)
json (2.1.0)
locale (2.1.2)
logger-colors (1.0.0)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
net-ssh (3.2.0)
multi_json (1.13.1)
net-ssh (4.2.0)
netrc (0.11.0)
oauth (0.5.1)
puppet (4.7.0)
CFPropertyList (~> 2.2.6)
facter (> 2.0, < 4)
hiera (>= 2.0, < 4)
json_pure (~> 1.8)
puppet-lint (2.0.2)
puppet-strings (0.99.0)
oauth (0.5.4)
puppet (5.5.1)
CFPropertyList (~> 2.2)
facter (> 2.0.1, < 4)
fast_gettext (~> 1.1.2)
hiera (>= 3.2.1, < 4)
locale (~> 2.1)
multi_json (~> 1.10)
puppet-lint (2.3.5)
puppet-strings (2.0.0)
rgen
yard (~> 0.9.5)
puppet-syntax (2.1.1)
puppet-syntax (2.4.1)
rake
rake (11.3.0)
redcarpet (3.3.4)
rest-client (2.0.0)
rake (12.3.1)
redcarpet (3.4.0)
rest-client (2.0.2)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
rgen (0.8.2)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.2)
yard (0.9.5)
unf_ext (0.0.7.5)
yard (0.9.12)
PLATFORMS
ruby
......@@ -61,3 +67,6 @@ DEPENDENCIES
rake
redcarpet
yard
BUNDLED WITH
1.13.6
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
# Run docker cleanup every hour
0 * * * * root /opt/gitlab-ci-cleanup.sh >/dev/null 2>&1
0 */8 * * * root /opt/gitlab-ci-cleanup.sh >/dev/null 2>&1
telegraf ALL=(root) NOEXEC: NOPASSWD: /usr/bin/fail2ban-client status, /usr/bin/fail2ban-client status *
......@@ -10,24 +10,24 @@ class beryjuorg_gitlab::runner (
) {
class {'docker':
}->
telegraf::input { 'docker':
}
->telegraf::input { 'docker':
plugin_type => 'docker',
options => {
'endpoint' => 'unix:///var/run/docker.sock',
},
}->
docker::image { 'gitlab/gitlab-runner':
}
->docker::image { 'gitlab/gitlab-runner':
ensure => latest,
}->
docker::run { 'gitlab-runner':
}
->docker::run { 'gitlab-runner':
image => 'gitlab/gitlab-runner:latest',
volumes => [
'/var/run/docker.sock:/var/run/docker.sock',
'/srv/gitlab-runner/config:/etc/gitlab-runner'
]
}->
docker::exec { 'register':
}
->docker::exec { 'register':
container => 'gitlab-runner',
command => "gitlab-ci-multi-runner register -n -u \"${ci_server_url}\" -r \"${ci_server_token}\" --name \"${runner_name}\" --executor \"docker\" --docker-image \"python:3.6\" --docker-privileged",
unless => '/usr/bin/test -f /etc/gitlab-runner/config.toml',
......@@ -38,8 +38,8 @@ class beryjuorg_gitlab::runner (
owner => 'root',
group => 'root',
mode => '0755',
}->
file { '/opt/gitlab-ci-cleanup.sh':
}
->file { '/opt/gitlab-ci-cleanup.sh':
source => 'puppet:///modules/beryjuorg_gitlab/cleanup.sh',
owner => 'root',
group => 'root',
......
......@@ -31,4 +31,21 @@ class beryjuorg_gitlab::server {
require => Firehol::Service['influxdb'],
}
class { 'fail2ban':
whitelist => ['172.16.0.0/12', '10.0.0.0/8'],
}
->file { '/etc/sudoers.d/telegraf-fail2ban':
source => 'puppet:///modules/beryjuorg_gitlab/telegraf_fail2ban.sudo',
owner => 'root',
group => 'root',
mode => '0440',
}
->telegraf::input { 'fail2ban':
plugin_type => 'fail2ban',
options => {
'use_sudo' => true,
},
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment