From c152b5009cfda91c915caa60a5be855e60d473a7 Mon Sep 17 00:00:00 2001 From: Hannah Ward Date: Wed, 21 Jun 2017 17:49:48 +0100 Subject: [PATCH] fix: Updated config for anyconfig setup Ref #2 - thanks @Danko90 for the fix - it seemed to work without it with specific opentaxii versions --- config/collections.yaml | 18 ++++----- config/services.yaml | 86 ++++++++++++++++++++--------------------- 2 files changed, 52 insertions(+), 52 deletions(-) diff --git a/config/collections.yaml b/config/collections.yaml index 252b55d..8652901 100644 --- a/config/collections.yaml +++ b/config/collections.yaml @@ -1,11 +1,11 @@ --- +collections: + - name: collection + available: true + accept_all_content: true + type: DATA_SET -- name: collection - available: true - accept_all_content: true - type: DATA_SET - - service_ids: - - inbox - - collection_management - - poll + service_ids: + - inbox + - collection_management + - poll diff --git a/config/services.yaml b/config/services.yaml index c995872..d758513 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -1,48 +1,48 @@ --- +services: + - id: inbox + type: inbox + address: /services/inbox + description: Inbox Service + destination_collection_required: yes + accept_all_content: no + authentication_required: yes + supported_content: + - urn:stix.mitre.org:xml:1.1.1 + - urn:stix.mitre.org:xml:1.2 + protocol_bindings: + - urn:taxii.mitre.org:protocol:http:1.0 + - urn:taxii.mitre.org:protocol:https:1.0 -- id: inbox - type: inbox - address: /services/inbox - description: Inbox Service - destination_collection_required: yes - accept_all_content: no - authentication_required: yes - supported_content: - - urn:stix.mitre.org:xml:1.1.1 - - urn:stix.mitre.org:xml:1.2 - protocol_bindings: - - urn:taxii.mitre.org:protocol:http:1.0 - - urn:taxii.mitre.org:protocol:https:1.0 + - id: discovery + type: discovery + address: /services/discovery + description: Discovery Service + advertised_services: + - inbox + - discovery + - collection_management + - poll + protocol_bindings: + - urn:taxii.mitre.org:protocol:http:1.0 + - urn:taxii.mitre.org:protocol:https:1.0 -- id: discovery - type: discovery - address: /services/discovery - description: Discovery Service - advertised_services: - - inbox - - discovery - - collection_management - - poll - protocol_bindings: - - urn:taxii.mitre.org:protocol:http:1.0 - - urn:taxii.mitre.org:protocol:https:1.0 + - id: collection_management + type: collection_management + address: /services/collection-management + description: Collection Management Service + protocol_bindings: + - urn:taxii.mitre.org:protocol:http:1.0 + - urn:taxii.mitre.org:protocol:https:1.0 -- id: collection_management - type: collection_management - address: /services/collection-management - description: Collection Management Service - protocol_bindings: - - urn:taxii.mitre.org:protocol:http:1.0 - - urn:taxii.mitre.org:protocol:https:1.0 - -- id: poll - type: poll - address: /services/poll - description: Poll Service - subscription_required: no - max_result_count: 100 - max_result_size: 10 - authentication_required: yes - protocol_bindings: - - urn:taxii.mitre.org:protocol:http:1.0 + - id: poll + type: poll + address: /services/poll + description: Poll Service + subscription_required: no + max_result_count: 100 + max_result_size: 10 + authentication_required: yes + protocol_bindings: + - urn:taxii.mitre.org:protocol:http:1.0