Yuvipanda has submitted this change and it was merged.

Change subject: Revert "tools: Do not allow jlocal in crontab"
......................................................................


Revert "tools: Do not allow jlocal in crontab"

This needs to be fixed cleaner

This reverts commit 650d8ebfbc34bae363195e2359c5cd16b92fbf7b.

Change-Id: I4ce3c998069b8e0968d198c77b7d82ff3a988754
---
M modules/toollabs/templates/crontab.erb
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Yuvipanda: Verified; Looks good to me, approved



diff --git a/modules/toollabs/templates/crontab.erb 
b/modules/toollabs/templates/crontab.erb
index 7290e48..dbd056e 100755
--- a/modules/toollabs/templates/crontab.erb
+++ b/modules/toollabs/templates/crontab.erb
@@ -179,7 +179,7 @@
                 $prefix = "$1 $2 ";
                 $cmd = $3;
             }
-            unless($cmd =~ 
m[^\s*(/usr/(local/)?bin/)?(jsub|jstart|jmail|qsub)\s+]) {
+            unless($cmd =~ 
m[^\s*(/usr/(local/)?bin/)?(jsub|jstart|jmail|qsub|jlocal)\s+]) {
                 $cmd = "$prefix/usr/bin/jsub -N cron-$uname-$crlino -once 
-quiet $cmd";
                 $modified = 1;
                 $line = "$sched $cmd ";

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4ce3c998069b8e0968d198c77b7d82ff3a988754
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <yuvipa...@gmail.com>
Gerrit-Reviewer: Yuvipanda <yuvipa...@gmail.com>

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

Reply via email to