Pyoungmeister has submitted this change and it was merged. Change subject: fixing the rest of the shit I forgot... ......................................................................
fixing the rest of the shit I forgot... Change-Id: I46fe11a31832207406c975ac1ba8903496a66662 --- M modules/mediawiki/manifests/cgroup.pp M modules/mediawiki/manifests/jobrunner.pp M modules/mediawiki/templates/jobrunner/jobs-loop.sh.erb M modules/mediawiki/templates/jobrunner/mw-job-runner.default.erb 4 files changed, 7 insertions(+), 7 deletions(-) Approvals: Pyoungmeister: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/mediawiki/manifests/cgroup.pp b/modules/mediawiki/manifests/cgroup.pp index efd986d..6f291d4 100644 --- a/modules/mediawiki/manifests/cgroup.pp +++ b/modules/mediawiki/manifests/cgroup.pp @@ -7,7 +7,7 @@ owner => root, group => root, mode => '0644', - source => 'puppet:///modules/mediawiki_new/cgroup/mw-cgroup.conf', + source => 'puppet:///modules/mediawiki/cgroup/mw-cgroup.conf', require => Package['cgroup-bin'], } @@ -21,6 +21,6 @@ owner => root, group => root, mode => '0755', - source => 'puppet:///modules/mediawiki_new/cgroup/cgroup-mediawiki-clean', + source => 'puppet:///modules/mediawiki/cgroup/cgroup-mediawiki-clean', } } diff --git a/modules/mediawiki/manifests/jobrunner.pp b/modules/mediawiki/manifests/jobrunner.pp index fce4d94..5a3413f 100644 --- a/modules/mediawiki/manifests/jobrunner.pp +++ b/modules/mediawiki/manifests/jobrunner.pp @@ -21,18 +21,18 @@ owner => root, group => root, mode => 0755, - source => "puppet:///modules/mediawiki_new/jobrunner/mw-job-runner.init"; + source => "puppet:///modules/mediawiki/jobrunner/mw-job-runner.init"; } file { "/etc/default/mw-job-runner": - content => template("mediawiki_new/jobrunner/mw-job-runner.default.erb"); + content => template("mediawiki/jobrunner/mw-job-runner.default.erb"); } file { "/usr/local/bin/jobs-loop.sh": owner => root, group => root, mode => 0755, - content => template("mediawiki_new/jobrunner/jobs-loop.sh.erb"); + content => template("mediawiki/jobrunner/jobs-loop.sh.erb"); } if $run_jobs_enabled == true { service { diff --git a/modules/mediawiki/templates/jobrunner/jobs-loop.sh.erb b/modules/mediawiki/templates/jobrunner/jobs-loop.sh.erb index d6598f7..23ba735 100755 --- a/modules/mediawiki/templates/jobrunner/jobs-loop.sh.erb +++ b/modules/mediawiki/templates/jobrunner/jobs-loop.sh.erb @@ -1,6 +1,6 @@ #!/bin/bash ### THIS FILE IS MANAGED BY PUPPET -### puppet:///modules/mediawiki_new/jobrunner/jobs-loop.sh.erb +### puppet:///modules/mediawiki/jobrunner/jobs-loop.sh.erb # # NAME # jobs-loop.sh -- Continuously process a MediaWiki jobqueue diff --git a/modules/mediawiki/templates/jobrunner/mw-job-runner.default.erb b/modules/mediawiki/templates/jobrunner/mw-job-runner.default.erb index 3764a46..ddad131 100644 --- a/modules/mediawiki/templates/jobrunner/mw-job-runner.default.erb +++ b/modules/mediawiki/templates/jobrunner/mw-job-runner.default.erb @@ -1,5 +1,5 @@ ### THIS FILE IS MANAGED BY PUPPET -### puppet:///modules/mediawiki_new/jobrunner/mw-job-runner.default.erb +### puppet:///modules/mediawiki/jobrunner/mw-job-runner.default.erb JR_USER=<%= @user %> JR_NICE=<%= @nice %> -- To view, visit https://gerrit.wikimedia.org/r/51779 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I46fe11a31832207406c975ac1ba8903496a66662 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Pyoungmeister <p...@wikimedia.org> Gerrit-Reviewer: Pyoungmeister <p...@wikimedia.org> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits