MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

Merge branch '2.4' of github.com:MISP/MISP into 2.4

pull/6017/head
iglocska 2020-06-14 20:26:52 +02:00
parent 82425123ab f040c4c4ce
commit 13afb6e1fb
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
3 changed files with 2 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
app/files/feed-metadata/defaults.json
View File

@ -462,56 +462,6 @@
"cache_timestamp": "1495872685"
}
},
{
"Feed": {
"id": "31",
"name": "hosts-file.net - hphost - malwarebytes",
"provider": "hosts-file.net",
"url": "https://hosts-file.net/psh.txt",
"rules": "",
"enabled": true,
"distribution": "0",
"sharing_group_id": "0",
"tag_id": "0",
"default": false,
"source_format": "csv",
"fixed_event": true,
"delta_merge": false,
"event_id": "0",
"publish": false,
"override_ids": false,
"settings": "{\"csv\":{\"value\":\"2\",\"delimiter\":\"\\\\t\"},\"common\":{\"excluderegex\":\"\"}}",
"input_source": "network",
"delete_local_file": false,
"lookup_visible": true,
"cache_timestamp": "1495872711"
}
},
{
"Feed": {
"id": "32",
"name": "hosts-file.net - hphost - malwarebytes - EMD classification ONLY",
"provider": "hosts-file.net",
"url": "https://hosts-file.net/emd.txt",
"rules": "",
"enabled": true,
"distribution": "0",
"sharing_group_id": "0",
"tag_id": "0",
"default": false,
"source_format": "csv",
"fixed_event": true,
"delta_merge": false,
"event_id": "0",
"publish": false,
"override_ids": false,
"settings": "{\"csv\":{\"value\":\"2\",\"delimiter\":\"\\\\t\"},\"common\":{\"excluderegex\":\"\"}}",
"input_source": "network",
"delete_local_file": false,
"lookup_visible": true,
"cache_timestamp": "1495872734"
}
},
{
"Feed": {
"id": "33",
@ -1058,31 +1008,6 @@
"cache_timestamp": "1514750887"
}
},
{
"Feed": {
"id": "59",
"name": "hpHosts - GRM only",
"provider": "hpHosts",
"url": "https://hosts-file.net/grm.txt",
"rules": "",
"enabled": true,
"distribution": "3",
"sharing_group_id": "0",
"tag_id": "0",
"default": false,
"source_format": "csv",
"fixed_event": true,
"delta_merge": false,
"event_id": "0",
"publish": false,
"override_ids": false,
"settings": "{\"csv\":{\"value\":\"2\",\"delimiter\":\"\\\\t\"},\"common\":{\"excluderegex\":\"\"}}",
"input_source": "network",
"delete_local_file": false,
"lookup_visible": true,
"cache_timestamp": "1514750888"
}
},
{
"Feed": {
"id": "60",

2
app/files/taxonomies

@ -1 +1 @@
Subproject commit a0b0035982bcf4e53fd6afe42edf762ddc1481fb
Subproject commit a6ce68a4bf4be6015063adc0fa92015c69a4f871

2
app/files/warninglists

@ -1 +1 @@
Subproject commit 78590f35269658cceb009d0fe282d5274e74ba89
Subproject commit 067bd58464d843607a8452bc1f7c37903cc7f237