Commit Graph

58 Commits (d68d0bab35f26ce1fdfbf49ead621c34994a4f4e)

Author SHA1 Message Date
Hannah Ward d68d0bab35
fix: Remove print 2017-06-14 14:16:20 +01:00
Hannah Ward 344ca1c8f5 Merge branch 'master' of github.com:MISP/MISP-Taxii-Server 2017-06-14 13:52:41 +01:00
Hannah Ward cef25438ea
new: Add dupe checking 2017-06-14 13:52:29 +01:00
Hannah Ward 5680cc982d Merge pull request #7 from RichieB2B/ncsc-nl/install
Some additional install instructions
2017-06-01 15:16:18 +01:00
Hannah Ward 3e36ffd1d4 Merge pull request #8 from RichieB2B/ncsc-nl/fix-zmq
Bring ZeroMQ in line with the use of ZMQ topics in MISP 2.4.75
2017-06-01 15:15:26 +01:00
Richard van den Berg 8832e67c53 Bring ZeroMQ in line with the use of ZMQ topics in MISP 2.4.75 2017-06-01 16:12:54 +02:00
Richard van den Berg b5bdb33c38 Some additional install instructions 2017-05-30 14:00:59 +02:00
Hannah Ward 783a1e9936
fix: Variable name was wrong
fixes #6
2017-05-22 16:45:06 +01:00
Hannah Ward 84d1693261 fix: Allow not checking SSL stuffs 2017-05-12 22:15:40 +01:00
Hannah Ward 8aa64b08a2
fix: Point submodule to own fork 2017-05-10 15:37:39 +01:00
Hannah Ward 7739699737
new: Allow cert-based auth 2017-04-07 10:22:05 +01:00
Hannah Ward f71827b555
fix: typo in readme 2017-03-31 12:45:56 +01:00
Hannah Ward 70cb220933
chg: Spell check readme 2017-03-31 10:45:28 +01:00
Hannah Ward 84b06f528b
chg: Modified readme to include new instructions 2017-03-31 10:44:41 +01:00
Hannah Ward 6983711ae8
new: Add taxii poll to scripts 2017-03-31 10:41:14 +01:00
Hannah Ward 8de5fea75f
chg: Update basic config 2017-03-31 10:35:43 +01:00
Hannah Ward a69f5506a9
fix: Typo in script name 2017-03-31 10:33:15 +01:00
Hannah Ward 1379a35428
new: Install remote server script to BINPATH 2017-03-31 10:32:45 +01:00
Hannah Ward b38073a880
new: Push to one or many collections 2017-03-31 10:24:32 +01:00
Hannah Ward 033c37a446
new: Poll seems to work 2017-03-31 10:11:36 +01:00
Hannah Ward c4c11f525d
new: Add connection confirmation 2017-03-30 17:29:41 +01:00
Hannah Ward 12a51ff9e9
new: added connection test to local server 2017-03-30 17:18:33 +01:00
Hannah Ward 79dc58a0af
new: Added local/remote server configs 2017-03-30 16:31:50 +01:00
Hannah Ward b17c60f85a
new: added configurable collection polling 2017-03-30 16:27:25 +01:00
Hannah Ward c4d1463577
new: added basic auth, polling 2017-03-30 16:26:46 +01:00
Hannah Ward 5481ba4902
fix: Set server name to a key 2017-03-30 14:52:38 +01:00
Hannah Ward 349ff738cb
chg: Default discovery_path to None 2017-03-30 13:57:36 +01:00
Hannah Ward 6ebd5c3eef
new: Added server install script 2017-03-30 13:56:25 +01:00
Hannah Ward 080c2d41e7
fix: Update opentaxii version 2017-03-29 11:57:49 +01:00
Hannah Ward 28d8c7a018
fix: Removed duplicate checking - sometimes it just wouldn't upload 2017-01-16 16:10:46 +00:00
Hannah Ward ffba0c5c73
fix: This time misp won't kill itself for low memory ;) 2017-01-13 14:08:41 +00:00
Hannah Ward bb6f8ef2ba
fix: Re-installed database on test instance 2017-01-10 14:53:10 +00:00
Hannah Ward 2949a52612
fix: Updated travis configuration to point to new test server 2017-01-10 10:00:13 +00:00
Hannah Ward 0fbdac0890
Because config dir 2016-12-28 11:10:31 +00:00
Hannah Ward 50e0cec2b8
Added travis-specific config␏ 2016-12-28 11:04:30 +00:00
Hannah Ward 0e9f39a37d
Should fix travis 2016-12-28 11:02:26 +00:00
Hannah Ward ffef0d0bad
Version bump 2016-12-28 10:53:56 +00:00
Hannah Ward bd6be3680d
Updated readme 2016-12-28 10:53:45 +00:00
Hannah Ward 8b046d7348
2 way comms achieved! 2016-12-28 10:51:43 +00:00
Hannah Ward dfa2dbc6af
No tempfiles! 2016-11-23 15:31:56 +00:00
Hannah Ward eb292b3cba
Moved to env-var based system 2016-11-23 12:16:30 +00:00
Hannah Ward 209e4f1a29
Updated readme URL to MISP 2016-11-19 15:53:27 +00:00
Hannah Ward c5b46f9aba
Updated readme to have travis build status 2016-11-19 15:45:47 +00:00
Hannah Ward 0c20984a54
Squashed commit of the following:
commit 3389560fe9
Author: Hannah Ward <Hannah.ward9001@gmail.com>
Date:   Sat Nov 19 15:38:11 2016 +0000

    Removed unicode things

commit 060f94f565
Author: Hannah Ward <Hannah.ward9001@gmail.com>
Date:   Fri Nov 18 16:10:28 2016 +0000

    Apparently output goes to stderr?

commit b41109dd9e
Author: Hannah Ward <Hannah.ward9001@gmail.com>
Date:   Fri Nov 18 16:01:39 2016 +0000

    127 not localhost?

commit 77c45273b0
Author: Hannah Ward <Hannah.ward9001@gmail.com>
Date:   Fri Nov 18 15:54:12 2016 +0000

    Allow server time to start up

commit ee06ff0765
Author: Hannah Ward <Hannah.ward9001@gmail.com>
Date:   Fri Nov 18 15:48:38 2016 +0000

    sudo sudo

commit 9f0f31c023
Author: Hannah Ward <Hannah.ward9001@gmail.com>
Date:   Fri Nov 18 15:47:45 2016 +0000

    Move sql install to before_install

commit 51b49dc176
Author: Hannah Ward <Hannah.ward9001@gmail.com>
Date:   Fri Nov 18 15:46:02 2016 +0000

    Fixed a typo

commit 2b90620b4c
Author: Hannah Ward <Hannah.ward9001@gmail.com>
Date:   Fri Nov 18 15:45:10 2016 +0000

    Mysql pls

commit 7f4e2b9f62
Author: Hannah Ward <Hannah.ward9001@gmail.com>
Date:   Fri Nov 18 15:42:32 2016 +0000

    Switch to trusty travis

commit 64e39b7983
Author: Hannah Ward <Hannah.ward9001@gmail.com>
Date:   Fri Nov 18 15:35:31 2016 +0000

    Switch to trusty travis

commit 4468564860
Author: Hannah Ward <Hannah.ward9001@gmail.com>
Date:   Fri Nov 18 15:30:30 2016 +0000

    Stop being a tard

commit 0a9f534fa7
Author: Hannah Ward <Hannah.ward9001@gmail.com>
Date:   Fri Nov 18 15:28:04 2016 +0000

    Check mysql version

commit 887a6d82a7
Author: Hannah Ward <Hannah.ward9001@gmail.com>
Date:   Fri Nov 18 15:17:26 2016 +0000

    Print a bit of debug info
2016-11-19 15:42:54 +00:00
Hannah Ward 53302f36e3
Ok ok I installed the deps in the right order this time 2016-11-18 14:59:30 +00:00
Hannah Ward c19d0eedf7
Added mysqlpython as a dep 2016-11-18 14:55:28 +00:00
Hannah Ward 442760906c
Actually run the server travis please 2016-11-18 14:48:46 +00:00
Hannah Ward 129bc4b85d
Fixed travis trying to run like 15 builds 2016-11-18 14:45:01 +00:00
Hannah Ward 0464921b0e
Don't bother pushing if we've no attributes 2016-11-18 14:42:53 +00:00
Hannah Ward 0647e27385
Added rudimentary duplicate checking 2016-11-18 14:42:17 +00:00