Dzahn has submitted this change and it was merged.
Change subject: jenkins: retab + some linting
......................................................................
jenkins: retab + some linting
Change-Id: I34ae59204fa397473c277a7c56ae00986f037296
---
M modules/jenkins/manifests/group.pp
M modules/jenkins/manifests/init.pp
M modules/jenkins/manifests/slave.pp
M modules/jenkins/manifests/user.pp
4 files changed, 123 insertions(+), 119 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/jenkins/manifests/group.pp
b/modules/jenkins/manifests/group.pp
index 0cd150d..12efc2d 100644
--- a/modules/jenkins/manifests/group.pp
+++ b/modules/jenkins/manifests/group.pp
@@ -1,8 +1,8 @@
class jenkins::group {
- group { 'jenkins':
- ensure => present,
- name => 'jenkins',
- system => true,
- allowdupe => false,
- }
+ group { 'jenkins':
+ ensure => present,
+ name => 'jenkins',
+ system => true,
+ allowdupe => false,
+ }
}
diff --git a/modules/jenkins/manifests/init.pp
b/modules/jenkins/manifests/init.pp
index cfe0144..a7b6c94 100644
--- a/modules/jenkins/manifests/init.pp
+++ b/modules/jenkins/manifests/init.pp
@@ -1,85 +1,89 @@
class jenkins {
- require jenkins::user
- require jenkins::group
+ require jenkins::user
+ require jenkins::group
- # Upgrades are usually done manually by upload the Jenkins
- # package at apt.wikimedia.org then restarting jenkins and
- # double checking everything went fine.
- package { 'jenkins': ensure => present; }
+ # Upgrades are usually done manually by upload the Jenkins
+ # package at apt.wikimedia.org then restarting jenkins and
+ # double checking everything went fine.
+ package { 'jenkins':
+ ensure => present,
+ }
- # Graphiz is needed by the job dependency graph plugin
- package { 'graphviz': ensure => present; }
+ # Graphiz is needed by the job dependency graph plugin
+ package { 'graphviz':
+ ensure => present,
+ }
- # Jenkins should write everything group writable so admins can interact with
- # files easily, hence we need it to run with umask 0002.
- # The Jenkins software is daemonized in the init script using /usr/bin/daemon
- # which reset the umask value. Daemon accepts per user configuration via the
- # ~/.daemonrc, set the umask there.
- file { '/var/lib/jenkins/.daemonrc':
- ensure => 'present',
- content => "jenkins umask=0002\n",
- owner => 'jenkins',
- group => 'jenkins',
- mode => '0644',
- }
+ # Jenkins should write everything group writable so admins can interact
with
+ # files easily, hence we need it to run with umask 0002.
+ # The Jenkins software is daemonized in the init script using
+ # /usr/bin/daemon which reset the umask value. Daemon accepts per user
+ # configuration via the ~/.daemonrc, set the umask there.
+ file { '/var/lib/jenkins/.daemonrc':
+ ensure => 'present',
+ content => "jenkins umask=0002\n",
+ owner => 'jenkins',
+ group => 'jenkins',
+ mode => '0644',
+ }
- service { 'jenkins':
- ensure => 'running',
- enable => true,
- hasrestart => true,
- # Better have umask properly set before starting
- require => File['/var/lib/jenkins/.daemonrc'],
- }
+ service { 'jenkins':
+ ensure => 'running',
+ enable => true,
+ hasrestart => true,
+ # Better have umask properly set before starting
+ require => File['/var/lib/jenkins/.daemonrc'],
+ }
- # nagios monitoring
- nrpe::monitor_service { 'jenkins':
- description => 'jenkins_service_running',
- contact_group => 'contint',
- nrpe_command => "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1
--ereg-argument-array '^/usr/bin/java .*-jar /usr/share/jenkins/jenkins.war'"
- }
+ # nagios monitoring
+ nrpe::monitor_service { 'jenkins':
+ description => 'jenkins_service_running',
+ contact_group => 'contint',
+ nrpe_command => "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1
--ereg-argument-array '^/usr/bin/java .*-jar /usr/share/jenkins/jenkins.war'"
+ }
- file { '/var/lib/jenkins':
- ensure => directory,
- mode => '2775', # group sticky bit
- owner => 'jenkins',
- group => 'jenkins',
- }
- # Top level jobs folder
- file { '/var/lib/jenkins/jobs':
- ensure => directory,
- mode => '2775', # group sticky bit
- owner => 'jenkins',
- group => 'jenkins',
- }
+ file { '/var/lib/jenkins':
+ ensure => directory,
+ mode => '2775', # group sticky bit
+ owner => 'jenkins',
+ group => 'jenkins',
+ }
+ # Top level jobs folder
+ file { '/var/lib/jenkins/jobs':
+ ensure => directory,
+ mode => '2775', # group sticky bit
+ owner => 'jenkins',
+ group => 'jenkins',
+ }
-#FIXME: jenkins log rotation and init script
-# access.log rotation. Not provided by upstream Debian package
-# https://issues.jenkins-ci.org/browse/JENKINS-18870
-# file { '/etc/logrotate.d/jenkins_accesslog':
-# owner => 'root',
-# group => 'root',
-# mode => '0444',
-# source => 'puppet:///modules/jenkins/jenkins_accesslog.logrotate',
-# }
-# Jenkins init script is broken and does not track the proper PID
-# additionally kill -s ALRM kills jenkins instead of making it reopen
-# its files.
+ #FIXME: jenkins log rotation and init script
+ # access.log rotation. Not provided by upstream Debian package
+ # https://issues.jenkins-ci.org/browse/JENKINS-18870
+ # file { '/etc/logrotate.d/jenkins_accesslog':
+ # owner => 'root',
+ # group => 'root',
+ # mode => '0444',
+ # source => 'puppet:///modules/jenkins/jenkins_accesslog.logrotate',
+ # }
+ # Jenkins init script is broken and does not track the proper PID
+ # additionally kill -s ALRM kills jenkins instead of making it reopen
+ # its files.
- file { '/etc/logrotate.d/jenkins':
- ensure => present,
- owner => 'root',
- group => 'root',
- mode => '0444',
- source => 'puppet:///modules/jenkins/jenkins_log.logrotate',
- require => Package['jenkins'],
- }
+ file { '/etc/logrotate.d/jenkins':
+ ensure => present,
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ source => 'puppet:///modules/jenkins/jenkins_log.logrotate',
+ require => Package['jenkins'],
+ }
- file { '/etc/default/jenkins':
- ensure => present,
- owner => 'root',
- group => 'root',
- mode => '0444',
- source => 'puppet:///modules/jenkins/etc_default_jenkins',
- }
+ file { '/etc/default/jenkins':
+ ensure => present,
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ source => 'puppet:///modules/jenkins/etc_default_jenkins',
+ }
}
diff --git a/modules/jenkins/manifests/slave.pp
b/modules/jenkins/manifests/slave.pp
index d6eaf26..e1ff9b8 100644
--- a/modules/jenkins/manifests/slave.pp
+++ b/modules/jenkins/manifests/slave.pp
@@ -1,42 +1,42 @@
# == Class: jenkins::slave
#
class jenkins::slave(
- $ssh_authorized_key,
- $ssh_key_name,
- $ssh_key_options = [],
- $user = 'jenkins-slave',
- $workdir = '/var/lib/jenkins-slave',
+ $ssh_authorized_key,
+ $ssh_key_name,
+ $ssh_key_options = [],
+ $user = 'jenkins-slave',
+ $workdir = '/var/lib/jenkins-slave',
) {
- include jenkins::slave::requisites
+ include jenkins::slave::requisites
- group { $user:
- ensure => present,
- name => $user,
- }
+ group { $user:
+ ensure => present,
+ name => $user,
+ }
- user { $user:
- ensure => present,
- shell => '/bin/bash',
- managehome => true,
- system => true,
- }
+ user { $user:
+ ensure => present,
+ shell => '/bin/bash',
+ managehome => true,
+ system => true,
+ }
- file { $workdir:
- ensure => directory,
- owner => $user,
- group => $user,
- mode => '0775',
- require => User[$user],
- }
+ file { $workdir:
+ ensure => directory,
+ owner => $user,
+ group => $user,
+ mode => '0775',
+ require => User[$user],
+ }
- # Finally publish the Jenkins master authorized key
- ssh_authorized_key { $ssh_key_name:
- ensure => present,
- user => $user,
- type => 'ssh-rsa',
- key => $ssh_authorized_key,
- options => $ssh_key_options,
- }
+ # Finally publish the Jenkins master authorized key
+ ssh_authorized_key { $ssh_key_name:
+ ensure => present,
+ user => $user,
+ type => 'ssh-rsa',
+ key => $ssh_authorized_key,
+ options => $ssh_key_options,
+ }
}
diff --git a/modules/jenkins/manifests/user.pp
b/modules/jenkins/manifests/user.pp
index 6812e7f..bfae8e0 100644
--- a/modules/jenkins/manifests/user.pp
+++ b/modules/jenkins/manifests/user.pp
@@ -1,13 +1,13 @@
class jenkins::user {
- include jenkins::group
+ include jenkins::group
- user { 'jenkins':
- home => '/var/lib/jenkins',
- shell => '/bin/bash', # admins need to be able to login
- gid => 'jenkins',
- system => true,
- managehome => false,
- require => Group['jenkins'];
- }
+ user { 'jenkins':
+ home => '/var/lib/jenkins',
+ shell => '/bin/bash', # admins need to be able to login
+ gid => 'jenkins',
+ system => true,
+ managehome => false,
+ require => Group['jenkins'],
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/153763
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I34ae59204fa397473c277a7c56ae00986f037296
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
