bachir/docker-jeunesetengages
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

it's working

Browse Source
This commit is contained in:
bachir
2022-04-29 16:54:31 +02:00
parent 1e42babd80
commit e6d42ad7b5
5 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitmodules
+1 -1
View File
@@ -1,3 +1,3 @@
[submodule "d7"] [submodule "d7"]
path = d7 path = d7
url = https://figureslibres.io/gogs/bachir/performance-art.fr.git url = https://figureslibres.io/gogs/bachir/jeunes-et-engages-d7.git
Docker/nginx/default.conf
+4 -4
View File
@@ -1,8 +1,8 @@
server { server {
listen 80; listen 80;
root /var/www/html/performance-art.fr/public_html; root /var/www/html/jeunesetengages.fr/public_html;
index index.html index.php; index index.html index.php;
server_name dev.performance-art.fr; server_name dev.jeunes-et-engages.fr;
charset utf-8; charset utf-8;
@@ -39,8 +39,8 @@ server {
server { server {
listen 80; listen 80;
root /var/www/html/performance-art.fr/static_html; root /var/www/html/jeunesetengages.fr/static_html;
server_name static.performance-art.fr; 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 index index.html index.js index.css index.json index.woff index.ttf; # index.ico index.jpg index.png index.gif index.jpeg
README.md
+6 -6
View File
@@ -40,8 +40,8 @@ configure your apache vhosts to add a reverse proxy that will redirect the dev.j
```apache ```apache
<Virtualhost *:80> <Virtualhost *:80>
ServerName dev.esadhar.fr ServerName dev.esadhar.fr
ProxyPass / http://127.0.0.1:8880/ ProxyPass / http://127.0.0.1:9880/
ProxyPassReverse / http://127.0.0.1:8880/ ProxyPassReverse / http://127.0.0.1:9880/
ProxyRequests Off ProxyRequests Off
ProxyPreserveHost On ProxyPreserveHost On
proxy_buffer_size 128k; proxy_buffer_size 128k;
@@ -52,8 +52,8 @@ configure your apache vhosts to add a reverse proxy that will redirect the dev.j
```apache ```apache
<Virtualhost *:80> <Virtualhost *:80>
ServerName dev.phpmyadmin.jeunesetengages.fr ServerName dev.phpmyadmin.jeunesetengages.fr
ProxyPass / http://127.0.0.1:8881/ ProxyPass / http://127.0.0.1:9881/
ProxyPassReverse / http://127.0.0.1:8881/ ProxyPassReverse / http://127.0.0.1:9881/
ProxyRequests Off ProxyRequests Off
ProxyPreserveHost On ProxyPreserveHost On
proxy_buffer_size 128k; proxy_buffer_size 128k;
@@ -69,7 +69,7 @@ server {
server_name dev.jeunesetengages.fr; server_name dev.jeunesetengages.fr;
location / { 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 Host $host;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -84,7 +84,7 @@ server {
server_name dev.phpmyadmin.jeunesetengages.fr; server_name dev.phpmyadmin.jeunesetengages.fr;
location / { 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 Host $host;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
d7
Submodule
+1
Submodule d7 added at 868629cbb2
docker-compose.yml
+2 -2
View File
@@ -49,7 +49,7 @@ services:
phpmyadmin: phpmyadmin:
image: phpmyadmin/phpmyadmin image: phpmyadmin/phpmyadmin
ports: ports:
- 8991:80 - 9991:80
networks: networks:
- database - database
depends_on: depends_on:
@@ -60,7 +60,7 @@ services:
nginx: nginx:
build: ./Docker/nginx/ build: ./Docker/nginx/
ports: ports:
- 8990:80 - 9990:80
volumes: volumes:
- "${D7_ROOT}:/var/www/html/jeunesetengages.fr/public_html" - "${D7_ROOT}:/var/www/html/jeunesetengages.fr/public_html"
- "${LOG_ROOT}:/var/log:rw" - "${LOG_ROOT}:/var/log:rw"