Ayounsi has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/364161 )
Change subject: Diffscan tuning
......................................................................
Diffscan tuning
Add missing nmap package requirement
Fix cron exec path
Bug: T169624
Change-Id: I7f408aa8001b689b7c1f523fdf447c9bed816b18
---
M modules/diffscan/manifests/init.pp
1 file changed, 5 insertions(+), 3 deletions(-)
Approvals:
Muehlenhoff: Looks good to me, but someone else must approve
jenkins-bot: Verified
Ayounsi: Looks good to me, approved
diff --git a/modules/diffscan/manifests/init.pp
b/modules/diffscan/manifests/init.pp
index fa5aece..f2f9647 100644
--- a/modules/diffscan/manifests/init.pp
+++ b/modules/diffscan/manifests/init.pp
@@ -18,9 +18,11 @@
#
class diffscan(
$ipranges={},
- $emailto='[email protected]',
- $groupname='diffscan'
+ $emailto='',
+ $groupname='diffscan-default'
) {
+ require_package('nmap')
+
file { '/srv/diffscan':
ensure => 'directory',
owner => 'root',
@@ -44,7 +46,7 @@
cron { "diffscan-${groupname}":
ensure => present,
user => 'root', # nmap needs root privileges
- command => "/srv/diffscan/diffscan.py targets-${groupname}.txt
${emailto} ${groupname}",
+ command => "cd /srv/diffscan/; /srv/diffscan/diffscan.py
/srv/diffscan/targets-${groupname}.txt ${emailto} ${groupname}",
hour => '0',
}
--
To view, visit https://gerrit.wikimedia.org/r/364161
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7f408aa8001b689b7c1f523fdf447c9bed816b18
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ayounsi <[email protected]>
Gerrit-Reviewer: Ayounsi <[email protected]>
Gerrit-Reviewer: Muehlenhoff <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
