Faidon Liambotis has submitted this change and it was merged.

Change subject: Phab: Properly remove public_task_dump.py if $dump = false
......................................................................


Phab: Properly remove public_task_dump.py if $dump = false

Right now we vary installing the script and cron if $dump is set to
true or not. Instead, always install the script and just vary the
cron's ensure attribute.

Change-Id: I5597484ae08b92208a1db580f351c09cf5d6d58a
---
M modules/phabricator/manifests/tools.pp
1 file changed, 16 insertions(+), 14 deletions(-)

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



diff --git a/modules/phabricator/manifests/tools.pp 
b/modules/phabricator/manifests/tools.pp
index d0c8c26..6e0dc97 100644
--- a/modules/phabricator/manifests/tools.pp
+++ b/modules/phabricator/manifests/tools.pp
@@ -29,22 +29,24 @@
         require => Package[$deploy_target],
     }
 
-    if ($dump) {
-        $dump_script = "${directory}/public_task_dump.py"
+    $dump_script = "${directory}/public_task_dump.py"
 
-        file { $dump_script:
-            mode    => '0555',
-            require => Package[$deploy_target],
-        }
+    file { $dump_script:
+        mode    => '0555',
+        require => Package[$deploy_target],
+    }
 
-        cron { $dump_script:
-            ensure  => present,
-            command => $dump_script,
-            user    => root,
-            hour    => '2',
-            minute  => '0',
-            require => Package[$deploy_target],
-        }
+    $dump_cron_ensure = $dump ? {
+        true    => present,
+        default => absent,
+    }
+    cron { $dump_script:
+        ensure  => $dump_cron_ensure,
+        command => $dump_script,
+        user    => root,
+        hour    => '2',
+        minute  => '0',
+        require => Package[$deploy_target],
     }
 
     # These bz_*_update jobs require the bugzilla_migration DB

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5597484ae08b92208a1db580f351c09cf5d6d58a
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to