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

Change subject: tools: rm source from /usr/local/sbin/ferm_restart_handler
......................................................................


tools: rm source from /usr/local/sbin/ferm_restart_handler

Otherwise it tries to eval even before in either absent or
present context and errors.

Change-Id: I31191600558b62eeda30614243e08914ec7f6998
---
M modules/toollabs/manifests/ferm_handlers.pp
1 file changed, 1 insertion(+), 5 deletions(-)

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



diff --git a/modules/toollabs/manifests/ferm_handlers.pp 
b/modules/toollabs/manifests/ferm_handlers.pp
index 21bca72..bb42bba 100644
--- a/modules/toollabs/manifests/ferm_handlers.pp
+++ b/modules/toollabs/manifests/ferm_handlers.pp
@@ -7,10 +7,6 @@
 
     file {'/usr/local/sbin/ferm_restart_handler':
         ensure => 'absent',
-        source => 'puppet:///modules/toollabs/ferm_restart_handler.sh',
-        owner  => 'root',
-        group  => 'root',
-        mode   => '0555',
     }
 
     file {'/usr/local/sbin/ferm_pre_handler':
@@ -29,7 +25,7 @@
 
     ferm::conf{'ferm_pre_handler':
         prio      => '00',
-        content   => '@hook post "/usr/local/sbin/ferm_pre_handler";',
+        content   => '@hook pre "/usr/local/sbin/ferm_pre_handler";',
         subscribe => File['/usr/local/sbin/ferm_pre_handler'],
     }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I31191600558b62eeda30614243e08914ec7f6998
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush <r...@wikimedia.org>
Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Merlijn van Deen <valhall...@arctus.nl>
Gerrit-Reviewer: Rush <r...@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