[MediaWiki-commits] [Gerrit] operations/puppet[production]: move last hardcoded user names out of snapshot modules to pr...

[ArielGlenn (Code Review)]

ArielGlenn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/390085 )

Change subject: move last hardcoded user names out of snapshot modules to 
profiles
......................................................................


move last hardcoded user names out of snapshot modules to profiles

Bug: T179942
Change-Id: I3fbdda5f9a0544e08ba1973edfe6b4ae6b24b062
---
M modules/profile/manifests/dumps/generation/worker/monitor.pp
M modules/snapshot/manifests/dumps/monitor.pp
M modules/snapshot/templates/initscripts/dumps-monitor.systemd.erb
M modules/snapshot/templates/initscripts/dumps-monitor.upstart.erb
4 files changed, 11 insertions(+), 5 deletions(-)

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



diff --git a/modules/profile/manifests/dumps/generation/worker/monitor.pp 
b/modules/profile/manifests/dumps/generation/worker/monitor.pp
index fd6b003..3f8905e 100644
--- a/modules/profile/manifests/dumps/generation/worker/monitor.pp
+++ b/modules/profile/manifests/dumps/generation/worker/monitor.pp
@@ -1,3 +1,6 @@
 class profile::dumps::generation::worker::monitor {
-    class { '::snapshot::dumps::monitor': }
+    class { '::snapshot::dumps::monitor':
+        xmldumpsuser  => 'dumpsgen',
+        xmldumpsgroup => 'dumpsgen',
+    }
 }
diff --git a/modules/snapshot/manifests/dumps/monitor.pp 
b/modules/snapshot/manifests/dumps/monitor.pp
index cd96ea5..87a1723 100644
--- a/modules/snapshot/manifests/dumps/monitor.pp
+++ b/modules/snapshot/manifests/dumps/monitor.pp
@@ -1,4 +1,7 @@
-class snapshot::dumps::monitor {
+class snapshot::dumps::monitor(
+    $xmldumpsuser = undef,
+    $xmldumpsgroup = undef,
+) {
   $repodir = $snapshot::dumps::dirs::repodir
   $confsdir = $snapshot::dumps::dirs::confsdir
 
diff --git a/modules/snapshot/templates/initscripts/dumps-monitor.systemd.erb 
b/modules/snapshot/templates/initscripts/dumps-monitor.systemd.erb
index 36d4540..88eb0ad 100644
--- a/modules/snapshot/templates/initscripts/dumps-monitor.systemd.erb
+++ b/modules/snapshot/templates/initscripts/dumps-monitor.systemd.erb
@@ -7,7 +7,7 @@
 After=network.target
 
 [Service]
-User=dumpsgen
+User=<%= @xmldumpsuser %>
 WorkingDirectory=<%= @repodir %>
 ExecStart=/bin/bash <%= @repodir -%>/monitor --configfile <%= @confsdir 
-%>/wikidump.conf.dumps:monitor --basedir <%= @repodir %>
 
diff --git a/modules/snapshot/templates/initscripts/dumps-monitor.upstart.erb 
b/modules/snapshot/templates/initscripts/dumps-monitor.upstart.erb
index 1d50cfd..8920a4d 100644
--- a/modules/snapshot/templates/initscripts/dumps-monitor.upstart.erb
+++ b/modules/snapshot/templates/initscripts/dumps-monitor.upstart.erb
@@ -7,8 +7,8 @@
 start on (local-filesystems and net-device-up IFACE!=lo)
 stop on runlevel [!2345]
 
-setuid "dumpsgen"
-setgid "dumpsgen"
+setuid "<%= @xmldumpsuser %>"
+setgid "<%= @xmldumpsgroup %>"
 
 respawn
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3fbdda5f9a0544e08ba1973edfe6b4ae6b24b062
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <ar...@wikimedia.org>
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