diff --git a/Docker/nginx/default.conf b/Docker/nginx/default.conf index 890f252..9e59e3b 100644 --- a/Docker/nginx/default.conf +++ b/Docker/nginx/default.conf @@ -2,7 +2,7 @@ server { listen 80 default_server; root /var/www/html/popsucoloque.com/public_html/web; index index.html index.php; - server_name *.materio.com; + server_name *.popsucoloque.com; charset utf-8; diff --git a/Makefile b/Makefile index 80c69d4..345b565 100644 --- a/Makefile +++ b/Makefile @@ -41,3 +41,6 @@ exec_npm: exec_mysql: docker exec -it popsucoloque-mysql-1 bash + +dump_db: + docker exec popsucoloque-mysql-1 sh -c 'exec mysqldump -uroot -ppopsu colloque21' > ./ressources/colloque21-$(DATE_NOW)-local.sql diff --git a/app b/app index 33f8f97..a2659c0 160000 --- a/app +++ b/app @@ -1 +1 @@ -Subproject commit 33f8f97e1a433b2e28848eee6db43ec1e0297c85 +Subproject commit a2659c0754eb6cb7311f73c7b85ce0fb40cf7543