From 6ca2ed08929071c984a5148c6a8bd17353c837c6 Mon Sep 17 00:00:00 2001 From: Administrator Date: Tue, 8 Nov 2022 09:56:05 +0300 Subject: [PATCH] rabbit --- .deploy-infra/deploy-dev.yaml | 12 ------------ .deploy-infra/deploy-prod.yaml | 12 ------------ .gitlab-ci.yml | 2 -- docker-cleaner/Dockerfile | 7 ------- docker-cleaner/clean.sh | 5 ----- nginx/nginx-prod/nginx-prod.conf | 19 +++++++++++++++++++ 6 files changed, 19 insertions(+), 38 deletions(-) delete mode 100644 docker-cleaner/Dockerfile delete mode 100755 docker-cleaner/clean.sh diff --git a/.deploy-infra/deploy-dev.yaml b/.deploy-infra/deploy-dev.yaml index 0153955..320ddce 100644 --- a/.deploy-infra/deploy-dev.yaml +++ b/.deploy-infra/deploy-dev.yaml @@ -129,18 +129,6 @@ services: parallelism: 1 order: start-first - docker-cleaner: - image: mathwave/sprint-repo:sprint-infra-docker-cleaner - volumes: - - /var/run/docker.sock:/var/run/docker.sock - deploy: - mode: global - restart_policy: - condition: any - update_config: - parallelism: 1 - order: stop-first - volumes: minio_data: driver: local diff --git a/.deploy-infra/deploy-prod.yaml b/.deploy-infra/deploy-prod.yaml index 0ea425f..dc6a849 100644 --- a/.deploy-infra/deploy-prod.yaml +++ b/.deploy-infra/deploy-prod.yaml @@ -129,18 +129,6 @@ services: parallelism: 1 order: start-first - docker-cleaner: - image: mathwave/sprint-repo:sprint-infra-docker-cleaner - volumes: - - /var/run/docker.sock:/var/run/docker.sock - deploy: - mode: global - restart_policy: - condition: any - update_config: - parallelism: 1 - order: stop-first - volumes: minio_data: driver: local diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9f63d71..c625b57 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,8 +24,6 @@ build: - docker push mathwave/sprint-repo:sprint-infra-nginx-dev - docker build -t mathwave/sprint-repo:sprint-infra-nginx-prod nginx/nginx-prod - docker push mathwave/sprint-repo:sprint-infra-nginx-prod - - docker build -t mathwave/sprint-repo:sprint-infra-docker-cleaner docker-cleaner - - docker push mathwave/sprint-repo:sprint-infra-docker-cleaner deploy-dev: stage: deploy-dev diff --git a/docker-cleaner/Dockerfile b/docker-cleaner/Dockerfile deleted file mode 100644 index 867db0a..0000000 --- a/docker-cleaner/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM docker:dind - -RUN mkdir /app -WORKDIR /app -COPY clean.sh clean.sh -RUN chmod 777 clean.sh -CMD ["./clean.sh"] \ No newline at end of file diff --git a/docker-cleaner/clean.sh b/docker-cleaner/clean.sh deleted file mode 100755 index a14b410..0000000 --- a/docker-cleaner/clean.sh +++ /dev/null @@ -1,5 +0,0 @@ -while true -do - docker image rm $(docker image ls -q) || true - sleep 86400 -done \ No newline at end of file diff --git a/nginx/nginx-prod/nginx-prod.conf b/nginx/nginx-prod/nginx-prod.conf index c509751..f10e9bf 100644 --- a/nginx/nginx-prod/nginx-prod.conf +++ b/nginx/nginx-prod/nginx-prod.conf @@ -88,6 +88,25 @@ http { } } + server { + listen 443 ssl http2; + listen [::]:443 ssl http2; + server_name rabbitmq.sprinthub.ru; + + ssl_certificate /etc/nginx/fullchain.pem; + ssl_certificate_key /etc/nginx/privkey.pem; + + add_header X-Frame-Options "SAMEORIGIN" always; + add_header X-XSS-Protection "1; mode=block" always; + add_header X-Content-Type-Options "nosniff" always; + add_header Referrer-Policy "no-refferer-when-downgrade" always; + add_header Content-Security-Policy "default-src * data: 'unsafe-eval' 'unsafe-inline'" always; + + location / { + proxy_pass http://dev.sprinthub.ru:15672/; + } + } + server { listen 443 ssl http2; listen [::]:443 ssl http2;