jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/404521 )
Change subject: Use absolute scope for systemd template variables
......................................................................
Use absolute scope for systemd template variables
Bug: T184077
Change-Id: I123ba4d1b19c4e5c2c51f9b042e3ac06ffae3362
---
M puppet/modules/ores/templates/systemd/ores-celery.erb
M puppet/modules/ores/templates/systemd/ores-wsgi.erb
M puppet/modules/wikilabels/manifests/init.pp
M puppet/modules/wikilabels/templates/systemd/wikilabels.erb
4 files changed, 7 insertions(+), 7 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/ores/templates/systemd/ores-celery.erb
b/puppet/modules/ores/templates/systemd/ores-celery.erb
index 21493e8..bc0c196 100644
--- a/puppet/modules/ores/templates/systemd/ores-celery.erb
+++ b/puppet/modules/ores/templates/systemd/ores-celery.erb
@@ -11,8 +11,8 @@
User=www-data
Group=www-data
SyslogIdentifier=ores-celery
-WorkingDirectory=<%= @ores_root %>
-ExecStart=<%= @venv_dir %>/bin/ores applications.celery --logging-config <%=
@logging_config %>
+WorkingDirectory=<%= scope['::ores::ores_root'] %>
+ExecStart=<%= scope['::ores::venv_dir'] %>/bin/ores applications.celery
--logging-config <%= scope['::ores::logging_config'] %>
Restart=always
[Install]
diff --git a/puppet/modules/ores/templates/systemd/ores-wsgi.erb
b/puppet/modules/ores/templates/systemd/ores-wsgi.erb
index afeb81b..97bfab6 100644
--- a/puppet/modules/ores/templates/systemd/ores-wsgi.erb
+++ b/puppet/modules/ores/templates/systemd/ores-wsgi.erb
@@ -11,8 +11,8 @@
User=www-data
Group=www-data
SyslogIdentifier=ores-wsgi
-WorkingDirectory=<%= @ores_root %>
-ExecStart=<%= @venv_dir %>/bin/ores applications.wsgi --port=<%= @port %>
--processes=1 --logging-config <%= @logging_config %>
+WorkingDirectory=<%= scope['::ores::ores_root'] %>
+ExecStart=<%= scope['::ores::venv_dir'] %>/bin/ores applications.wsgi
--port=<%= scope['::ores::port'] %> --processes=1 --logging-config <%=
scope['::ores::logging_config'] %>
Restart=always
[Install]
diff --git a/puppet/modules/wikilabels/manifests/init.pp
b/puppet/modules/wikilabels/manifests/init.pp
index 9c742b2..fb8ee4c 100644
--- a/puppet/modules/wikilabels/manifests/init.pp
+++ b/puppet/modules/wikilabels/manifests/init.pp
@@ -84,7 +84,7 @@
command => "echo y | sudo -u www-data ${deploy_dir}/bin/wikilabels
load_schema --reload-test-data",
unless => "sudo -u postgres psql -d ${db_name} -c \"SELECT
'campaign'::regclass\"",
cwd => $repo_dir,
- require =>[
+ require => [
Exec['create wikilabels database'],
Virtualenv::Package['wikilabels'],
File[$cfg_file],
diff --git a/puppet/modules/wikilabels/templates/systemd/wikilabels.erb
b/puppet/modules/wikilabels/templates/systemd/wikilabels.erb
index e5c651d..8b3fdeb 100644
--- a/puppet/modules/wikilabels/templates/systemd/wikilabels.erb
+++ b/puppet/modules/wikilabels/templates/systemd/wikilabels.erb
@@ -11,8 +11,8 @@
User=www-data
Group=www-data
SyslogIdentifier=wikilabels
-WorkingDirectory=<%= @repo_dir %>
-ExecStart=<%= @deploy_dir %>/bin/wikilabels dev_server --port=<%= @port %>
+WorkingDirectory=<%= scope['::wikilabels::repo_dir'] %>
+ExecStart=<%= scope['::wikilabels::deploy_dir'] %>/bin/wikilabels dev_server
--port=<%= scope['::wikilabels::port'] %>
Restart=always
[Install]
--
To view, visit https://gerrit.wikimedia.org/r/404521
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I123ba4d1b19c4e5c2c51f9b042e3ac06ffae3362
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Awight <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Gergő Tisza <[email protected]>
Gerrit-Reviewer: Ladsgroup <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
