diff --git a/.gitmodules b/.gitmodules index 253379e..26373ef 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "d7"] path = d7 - url = https://figureslibres.io/gogs/bachir/performance-art.fr.git + url = https://figureslibres.io/gogs/bachir/jeunes-et-engages-d7.git diff --git a/Docker/nginx/default.conf b/Docker/nginx/default.conf index 4d70b20..c70df51 100644 --- a/Docker/nginx/default.conf +++ b/Docker/nginx/default.conf @@ -1,8 +1,8 @@ server { listen 80; - root /var/www/html/performance-art.fr/public_html; + root /var/www/html/jeunesetengages.fr/public_html; index index.html index.php; - server_name dev.performance-art.fr; + server_name dev.jeunes-et-engages.fr; charset utf-8; @@ -39,8 +39,8 @@ server { server { listen 80; - root /var/www/html/performance-art.fr/static_html; - server_name static.performance-art.fr; + root /var/www/html/jeunesetengages.fr/static_html; + server_name static.jeunes-et-engages.fr; index index.html index.js index.css index.json index.woff index.ttf; # index.ico index.jpg index.png index.gif index.jpeg diff --git a/README.md b/README.md index ab44107..56b2e3d 100644 --- a/README.md +++ b/README.md @@ -40,8 +40,8 @@ configure your apache vhosts to add a reverse proxy that will redirect the dev.j ```apache ServerName dev.esadhar.fr - ProxyPass / http://127.0.0.1:8880/ - ProxyPassReverse / http://127.0.0.1:8880/ + ProxyPass / http://127.0.0.1:9880/ + ProxyPassReverse / http://127.0.0.1:9880/ ProxyRequests Off ProxyPreserveHost On proxy_buffer_size 128k; @@ -52,8 +52,8 @@ configure your apache vhosts to add a reverse proxy that will redirect the dev.j ```apache ServerName dev.phpmyadmin.jeunesetengages.fr - ProxyPass / http://127.0.0.1:8881/ - ProxyPassReverse / http://127.0.0.1:8881/ + ProxyPass / http://127.0.0.1:9881/ + ProxyPassReverse / http://127.0.0.1:9881/ ProxyRequests Off ProxyPreserveHost On proxy_buffer_size 128k; @@ -69,7 +69,7 @@ server { server_name dev.jeunesetengages.fr; location / { - proxy_pass http://127.0.0.1:8880; + proxy_pass http://127.0.0.1:9880; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; @@ -84,7 +84,7 @@ server { server_name dev.phpmyadmin.jeunesetengages.fr; location / { - proxy_pass http://127.0.0.1:8881; + proxy_pass http://127.0.0.1:9881; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; diff --git a/d7 b/d7 new file mode 160000 index 0000000..868629c --- /dev/null +++ b/d7 @@ -0,0 +1 @@ +Subproject commit 868629cbb2adae1a4145596aac35f5d2e6aa50ed diff --git a/docker-compose.yml b/docker-compose.yml index f111029..69ba2ab 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -49,7 +49,7 @@ services: phpmyadmin: image: phpmyadmin/phpmyadmin ports: - - 8991:80 + - 9991:80 networks: - database depends_on: @@ -60,7 +60,7 @@ services: nginx: build: ./Docker/nginx/ ports: - - 8990:80 + - 9990:80 volumes: - "${D7_ROOT}:/var/www/html/jeunesetengages.fr/public_html" - "${LOG_ROOT}:/var/log:rw"