From 0a452d4d243c5018c0315b41866ba4d992452ad0 Mon Sep 17 00:00:00 2001
From: Eric Daras <dafal@MacBook-Pro-de-Eric-3.local>
Date: Wed, 17 Oct 2018 19:20:26 +0200
Subject: [PATCH] Adapt the proxy part to fit with the new naming et simplified
 db part

---
 docker-compose-nginx.yml                     | 65 ++++++++------------
 {misp-proxy => proxy}/Dockerfile             |  0
 {misp-proxy => proxy}/backend-not-found.html |  0
 {misp-proxy => proxy}/default.conf           |  2 +-
 {misp-proxy => proxy}/includes/proxy.conf    |  0
 {misp-proxy => proxy}/includes/ssl.conf      |  0
 {misp-proxy => proxy}/ssl/place_certs_here   |  0
 7 files changed, 25 insertions(+), 42 deletions(-)
 rename {misp-proxy => proxy}/Dockerfile (100%)
 rename {misp-proxy => proxy}/backend-not-found.html (100%)
 rename {misp-proxy => proxy}/default.conf (97%)
 rename {misp-proxy => proxy}/includes/proxy.conf (100%)
 rename {misp-proxy => proxy}/includes/ssl.conf (100%)
 rename {misp-proxy => proxy}/ssl/place_certs_here (100%)

diff --git a/docker-compose-nginx.yml b/docker-compose-nginx.yml
index 845c7ea..a02e108 100644
--- a/docker-compose-nginx.yml
+++ b/docker-compose-nginx.yml
@@ -3,59 +3,42 @@ version: '2'
 services:
   proxy:
     build:
-      context: misp-proxy
-    container_name: misp-proxy
-    depends_on:
-      - misp-web
-    hostname: misp-proxy
+      context: proxy
+    container_name: proxy
+    restart: unless-stopped
     image: misp-proxy:latest
-    networks:
-      - misp-network
     ports:
-      - 81:80
+      - 80:80
       - 4443:443
 
-  misp-web:
-    build: misp-web
-    depends_on:
-      - misp-db
-    container_name: misp-web
-    hostname: misp-web
-    image: misp-web:latest
-    restart: always
-    networks:
-      - misp-network
-    links:
-      - misp-db
+  web:
+    build: web
+    container_name: misp_web
+    image: misp:latest
+    restart: unless-stopped
     volumes:
       - /dev/urandom:/dev/random
-      - /data/misp:/var/www/MISP
+      - /data/misp/web:/var/www/MISP
     environment:
-      - MYSQL_ROOT_PASSWORD=xxxxxxxx
-      - MYSQL_MISP_PASSWORD=xxxxxxxx
-      - MYSQL_HOST=misp-db
+      - MYSQL_HOST=db
+      - MYSQL_DATABASE=misp
+      - MYSQL_USER=misp
+      - MYSQL_PASSWORD=misp
       - MISP_ADMIN_EMAIL=admin@admin.test
-      - MISP_ADMIN_PASSPHRASE=xxxxxxxxx
+      - MISP_ADMIN_PASSPHRASE=admin
       - MISP_BASEURL=http:\/\/misp\.test
       - POSTFIX_RELAY_HOST=relay.fqdn
       - TIMEZONE=Europe/Brussels
 
-  misp-db:
-    build: 
-      context: misp-db
-      args:
-        MYSQL_MISP_PASSWORD: xxxxxxxx
-    container_name: misp-db
-    hostname: misp-db
-    image: misp-db:latest
-    restart: always
-    networks:
-      - misp-network
+  db:
+    container_name: misp_db
+    image: mysql/mysql-server:5.7
+    restart: unless-stopped
     volumes:
-      - /data/mysql:/var/lib/mysql
+      - /data/misp/db:/var/lib/mysql
     environment:
-      - MYSQL_ROOT_PASSWORD=xxxxxxxx
+      - MYSQL_DATABASE=misp
+      - MYSQL_USER=misp
+      - MYSQL_PASSWORD=misp
+      - MYSQL_ROOT_PASSWORD=misp
 
-networks:
-  misp-network:
-    driver: bridge
diff --git a/misp-proxy/Dockerfile b/proxy/Dockerfile
similarity index 100%
rename from misp-proxy/Dockerfile
rename to proxy/Dockerfile
diff --git a/misp-proxy/backend-not-found.html b/proxy/backend-not-found.html
similarity index 100%
rename from misp-proxy/backend-not-found.html
rename to proxy/backend-not-found.html
diff --git a/misp-proxy/default.conf b/proxy/default.conf
similarity index 97%
rename from misp-proxy/default.conf
rename to proxy/default.conf
index 13dd9fa..b266ee1 100644
--- a/misp-proxy/default.conf
+++ b/proxy/default.conf
@@ -2,7 +2,7 @@
 server {
     listen 80;
     listen 443 ssl http2;
-    server_name misp.test;
+    server_name web;
 
     if ($scheme != "https") {
     	rewrite ^ https://$host$uri permanent;
diff --git a/misp-proxy/includes/proxy.conf b/proxy/includes/proxy.conf
similarity index 100%
rename from misp-proxy/includes/proxy.conf
rename to proxy/includes/proxy.conf
diff --git a/misp-proxy/includes/ssl.conf b/proxy/includes/ssl.conf
similarity index 100%
rename from misp-proxy/includes/ssl.conf
rename to proxy/includes/ssl.conf
diff --git a/misp-proxy/ssl/place_certs_here b/proxy/ssl/place_certs_here
similarity index 100%
rename from misp-proxy/ssl/place_certs_here
rename to proxy/ssl/place_certs_here