Ayounsi has uploaded a new change for review. (
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, 12 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/61/364161/1
diff --git a/modules/diffscan/manifests/init.pp
b/modules/diffscan/manifests/init.pp
index fa5aece..edec48a 100644
--- a/modules/diffscan/manifests/init.pp
+++ b/modules/diffscan/manifests/init.pp
@@ -18,8 +18,8 @@
#
class diffscan(
$ipranges={},
- $emailto='[email protected]',
- $groupname='diffscan'
+ $emailto='',
+ $groupname='diffscan-default'
) {
file { '/srv/diffscan':
ensure => 'directory',
@@ -34,17 +34,21 @@
mode => '0444',
content => template('diffscan/targets.txt.erb'),
}
- file { '/srv/diffscan/diffscan.py':
+ package { 'nmap':
ensure => present,
- owner => 'root',
- group => 'root',
- mode => '0554',
- source => 'puppet:///modules/diffscan/diffscanpy',
+ }
+ file { '/srv/diffscan/diffscan.py':
+ ensure => present,
+ owner => 'root',
+ group => 'root',
+ mode => '0554',
+ source => 'puppet:///modules/diffscan/diffscanpy',
+ require => Package['nmap'],
}
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: newchange
Gerrit-Change-Id: I7f408aa8001b689b7c1f523fdf447c9bed816b18
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ayounsi <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
