From a7153fd1d9ec0326125b211fb47e17825229803f Mon Sep 17 00:00:00 2001 From: Moshe Malka Date: Thu, 25 Jul 2019 18:01:02 +0300 Subject: [PATCH 1/3] add .env file for environment variables --- .gitignore | 1 + template.env | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 .gitignore create mode 100644 template.env diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4c49bd7 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.env diff --git a/template.env b/template.env new file mode 100644 index 0000000..d2d4fb9 --- /dev/null +++ b/template.env @@ -0,0 +1,13 @@ +MYSQL_HOST=db +MYSQL_DATABASE=misp +MYSQL_USER=misp +MYSQL_PASSWORD=misp + +MISP_ADMIN_EMAIL=admin@admin.test +MISP_ADMIN_PASSPHRASE=admin +MISP_BASEURL=localhost + +POSTFIX_RELAY_HOST="relay.fqdn" +TIMEZONE="Europe/Brussels" + +DATA_DIR="./data" \ No newline at end of file From f785ecac4bd16ee82d2597b6b1bc79490f9875cc Mon Sep 17 00:00:00 2001 From: Moshe Malka Date: Thu, 25 Jul 2019 18:02:19 +0300 Subject: [PATCH 2/3] use .env file instead of hardcoded environment variables in the yml file --- .gitignore | 1 + README.md | 10 ++-------- docker-compose-nginx.yml | 30 +++++++++++++++--------------- docker-compose.yml | 30 +++++++++++++++--------------- template.env | 7 ++++--- 5 files changed, 37 insertions(+), 41 deletions(-) diff --git a/.gitignore b/.gitignore index 4c49bd7..fb58dee 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ .env +data diff --git a/README.md b/README.md index 4736b63..bd0b1ea 100644 --- a/README.md +++ b/README.md @@ -34,14 +34,8 @@ $ git clone https://github.com/MISP/misp-docker $ cd misp-docker ``` ## Fix your environment -Edit the docker-compose.yml and change the following environment variables: -* MYSQL_DATABASE -* MYSQL_USER -* MYSQL_PASSWORD -* MYSQL_ROOT_PASSWORD -* MYSQL_MISP_PASSWORD -* MISP_ADMIN_PASSPHRASE -* Changed the volumes to match your local filesystem +Copy template.env to .env (on the root directory) and edit the environment variables at .env file + ## Build the containers ``` diff --git a/docker-compose-nginx.yml b/docker-compose-nginx.yml index a02e108..ddc8394 100644 --- a/docker-compose-nginx.yml +++ b/docker-compose-nginx.yml @@ -18,27 +18,27 @@ services: restart: unless-stopped volumes: - /dev/urandom:/dev/random - - /data/misp/web:/var/www/MISP + - ${DATA_DIR}/web:/var/www/MISP environment: - - MYSQL_HOST=db - - MYSQL_DATABASE=misp - - MYSQL_USER=misp - - MYSQL_PASSWORD=misp - - MISP_ADMIN_EMAIL=admin@admin.test - - MISP_ADMIN_PASSPHRASE=admin - - MISP_BASEURL=http:\/\/misp\.test - - POSTFIX_RELAY_HOST=relay.fqdn - - TIMEZONE=Europe/Brussels + - MYSQL_HOST=${MYSQL_HOST} + - MYSQL_DATABASE=${MYSQL_DATABASE} + - MYSQL_USER=${MYSQL_USER} + - MYSQL_PASSWORD=${MYSQL_PASSWORD} + - MISP_ADMIN_EMAIL=${MISP_ADMIN_EMAIL} + - MISP_ADMIN_PASSPHRASE=${MISP_ADMIN_PASSPHRASE} + - MISP_BASEURL=${MISP_BASEURL} + - POSTFIX_RELAY_HOST=${POSTFIX_RELAY_HOST} + - TIMEZONE=${TIMEZONE} db: container_name: misp_db image: mysql/mysql-server:5.7 restart: unless-stopped volumes: - - /data/misp/db:/var/lib/mysql + - ${DATA_DIR}/db:/var/lib/mysql environment: - - MYSQL_DATABASE=misp - - MYSQL_USER=misp - - MYSQL_PASSWORD=misp - - MYSQL_ROOT_PASSWORD=misp + - MYSQL_DATABASE=${MYSQL_DATABASE} + - MYSQL_USER=${MYSQL_USER} + - MYSQL_PASSWORD=${MYSQL_PASSWORD} + - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} diff --git a/docker-compose.yml b/docker-compose.yml index 4c22823..e6a5001 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,26 +10,26 @@ services: - "80:80" volumes: - /dev/urandom:/dev/random - - /data/misp/web:/var/www/MISP + - ${DATA_DIR}/web:/var/www/MISP environment: - - MYSQL_HOST=db - - MYSQL_DATABASE=misp - - MYSQL_USER=misp - - MYSQL_PASSWORD=misp - - MISP_ADMIN_EMAIL=admin@admin.test - - MISP_ADMIN_PASSPHRASE=admin - - MISP_BASEURL=http:\/\/misp\.test - - POSTFIX_RELAY_HOST=relay.fqdn - - TIMEZONE=Europe/Brussels + - MYSQL_HOST=${MYSQL_HOST} + - MYSQL_DATABASE=${MYSQL_DATABASE} + - MYSQL_USER=${MYSQL_USER} + - MYSQL_PASSWORD=${MYSQL_PASSWORD} + - MISP_ADMIN_EMAIL=${MISP_ADMIN_EMAIL} + - MISP_ADMIN_PASSPHRASE=${MISP_ADMIN_PASSPHRASE} + - MISP_BASEURL=${MISP_BASEURL} + - POSTFIX_RELAY_HOST=${POSTFIX_RELAY_HOST} + - TIMEZONE=${TIMEZONE} db: container_name: misp_db image: mysql/mysql-server:5.7 restart: unless-stopped volumes: - - /data/misp/db:/var/lib/mysql + - ${DATA_DIR}/db:/var/lib/mysql environment: - - MYSQL_DATABASE=misp - - MYSQL_USER=misp - - MYSQL_PASSWORD=misp - - MYSQL_ROOT_PASSWORD=misp + - MYSQL_DATABASE=${MYSQL_DATABASE} + - MYSQL_USER=${MYSQL_USER} + - MYSQL_PASSWORD=${MYSQL_PASSWORD} + - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} diff --git a/template.env b/template.env index d2d4fb9..11aec41 100644 --- a/template.env +++ b/template.env @@ -2,12 +2,13 @@ MYSQL_HOST=db MYSQL_DATABASE=misp MYSQL_USER=misp MYSQL_PASSWORD=misp +MYSQL_ROOT_PASSWORD=misp MISP_ADMIN_EMAIL=admin@admin.test MISP_ADMIN_PASSPHRASE=admin MISP_BASEURL=localhost -POSTFIX_RELAY_HOST="relay.fqdn" -TIMEZONE="Europe/Brussels" +POSTFIX_RELAY_HOST=relay.fqdn +TIMEZONE=Europe/Brussels -DATA_DIR="./data" \ No newline at end of file +DATA_DIR=./data \ No newline at end of file From 7c9164ad692a8080997c20d3ad1d3f91527ed43e Mon Sep 17 00:00:00 2001 From: Moshe Malka Date: Sun, 28 Jul 2019 10:05:04 +0300 Subject: [PATCH 3/3] no need for db host in env file --- docker-compose-nginx.yml | 2 +- docker-compose.yml | 2 +- template.env | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/docker-compose-nginx.yml b/docker-compose-nginx.yml index ddc8394..0c21461 100644 --- a/docker-compose-nginx.yml +++ b/docker-compose-nginx.yml @@ -20,7 +20,7 @@ services: - /dev/urandom:/dev/random - ${DATA_DIR}/web:/var/www/MISP environment: - - MYSQL_HOST=${MYSQL_HOST} + - MYSQL_HOST=db - MYSQL_DATABASE=${MYSQL_DATABASE} - MYSQL_USER=${MYSQL_USER} - MYSQL_PASSWORD=${MYSQL_PASSWORD} diff --git a/docker-compose.yml b/docker-compose.yml index e6a5001..e7b3c67 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,7 +12,7 @@ services: - /dev/urandom:/dev/random - ${DATA_DIR}/web:/var/www/MISP environment: - - MYSQL_HOST=${MYSQL_HOST} + - MYSQL_HOST=db - MYSQL_DATABASE=${MYSQL_DATABASE} - MYSQL_USER=${MYSQL_USER} - MYSQL_PASSWORD=${MYSQL_PASSWORD} diff --git a/template.env b/template.env index 11aec41..f23d46b 100644 --- a/template.env +++ b/template.env @@ -1,4 +1,3 @@ -MYSQL_HOST=db MYSQL_DATABASE=misp MYSQL_USER=misp MYSQL_PASSWORD=misp