Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions resources/providers/config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
redis_secrets = new_resource.redis_secrets
redis_password = redis_secrets['pass'] unless redis_secrets.empty?
s3_malware_secrets = new_resource.s3_malware_secrets
cdomain = new_resource.cdomain

memcached_servers = node['redborder']['memcached']['hosts']

Expand Down Expand Up @@ -1206,7 +1207,8 @@
cookbook 'logstash'
variables(apikey: node['redborder']['manager']['loaders']['virustotal_api_key'],
access_key_id: s3_malware_secrets['s3_malware_access_key_id'],
secret_access_key: s3_malware_secrets['s3_malware_secret_key_id'])
secret_access_key: s3_malware_secrets['s3_malware_secret_key_id'],
cdomain: cdomain)
notifies :restart, 'service[logstash]', :delayed unless node['redborder']['leader_configuring']
end
elsif ::File.exist?("#{pipelines_dir}/malware/10_virustotal.conf")
Expand All @@ -1228,7 +1230,8 @@
cookbook 'logstash'
variables(apikey: node['redborder']['loaders']['metadefender_api_key'],
access_key_id: s3_malware_secrets['s3_malware_access_key_id'],
secret_access_key: s3_malware_secrets['s3_malware_secret_key_id'])
secret_access_key: s3_malware_secrets['s3_malware_secret_key_id'],
cdomain: cdomain)
notifies :restart, 'service[logstash]', :delayed unless node['redborder']['leader_configuring']
end
elsif ::File.exist?("#{pipelines_dir}/malware/20_metadefender.conf")
Expand All @@ -1246,7 +1249,8 @@
ignore_failure true
cookbook 'logstash'
variables(access_key_id: s3_malware_secrets['s3_malware_access_key_id'],
secret_access_key: s3_malware_secrets['s3_malware_secret_key_id'])
secret_access_key: s3_malware_secrets['s3_malware_secret_key_id'],
cdomain: cdomain)
notifies :restart, 'service[logstash]', :delayed unless node['redborder']['leader_configuring']
end

Expand All @@ -1259,7 +1263,8 @@
# ignore_failure true
# cookbook 'logstash'
# variables(access_key_id: s3_malware_secrets['s3_malware_access_key_id'],
# secret_access_key: s3_malware_secrets['s3_malware_secret_key_id'])
# secret_access_key: s3_malware_secrets['s3_malware_secret_key_id'],
# cdomain: cdomain)
# notifies :restart, 'service[logstash]', :delayed unless node['redborder']['leader_configuring']
# end

Expand All @@ -1272,8 +1277,9 @@
# mode '0644
# ignore_failure true
# cookbook 'logstash''
# variables(:access_key_id => s3_malware_secrets["s3_malware_access_key_id"],
# :secret_access_key => s3_malware_secrets["s3_malware_secret_key_id"])
# variables(access_key_id: s3_malware_secrets["s3_malware_access_key_id"],
# secret_access_key: s3_malware_secrets["s3_malware_secret_key_id"],
# cdomain: cdomain)
# notifies :restart, 'service[logstash]', :delayed unless node['redborder']['leader_configuring']
# end

Expand Down
1 change: 1 addition & 0 deletions resources/templates/default/malware_10_virustotal.conf.erb
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@ filter {
loader => 'virustotal'
access_key_id => "<%=@access_key_id%>"
secret_access_key => "<%=@secret_access_key%>"
cdomain => "<%=@cdomain%>"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@ filter {
loader => 'metadefender'
access_key_id => "<%=@access_key_id%>"
secret_access_key => "<%=@secret_access_key%>"
cdomain => "<%=@cdomain%>"
}
}
1 change: 1 addition & 0 deletions resources/templates/default/malware_30_clamscan.conf.erb
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,6 @@ filter {
loader => 'clamscan'
access_key_id => "<%=@access_key_id%>"
secret_access_key => "<%=@secret_access_key%>"
cdomain => "<%=@cdomain%>"
}
}
1 change: 1 addition & 0 deletions resources/templates/default/malware_40_yara.conf.erb
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@ filter {
loader => 'yara'
access_key_id => "<%=@access_key_id%>"
secret_access_key => "<%=@secret_access_key%>"
cdomain => "<%=@cdomain%>"
}
}
1 change: 1 addition & 0 deletions resources/templates/default/malware_50_fuzzy.conf.erb
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@ filter {
loader => 'fuzzy'
access_key_id => "<%=@access_key_id%>"
secret_access_key => "<%=@secret_access_key%>"
cdomain => "<%=@cdomain%>"
}
}