From 0880d18be0076179e15dc18ef087e34c2a64eeb2 Mon Sep 17 00:00:00 2001
From: kevin tessier <kevin@figureslibres.io>
Date: Mon, 15 Jul 2019 15:38:00 +0200
Subject: [PATCH] config ok

---
 .env               |  4 ++--
 .gitignore         |  6 +-----
 .gitmodules        | 10 ++--------
 docker-compose.yml |  4 ++--
 public_html        |  1 -
 5 files changed, 7 insertions(+), 18 deletions(-)
 delete mode 160000 public_html

diff --git a/.env b/.env
index f4b66f7..e8b8c7c 100644
--- a/.env
+++ b/.env
@@ -1,9 +1,9 @@
 COMPOSE_PROJECT_NAME=drupal
 
-PROJECT_ROOT=./public_html
+PROJECT_ROOT=./src
 LOG_ROOT=./log
 
-DB_IMPORTE_FILE=./ressources/materio_d8.sql
+DB_IMPORTE_FILE=./ressources/drupal.sql
 DB_ROOT_PASSWORD=drupal
 DB_NAME=drupal
 DB_USERNAME=drupal
diff --git a/.gitignore b/.gitignore
index 83278aa..4d92ea4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,3 @@
-public_html/*
-public_html_legacy/*
-drupal7/*
+src/*
 log/*
 *.sql
-bin/syncfiles.sh
-solr_cores/*
diff --git a/.gitmodules b/.gitmodules
index 57d5079..65e45dc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,3 @@
-[submodule "public_html_legacy"]
-	path = public_html_legacy
-	url = https://figureslibres.io/gogs/bachir/materio-base-d7.git
-[submodule "public_html"]
-	path = public_html
+[submodule "src"]
+	path = src
 	url = https://figureslibres.io/gogs/bachir/materio-d8.git
-[submodule "solr_cores"]
-	path = solr_cores
-	url = https://figureslibres.io/gogs/bachir/solr-materio-d8.git
diff --git a/docker-compose.yml b/docker-compose.yml
index d7880c4..28076ed 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -32,7 +32,7 @@ services:
       - 9000
     volumes:
       - php-root-data:/root
-      - "${PROJECT_ROOT}:/var/www/html/web"
+      - "${PROJECT_ROOT}:/var/www/html"
       - "${LOG_ROOT}/php:/var/log:rw"
     working_dir: "/var/www/html"
     networks:
@@ -59,7 +59,7 @@ services:
     ports:
       - 8890:80
     volumes:
-      - "${PROJECT_ROOT}:/var/www/html/web"
+      - "${PROJECT_ROOT}:/var/www/html/"
       - "${LOG_ROOT}:/var/log:rw"
     working_dir: "/var/www/html/web"
     networks:
diff --git a/public_html b/public_html
deleted file mode 160000
index 2639034..0000000
--- a/public_html
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 26390343d0f6eafc5219c9825286c25b2183daf0