diff --git a/.env b/.env index dbefe7a..7cb73b7 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ -COMPOSE_PROJECT_NAME=popsu +COMPOSE_PROJECT_NAME=rorschach PROJECT_ROOT=./src LOG_ROOT=./log diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..c1e62a7 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "src"] + path = src + url = https://figureslibres.io/gogs/bachir/drupal-rorschach.git diff --git a/Docker/nginx/default.conf b/Docker/nginx/default.conf index 658aafa..20a59e3 100644 --- a/Docker/nginx/default.conf +++ b/Docker/nginx/default.conf @@ -1,46 +1,8 @@ server { listen 80; - root /var/www/d7; + root /var/www/rorschach/web; index index.html index.php; - server_name dev.d7.popsu.archi.fr; - - charset utf-8; - - location / { - try_files $uri $uri/ /index.php?$query_string; - } - - location = /favicon.ico { access_log off; log_not_found off; } - location = /robots.txt { access_log off; log_not_found off; } - - access_log on; - error_log /var/log/nginx/error-d7.log error; - - sendfile off; - - client_max_body_size 100m; - - location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php_d7:9000; - fastcgi_index index.php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_intercept_errors off; - fastcgi_buffer_size 16k; - fastcgi_buffers 4 16k; - } - - location ~ /\.ht { - deny all; - } -} - -server { - listen 80; - root /var/www/d9/web; - index index.html index.php; - server_name dev.d9.popsu.archi.fr; + server_name dev.rorschach.fr; charset utf-8; @@ -60,7 +22,7 @@ server { location ~ \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php_d9:9000; + fastcgi_pass php:9000; fastcgi_index index.php; include fastcgi_params; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; diff --git a/Makefile b/Makefile index 5acd7c4..16a9495 100644 --- a/Makefile +++ b/Makefile @@ -58,7 +58,10 @@ cr: pag: docker exec rorschach-php-1 /bin/bash -c "drush pag all canonical_entities:node && drush pag all canonical_entities:taxonomy_term" -restart: +restart_nginx: + docker-compose restart nginx + +restart_php: docker-compose restart php down: diff --git a/src b/src new file mode 160000 index 0000000..c1c8dea --- /dev/null +++ b/src @@ -0,0 +1 @@ +Subproject commit c1c8dead42ab774e5ce59359afb81ef17b2c5ebc