diff --git a/__pycache__/main.cpython-312.pyc b/__pycache__/main.cpython-312.pyc index 3ff5e5a..e798372 100644 Binary files a/__pycache__/main.cpython-312.pyc and b/__pycache__/main.cpython-312.pyc differ diff --git a/docker-compose.yaml b/docker-compose.yaml index 951a427..03c1485 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,6 +1,26 @@ services: web: build: . # Путь к Dockerfile (в текущей директории) +<<<<<<< HEAD + container_name: workshop + # ports: + # - "80:5000" # Проброс портов + volumes: + - /storage/public/complete/workshop/:/data + networks: + - all + labels: + - traefik.enable=true + - traefik.http.routers.workshop.rule=Host(`csgoworkshop.ru`) || Host(`www.csgoworkshop.ru`) + - traefik.http.routers.workshop.entrypoints=websecure, web + - traefik.http.routers.workshop.tls=true + - traefik.http.routers.workshop.tls.certresolver=production-cloudflare + restart: unless-stopped + +networks: + all: + external: true +======= ports: - "80:5000" # Проброс портов volumes: @@ -11,4 +31,5 @@ volumes: driver_opts: type: cifs o: "username=Shaman,password=" - device: "//192.168.31.3/share/public/complete/workshop" \ No newline at end of file + device: "//192.168.31.3/share/public/complete/workshop" +>>>>>>> 9cc0929a09596abeb93ee7f2711527fb5da25f7a diff --git a/favicon.ico b/favicon.ico new file mode 100644 index 0000000..1daeacc Binary files /dev/null and b/favicon.ico differ diff --git a/frontend/main.html b/frontend/main.html index ed98fc0..6f303cf 100644 --- a/frontend/main.html +++ b/frontend/main.html @@ -6,7 +6,11 @@
Сделал: ©️𝙎𝙃∆𝙈∆𝙉©️
+Неофициальный сайт
с картами для CS:GO
из мастерской Steam
Сделал: ©️𝙎𝙃∆𝙈∆𝙉©️
Неофициальный сайт
с картами для CS:GO
из мастерской Steam