tweaks

.gitignore

@@ -33,4 +33,4 @@ befb88b89c2eb401900a68e9f5b78764203f2b48264fcc3f7121bf04a57fd408
 
 *.bu
 .circleci/build_num
-test/*malware*
+tests/*malware*

Makefile

@@ -39,11 +39,11 @@ ifeq ("$(shell docker inspect -f {{.State.Running}} elasticsearch)", "true")
 	@echo "===> elasticsearch already running.  Stopping now..."
 	@docker rm -f elasticsearch || true
 	@echo "===> Starting elasticsearch"
-	@docker run --init -d --name elasticsearch -p 9200:9200 malice/elasticsearch:6.3; sleep 10
+	@docker run --init -d --name elasticsearch -p 9200:9200 malice/elasticsearch:6.3; sleep 15
 else
 	@echo "===> Starting elasticsearch"
 	@docker rm -f elasticsearch || true
-	@docker run --init -d --name elasticsearch -p 9200:9200 malice/elasticsearch:6.3; sleep 10
+	@docker run --init -d --name elasticsearch -p 9200:9200 malice/elasticsearch:6.3; sleep 15
 endif
 
 .PHONY: malware
@@ -78,7 +78,7 @@ test_markdown: test_elastic
 .PHONY: test_web
 test_web: malware stop
 	@echo "===> ${NAME} web service"
-	@docker run --init -d -p 3993:3993 malice/yara web
+	@docker run --init -d --name $(NAME) -p 3993:3993 -v `pwd`/rules:/rules malice/yara -V web
 	http -f localhost:3993/scan malware@$(MALWARE)
 	http -f localhost:3993/scan malware@$(NOT_MALWARE)
 

README.md

@@ -2,7 +2,7 @@
 
 # malice-yara
 
-[![Circle CI](https://circleci.com/gh/malice-plugins/yara.png?style=shield)](https://circleci.com/gh/malice-plugins/yara) [![License](http://img.shields.io/:license-mit-blue.svg)](http://doge.mit-license.org) [![Docker Stars](https://img.shields.io/docker/stars/malice/yara.svg)](https://hub.docker.com/r/malice/yara/) [![Docker Pulls](https://img.shields.io/docker/pulls/malice/yara.svg)](https://hub.docker.com/r/malice/yara/) [![Docker Image](https://img.shields.io/badge/docker%20image-52.8MB-blue.svg)](https://hub.docker.com/r/malice/virustotal/)
+[![Circle CI](https://circleci.com/gh/malice-plugins/yara.png?style=shield)](https://circleci.com/gh/malice-plugins/yara) [![License](http://img.shields.io/:license-mit-blue.svg)](http://doge.mit-license.org) [![Docker Stars](https://img.shields.io/docker/stars/malice/yara.svg)](https://hub.docker.com/r/malice/yara/) [![Docker Pulls](https://img.shields.io/docker/pulls/malice/yara.svg)](https://hub.docker.com/r/malice/yara/) [![Docker Image](https://img.shields.io/badge/docker%20image-51.5MB-blue.svg)](https://hub.docker.com/r/malice/virustotal/)
 
 Malice Yara Plugin
 

docs/elastic.json

@@ -1,5 +1,5 @@
 {
-  "took": 40,
+  "took": 80,
   "timed_out": false,
   "_shards": {
     "total": 1,
@@ -14,7 +14,7 @@
       {
         "_index": "malice",
         "_type": "samples",
-        "_id": "FdNQ42QB-OZPDgFEQabG",
+        "_id": "IlNfAGUBq0xMuU47-Z_2",
         "_score": 1,
         "_source": {
           "plugins": {
@@ -475,7 +475,7 @@
               }
             }
           },
-          "scan_date": "2018-07-28T23:54:05.119386084Z"
+          "scan_date": "2018-08-03T15:20:14.565342Z"
         }
       }
     ]