ArielGlenn has submitted this change and it was merged.

Change subject: jenkins: revert access log rotation
......................................................................


jenkins: revert access log rotation

The logrotate script from upstream sends an ALRM signal which kills
Jenkins :(  Additionally the pidfile points to `daemon` pid instead of
jenkins one.

The init script needs to be rewritten and we have to find out a way
to reload Jenkins fastly.

Change-Id: Iabd0083853a82f96f1d96e2f8401551b22f7e6ce
---
M modules/jenkins/manifests/init.pp
1 file changed, 10 insertions(+), 4 deletions(-)

Approvals:
  ArielGlenn: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/jenkins/manifests/init.pp 
b/modules/jenkins/manifests/init.pp
index 8d69ce3..2f33068 100644
--- a/modules/jenkins/manifests/init.pp
+++ b/modules/jenkins/manifests/init.pp
@@ -52,11 +52,17 @@
   }
   # 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_accesslog':
-    owner  => 'root',
-    group  => 'root',
-    mode   => '0444',
-    source => 'puppet:///modules/jenkins/jenkins_accesslog.logrotate',
+    ensure => absent,
   }
 
   file { '/etc/default/jenkins':

-- 
To view, visit https://gerrit.wikimedia.org/r/75121
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iabd0083853a82f96f1d96e2f8401551b22f7e6ce
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: ArielGlenn <ar...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to