MISP
/
misp-docker
mirror of https://github.com/MISP/misp-docker
2
0
Fork 0
Code Issues Releases Wiki Activity
152 Commits
2 Branches
0 Tags
3.3 MiB
Commit Graph

152 Commits (ec74503c97a056e57603d06f196e14a5a33215a3)

Author SHA1 Message Date
Alexandre Dulaunoy ec74503c97
Merge pull request #110 from ckane/fix-baseurl 
Fix bug in patching the MISP.baseurl from environment
 2021-03-07 23:00:57 +01:00
Coleman Kane 46b2cc37bd Fix bug in patching the MISP.baseurl from environment 
The web/run.sh script was using a sed command that had two defects,
preventing the MISP_BASEURL environment from setting the MISP.baseurl
in config.php:
 - pattern used '/' as boundaries, making it incompatible with a baseurl
   containing that character
 - pattern assumed 1 space between 'baseurl' and '=>', but the
   config.php has multiple whitespace/tabs, so broadened the pattern to
   support any arbitrary length whitespace there

Signed-off-by: Coleman Kane <ckane@colemankane.org>
 2021-03-06 13:10:36 -05:00
Alexandre Dulaunoy f85912450a
Merge pull request #99 from cudeso/master 
Fixate to misp-modules 2.4.134
 2020-12-04 20:23:02 +01:00
Koen Van Impe 65b2930943 Create certificates for nginx 2020-12-04 18:13:45 +01:00
Koen Van Impe 9e6844ba29 Fixate to misp-modules 2.4.134 
Avoid running into https://github.com/MISP/misp-modules/issues/453 ; which blocks deployment of Docker container.
 2020-12-04 14:35:54 +01:00
Alexandre Dulaunoy fe086412b3
Merge pull request #97 from itzdan/patch-1 
Update Dockerfile
 2020-11-22 08:38:23 +01:00
itzdan f06bd47cd8
Update Dockerfile 
Added fixes to py dependencies
 2020-11-22 12:03:05 +11:00
Alexandre Dulaunoy 33791f72b4
Merge pull request #95 from helinko/fix-nginx-conf 
Fix nginx config
 2020-11-16 08:52:00 +01:00
Risto Helinko adba998972 Rename proxy container to prevent clashes 2020-11-09 19:39:02 +02:00
Risto Helinko b086a7a40d Remove default block from nginx config 2020-11-09 19:38:54 +02:00
Risto Helinko 580ec9f6d3 Explicit redirect to https instead of rewrite rule 2020-11-09 19:21:16 +02:00
Risto Helinko fae0b276b3 Bump nginx 1.9->1.18 2020-11-09 19:21:10 +02:00
Risto Helinko 1c92f43fd2 Use port 443 instead of 4443 2020-11-09 19:21:03 +02:00
Risto Helinko d48d0b8c47 Add certs to .gitignore 2020-11-09 19:20:35 +02:00
Alexandre Dulaunoy 9038d50eda
Merge pull request #93 from stevengoossensB/revert-79-master 
Revert "Create the database"
 2020-11-09 10:45:49 +01:00
Steven Goossens 4a694a36d9
Merge branch 'patch-1' into revert-79-master 2020-11-09 09:21:51 +01:00
Steven Goossens 6fb99b2a4d
Update default.conf 
Changed redirect from misp_web to web
 2020-11-04 16:54:27 +01:00
Steven Goossens 813137488c
Update run.sh 
sed inline replace should end with /g
 2020-11-04 15:34:58 +01:00
Steven Goossens 6881936464
Update web/Dockerfile to upgrade pip 
pip has an old version, which makes that the installation fails.

Co-authored-by: Risto Helinko <risto@helinko.com>
 2020-10-29 09:09:24 +01:00
Steven Goossens 2b4719806f
Revert "Create the database" 2020-10-21 13:47:56 +02:00
Steven Goossens f8f920c985
Update script to run 2020-07-30 22:42:15 +02:00
Alexandre Dulaunoy 14fbecf1c9
Merge pull request #86 from jscoupreman/master 
Fix matching misp_web container name
 2020-07-08 11:51:06 +02:00
Alexandre Dulaunoy ea5f3cc705
Merge pull request #79 from stevengoossensB/master 
Create the database
 2020-07-08 11:50:40 +02:00
Steven Goossens 8757f061e2
Expose port 443 2020-07-08 11:37:23 +02:00
Steven Goossens d7215e65e3
Update run.sh to work with all-in-one MISP 2020-07-08 11:35:53 +02:00
Steven Goossens 14d6209040
Make sure to only replace the right checkInstaller 2020-07-08 11:17:05 +02:00
Steven Goossens 352ed8db01
Remove check installer 2020-07-07 15:57:07 +02:00
Steven Goossens 932a164ddf
Apt install sudo 2020-07-07 15:37:45 +02:00
Steven Goossens 4a7eb543bc
Remove output redirects from install script 2020-07-07 09:41:48 +02:00
Steven Goossens 210cf33c57
Added -y to apt commands 2020-07-06 09:11:59 +02:00
Steven Goossens d5675b34aa
Add apt update 2020-07-06 09:04:12 +02:00
Steven Goossens a046ceeb39
Install wget to get the download script :) 2020-07-06 00:21:31 +02:00
Steven Goossens 48d8c9d8f0
Update dockerfile to just run the install script 2020-07-05 23:57:35 +02:00
Steven Goossens a2e4834db1
Bump ubuntu version to focal 2020-07-05 23:39:53 +02:00
Steven Goossens f90a3c493c
Update run.sh 
Do a git pull when it's not the first boot, to ensure we're working on the latest version
 2020-07-05 23:14:41 +02:00
Steven Goossens c88358e9bf
Change docker image used 2020-06-01 22:14:42 +02:00
Steven Goossens 05cb030a26
Update so reboot pulls the newest code 
Added a git pull in case it's not a first boot.
 2020-06-01 22:05:32 +02:00
jscoupreman 542da7de26
Fix match misp_web container name 2020-03-15 22:17:29 +01:00
stevengoossensB ec5905489e
Change SSH port number to 2222 2020-02-10 22:33:00 +01:00
stevengoossensB 2c12d2165e
Add startup of sshd daemon 2020-02-10 21:58:22 +01:00
stevengoossensB 923b6278ee
Typo fix 2020-02-10 19:53:30 +01:00
stevengoossensB ae4c6b5802
Adding SSH for Ubuntu 2020-02-10 19:29:17 +01:00
stevengoossensB 554ff2079f
sshd_config 2020-02-10 19:13:52 +01:00
stevengoossensB a3c29f91f8
SSH settings for Azure 
Add SSH settings so Azure can SSH into the container
 2020-02-10 19:13:13 +01:00
stevengoossensB 7f31c985e3
Typo fixed 2020-02-07 10:54:48 +01:00
stevengoossensB b4176674fd
Add check whether database exists 
Check whether the MISP database exists, if not, create it.
 2020-02-07 09:39:51 +01:00
stevengoossensB 94c43c62b8
Update run.sh 
Initial connection can't be to specific database, since that doesn't exist yet
 2020-02-06 12:49:50 +01:00
Alexandre Dulaunoy 431ef652b7
Merge pull request #77 from cybermaggedon/add-http-healthcheck-endpoint 
Add a healthcheck endpoint
 2020-01-30 07:04:50 +01:00
Mark Adams a4397f7298 Add a healthcheck endpoint: /healthcheck returns status 200, 'ok' payload. 2020-01-28 11:22:06 -08:00
Alexandre Dulaunoy 3a3ed2ee59
Merge pull request #75 from s3curetty/master 
Fixed redis exiting
 2020-01-23 13:08:53 +01:00