From 50e0cec2b88973c25ac86a0bc4926a5341bf0ad5 Mon Sep 17 00:00:00 2001
From: Hannah Ward <Hannah.ward9001@gmail.com>
Date: Wed, 28 Dec 2016 11:04:30 +0000
Subject: [PATCH] =?UTF-8?q?Added=20travis-specific=20config=E2=90=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .travis.yml               |  2 +-
 config/config.travis.yaml | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 config/config.travis.yaml

diff --git a/.travis.yml b/.travis.yml
index 9d0a2a5..92845d4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ services:
     - mysql
 
 env:
-    - OPENTAXII_CONFIG=$TRAVIS_BUILD_DIR/config/config.yaml URL="http://ec2-52-42-201-6.us-west-2.compute.amazonaws.com" APIKEY=Vjy0ra7wO6w6si7hbjxX52nARfVpaAO6Tm6lxeSm
+    - OPENTAXII_CONFIG=$TRAVIS_BUILD_DIR/config/config.travis.yaml URL="http://ec2-52-42-201-6.us-west-2.compute.amazonaws.com" APIKEY=Vjy0ra7wO6w6si7hbjxX52nARfVpaAO6Tm6lxeSm
 
 before_install:
     - sudo apt-get install mysql-server-5.6 mysql-client-core-5.6 mysql-client-5.6
diff --git a/config/config.travis.yaml b/config/config.travis.yaml
new file mode 100644
index 0000000..17df4a8
--- /dev/null
+++ b/config/config.travis.yaml
@@ -0,0 +1,35 @@
+---
+domain: "localhost:9000"
+support_basic_auth: yes
+
+persistence_api:
+  class: opentaxii.persistence.sqldb.SQLDatabaseAPI
+  parameters:
+    db_connection: mysql://taxii:some_password@localhost/taxiipersist
+    create_tables: yes
+
+auth_api:
+  class: opentaxii.auth.sqldb.SQLDatabaseAPI
+  parameters:
+    db_connection: mysql://taxii:some_password@localhost/taxiiauth
+    create_tables: yes
+    secret: ILoveTheSecretStringIsIsGreatButNeedsToBeChangedFrienderino
+
+logging:
+  opentaxii: info
+  root: info
+
+hooks: misp_taxii_hooks.hooks
+# Sample configuration for misp_taxii_server
+
+zmq:
+    host: localhost
+    port: 50000
+
+taxii:
+    auth:
+        username: root
+        password: root
+misp:
+    url: "http://ec2-52-42-201-6.us-west-2.compute.amazonaws.com"
+    api: Vjy0ra7wO6w6si7hbjxX52nARfVpaAO6Tm6lxeSm