Position.conf fix

Fixes #2

Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>

Dockerfile

@@ -49,11 +49,6 @@ RUN cd /opt/intelmq-manager \
     && pip3 install hug mako \
     && pip3 install --no-cache-dir -e .
 
-RUN mkdir /opt/intelmq/etc/manager/ \
-    && touch /opt/intelmq/etc/manager/positions.conf \
-    && chgrp www-data /opt/intelmq/etc/*.conf /opt/intelmq/etc/manager/positions.conf \
-    && chmod g+w /opt/intelmq/etc/*.conf /opt/intelmq/etc/manager/positions.conf
-
 ADD entrypoint.sh /opt/entrypoint.sh
 RUN chmod +x /opt/entrypoint.sh
 

entrypoint.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-if [ $1 == 'selftest' ]
+if [[ $1 == "selftest" ]]
 then
     cd /opt/intelmq && nosetests3
 else

example_config/intelmq/etc/manager/positions.conf

@@ -0,0 +1,66 @@
+{
+    "cymru-whois-expert": {
+        "x": -280,
+        "y": 414
+    },
+    "deduplicator-expert": {
+        "x": 148,
+        "y": -107
+    },
+    "feodo-tracker-browse-collector": {
+        "x": 136,
+        "y": -384
+    },
+    "feodo-tracker-browse-parser": {
+        "x": 97,
+        "y": -287
+    },
+    "file-output": {
+        "x": -413,
+        "y": 428
+    },
+    "gethostbyname-1-expert": {
+        "x": -125,
+        "y": 374
+    },
+    "gethostbyname-2-expert": {
+        "x": -252,
+        "y": 243
+    },
+    "malc0de-parser": {
+        "x": 297,
+        "y": 24
+    },
+    "malc0de-windows-format-collector": {
+        "x": 433,
+        "y": 121
+    },
+    "malware-domain-list-collector": {
+        "x": 465,
+        "y": -198
+    },
+    "malware-domain-list-parser": {
+        "x": 283,
+        "y": -125
+    },
+    "spamhaus-drop-collector": {
+        "x": -137,
+        "y": -281
+    },
+    "spamhaus-drop-parser": {
+        "x": 1,
+        "y": -193
+    },
+    "taxonomy-expert": {
+        "x": -3,
+        "y": 30
+    },
+    "url2fqdn-expert": {
+        "x": -75,
+        "y": 179
+    },
+    "settings": {
+        "physics": false,
+        "live": true
+    }
+}

example_config/intelmq/etc/pipeline.conf

@@ -1,15 +1,15 @@
 {
     "cymru-whois-expert": {
+        "source-queue": "cymru-whois-expert-queue",
         "destination-queues": [
             "file-output-queue"
-        ],
+        ]
-        "source-queue": "cymru-whois-expert-queue"
     },
     "deduplicator-expert": {
+        "source-queue": "deduplicator-expert-queue",
         "destination-queues": [
             "taxonomy-expert-queue"
-        ],
+        ]
-        "source-queue": "deduplicator-expert-queue"
     },
     "feodo-tracker-browse-collector": {
         "destination-queues": [
@@ -17,31 +17,31 @@
         ]
     },
     "feodo-tracker-browse-parser": {
+        "source-queue": "feodo-tracker-browse-parser-queue",
         "destination-queues": [
             "deduplicator-expert-queue"
-        ],
+        ]
-        "source-queue": "feodo-tracker-browse-parser-queue"
     },
     "file-output": {
         "source-queue": "file-output-queue"
     },
     "gethostbyname-1-expert": {
+        "source-queue": "gethostbyname-1-expert-queue",
         "destination-queues": [
             "cymru-whois-expert-queue"
-        ],
+        ]
-        "source-queue": "gethostbyname-1-expert-queue"
     },
     "gethostbyname-2-expert": {
+        "source-queue": "gethostbyname-2-expert-queue",
         "destination-queues": [
             "cymru-whois-expert-queue"
-        ],
+        ]
-        "source-queue": "gethostbyname-2-expert-queue"
     },
     "malc0de-parser": {
+        "source-queue": "malc0de-parser-queue",
         "destination-queues": [
             "deduplicator-expert-queue"
-        ],
+        ]
-        "source-queue": "malc0de-parser-queue"
     },
     "malc0de-windows-format-collector": {
         "destination-queues": [
@@ -54,10 +54,10 @@
         ]
     },
     "malware-domain-list-parser": {
+        "source-queue": "malware-domain-list-parser-queue",
         "destination-queues": [
             "deduplicator-expert-queue"
-        ],
+        ]
-        "source-queue": "malware-domain-list-parser-queue"
     },
     "spamhaus-drop-collector": {
         "destination-queues": [
@@ -65,22 +65,22 @@
         ]
     },
     "spamhaus-drop-parser": {
+        "source-queue": "spamhaus-drop-parser-queue",
         "destination-queues": [
             "deduplicator-expert-queue"
-        ],
+        ]
-        "source-queue": "spamhaus-drop-parser-queue"
     },
     "taxonomy-expert": {
+        "source-queue": "taxonomy-expert-queue",
         "destination-queues": [
             "url2fqdn-expert-queue"
-        ],
+        ]
-        "source-queue": "taxonomy-expert-queue"
     },
     "url2fqdn-expert": {
+        "source-queue": "url2fqdn-expert-queue",
         "destination-queues": [
             "gethostbyname-1-expert-queue",
             "gethostbyname-2-expert-queue"
-        ],
+        ]
-        "source-queue": "url2fqdn-expert-queue"
     }
 }

example_config/intelmq/etc/runtime.conf

@@ -50,7 +50,9 @@
             "rate_limit": 86400,
             "ssl_client_certificate": null
         },
-        "run_mode": "continuous"
+        "run_mode": "continuous",
+        "groupname": "collectors",
+        "bot_id": "feodo-tracker-browse-collector"
     },
     "feodo-tracker-browse-parser": {
         "description": "HTML Table Parser is a bot configurable to parse different html table data.",
@@ -72,7 +74,9 @@
             "time_format": null,
             "type": "c2server"
         },
-        "run_mode": "continuous"
+        "run_mode": "continuous",
+        "groupname": "parsers",
+        "bot_id": "feodo-tracker-browse-parser"
     },
     "file-output": {
         "bot_id": "file-output",