Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/347437 )
Change subject: jenkins: also fix permissions for access.log
......................................................................
jenkins: also fix permissions for access.log
Previously failed with a dependency cycle:
File[/var/log/jenkins/access.log]
=> Systemd::Syslog[jenkins]
=> File[/var/log/jenkins]
=> File[/var/log/jenkins/access.log]
350837fd75 used:
before => Systemd::Syslog['jenkins']
Change it to before => Service['jenkins']
Change-Id: I24daeb5b91c3522d580a0695b68563722a0fc7db
---
M modules/jenkins/manifests/init.pp
1 file changed, 8 insertions(+), 0 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/jenkins/manifests/init.pp
b/modules/jenkins/manifests/init.pp
index e5460d3..6e9d967 100644
--- a/modules/jenkins/manifests/init.pp
+++ b/modules/jenkins/manifests/init.pp
@@ -106,6 +106,14 @@
if $access_log {
$jenkins_access_log_arg =
'--accessLoggerClassName=winstone.accesslog.SimpleAccessLogger
--simpleAccessLogger.format=combined
--simpleAccessLogger.file=/var/log/jenkins/access.log'
+ file { '/var/log/jenkins/access.log':
+ ensure => present,
+ replace => false,
+ owner => 'jenkins',
+ group => $log_group,
+ mode => '0640',
+ before => Service['jenkins'],
+ }
} else {
$jenkins_access_log_arg = ''
}
--
To view, visit https://gerrit.wikimedia.org/r/347437
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I24daeb5b91c3522d580a0695b68563722a0fc7db
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
