From 1238177d1d6aa2f9761fc092089fc90330e9add4 Mon Sep 17 00:00:00 2001 From: Bachir Soussi Chiadmi Date: Mon, 29 Apr 2019 17:40:57 +0200 Subject: [PATCH] reinstalled drupal core using composer-drupal/drupal-project --- .env | 2 +- .gitignore | 2 ++ .gitmodules | 4 ++-- Docker/nginx/default.conf | 2 +- public_html | 1 - src/.gitkeep | 0 6 files changed, 6 insertions(+), 5 deletions(-) delete mode 160000 public_html create mode 100644 src/.gitkeep diff --git a/.env b/.env index bfe417e..ae635a1 100644 --- a/.env +++ b/.env @@ -1,6 +1,6 @@ COMPOSE_PROJECT_NAME=edlpd8 -PROJECT_ROOT=./public_html +PROJECT_ROOT=./src LEGACY_ROOT=./drupal6 LOG_ROOT=./log diff --git a/.gitignore b/.gitignore index d7db69b..affa799 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ public_html/* +src/* drupal6/* log/* *.sql +*.back diff --git a/.gitmodules b/.gitmodules index 125d925..fca2182 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "public_html"] - path = public_html +[submodule "src"] + path = src url = https://figureslibres.io/gogs/bachir/edlp_d8.git diff --git a/Docker/nginx/default.conf b/Docker/nginx/default.conf index 2fdc2bc..ce2967b 100644 --- a/Docker/nginx/default.conf +++ b/Docker/nginx/default.conf @@ -1,6 +1,6 @@ server { listen 80 default_server; - root /var/www/html; + root /var/www/html/web; index index.html index.php; server_name *.encyclopediedelaparole.org; diff --git a/public_html b/public_html deleted file mode 160000 index 1e009f8..0000000 --- a/public_html +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1e009f88bfc6e781376f3fe87f29c260ff043a20 diff --git a/src/.gitkeep b/src/.gitkeep new file mode 100644 index 0000000..e69de29