From a762f977343687e2ea168ced137a0770e41a9f81 Mon Sep 17 00:00:00 2001 From: Aevann Date: Wed, 26 Jul 2023 21:29:45 +0300 Subject: [PATCH] use /d by default instead of /rDrama for consistency --- Dockerfile | 2 +- docker-compose.yml | 2 +- env_template.env | 2 +- nginx.conf | 18 +++++++++--------- readme.md | 2 +- scripts/startup_docker_chat.sh | 2 +- supervisord.conf | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index e92761766..bab39e2a6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,4 +46,4 @@ RUN t=$(mktemp) && wget 'https://dist.1-2.dev/imei.sh' -qO "$t" && bash "$t" && EXPOSE 80/tcp -CMD [ "/usr/bin/supervisord", "-c", "/rDrama/supervisord.conf" ] +CMD [ "/usr/bin/supervisord", "-c", "/d/supervisord.conf" ] diff --git a/docker-compose.yml b/docker-compose.yml index bc5a5d2c0..530c24869 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,7 +4,7 @@ services: build: context: . volumes: - - "./:/rDrama" + - "./:/d" - "./nginx.conf:/etc/nginx/sites-enabled/1" - "./nginx-serve-static.conf:/etc/nginx/includes/serve-static" - "./nginx-headers.conf:/etc/nginx/includes/headers" diff --git a/env_template.env b/env_template.env index c57e65234..399fc43af 100644 --- a/env_template.env +++ b/env_template.env @@ -1,4 +1,4 @@ -export FLASK_APP='/rDrama/files/cli:app' +export FLASK_APP='/d/files/cli:app' export SITE='localhost' export SITE_NAME='rDrama' export SECRET_KEY='blahblahblah' diff --git a/nginx.conf b/nginx.conf index 28bb9fc02..9ea35870c 100644 --- a/nginx.conf +++ b/nginx.conf @@ -29,18 +29,18 @@ server { include includes/headers; } location =/offline.html { - alias /rDrama/files/templates/errors/offline.html; + alias /d/files/templates/errors/offline.html; include includes/headers; } error_page 404 = /404.html; location =/404.html { - alias /rDrama/files/templates/errors/rDrama/404.html; + alias /d/files/templates/errors/rDrama/404.html; include includes/headers; add_header Cache-Control "no-store"; } error_page 502 = /502.html; location =/502.html { - alias /rDrama/files/templates/errors/rDrama/502.html; + alias /d/files/templates/errors/rDrama/502.html; include includes/headers; add_header Cache-Control "no-store"; } @@ -79,28 +79,28 @@ server { } location /assets/ { - alias /rDrama/files/assets/; + alias /d/files/assets/; include includes/serve-static; } location /i/ { - alias /rDrama/files/assets/images/; + alias /d/files/assets/images/; include includes/serve-static; } location /e/ { - alias /rDrama/files/assets/images/emojis/; + alias /d/files/assets/images/emojis/; include includes/serve-static; } location =/robots.txt { - alias /rDrama/files/assets/robots.txt; + alias /d/files/assets/robots.txt; include includes/serve-static; } location =/icon.webp { - alias /rDrama/files/assets/images/rDrama/icon.webp; + alias /d/files/assets/images/rDrama/icon.webp; include includes/serve-static; } location =/favicon.ico { - alias /rDrama/files/assets/images/rDrama/icon.webp; + alias /d/files/assets/images/rDrama/icon.webp; include includes/serve-static; } } diff --git a/readme.md b/readme.md index 23366dde1..a75be5d97 100644 --- a/readme.md +++ b/readme.md @@ -7,7 +7,7 @@ This code runs https://rdrama.net and https://watchpeopledie.tv 2- Run the following commands in the terminal: ``` -git clone https://fsdfsd.net/rDrama/rDrama.git +git clone https://fsdfsd.net/rDrama/rDrama.git /d cd rDrama diff --git a/scripts/startup_docker_chat.sh b/scripts/startup_docker_chat.sh index 9c1d6b38e..0f7a67a02 100644 --- a/scripts/startup_docker_chat.sh +++ b/scripts/startup_docker_chat.sh @@ -1,4 +1,4 @@ -cd /rDrama +cd /d . ./.env export DATABASE_URL='postgresql://postgres@postgres:5432' export REDIS_URL='redis://redis:6379' diff --git a/supervisord.conf b/supervisord.conf index d8c9dbc82..861eb7178 100644 --- a/supervisord.conf +++ b/supervisord.conf @@ -4,7 +4,7 @@ pidfile=/tmp/supervisord.pid logfile=/tmp/supervisord.log [program:rDrama] -directory=/rDrama +directory=/d command=sh scripts/startup_docker.sh stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0