Hashar has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/356560 )
Change subject: jenkins: get rid of /etc/init.d/jenkins
......................................................................
jenkins: get rid of /etc/init.d/jenkins
We are now using systemd to manage Jenkins. However the Debian package
still installs an init.d script which one might end up using instead of
systemd. That could cause the service to be started with innapropriate
parameters.
Ensure /etc/init.d/jenkins is absent.
Remove the contint-admins related sudo rule.
Change-Id: I5b2ee927adf45fef610fe77f81b46e6ba9823710
---
M modules/admin/data/data.yaml
M modules/jenkins/manifests/init.pp
2 files changed, 8 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/60/356560/1
diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index a86ba80..c51c089 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -145,7 +145,6 @@
'ALL = (gerritslave) NOPASSWD: ALL',
'ALL = (nodepool) NOPASSWD: ALL',
'ALL = (zuul) NOPASSWD: ALL',
- 'ALL = NOPASSWD: /etc/init.d/jenkins',
'ALL = NOPASSWD: /usr/sbin/service nodepool start',
'ALL = NOPASSWD: /usr/sbin/service nodepool stop',
'ALL = NOPASSWD: /usr/sbin/service nodepool restart',
diff --git a/modules/jenkins/manifests/init.pp
b/modules/jenkins/manifests/init.pp
index dc8072d..47a8b9e 100644
--- a/modules/jenkins/manifests/init.pp
+++ b/modules/jenkins/manifests/init.pp
@@ -130,6 +130,14 @@
default => ensure_service($service_ensure),
}
+ file { '/etc/init.d/jenkins':
+ # We use systemd, prevent admins from using the init script that comes
+ # in the Debian package.
+ ensure => absent,
+ require => Package['jenkins'],
+ before => Service['jenkins'],
+ }
+
base::service_unit { 'jenkins':
ensure => 'present',
sysvinit => false,
--
To view, visit https://gerrit.wikimedia.org/r/356560
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5b2ee927adf45fef610fe77f81b46e6ba9823710
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
