diff --git a/media/header.png b/media/header.png deleted file mode 100644 index 83aa65b..0000000 Binary files a/media/header.png and /dev/null differ diff --git a/playbooks/roles/nginx-reconfigure2/README.md b/playbooks/roles/nginx-reconfigure2/README.md deleted file mode 100644 index 225dd44..0000000 --- a/playbooks/roles/nginx-reconfigure2/README.md +++ /dev/null @@ -1,38 +0,0 @@ -Role Name -========= - -A brief description of the role goes here. - -Requirements ------------- - -Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required. - -Role Variables --------------- - -A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well. - -Dependencies ------------- - -A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles. - -Example Playbook ----------------- - -Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too: - - - hosts: servers - roles: - - { role: username.rolename, x: 42 } - -License -------- - -BSD - -Author Information ------------------- - -An optional section for the role authors to include contact information, or a website (HTML is not allowed). diff --git a/playbooks/roles/nginx-reconfigure2/defaults/main.yml b/playbooks/roles/nginx-reconfigure2/defaults/main.yml deleted file mode 100644 index 78c8c76..0000000 --- a/playbooks/roles/nginx-reconfigure2/defaults/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# defaults file for nginx diff --git a/playbooks/roles/nginx-reconfigure2/files/docker_files/certbot/Dockerfile b/playbooks/roles/nginx-reconfigure2/files/docker_files/certbot/Dockerfile deleted file mode 100644 index ab24824..0000000 --- a/playbooks/roles/nginx-reconfigure2/files/docker_files/certbot/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ - -#облегченный образ дебиан -FROM debian:stable-slim -LABEL authors="RONIS" - -# Обновление и установка необходимых пакетов -RUN apt update && \ - apt install -y python3-certbot-nginx && \ - apt install -y cron - - -COPY check_and_create_cert.sh ./ - -# Проверка наличия сертификата для домена -RUN chmod +x ./check_and_create_cert.sh && echo "0 0 1 * * certbot renew --quiet" | tee -a /etc/crontab > /dev/null - - -# Запуск скрипта в контейнере при старте "& cron -f" обеспечивает запуск процесса для поддержки контейнера -CMD bash -c "./check_and_create_cert.sh & cron -f" - diff --git a/playbooks/roles/nginx-reconfigure2/files/docker_files/certbot/check_and_create_cert.sh b/playbooks/roles/nginx-reconfigure2/files/docker_files/certbot/check_and_create_cert.sh deleted file mode 100644 index 978bc1c..0000000 --- a/playbooks/roles/nginx-reconfigure2/files/docker_files/certbot/check_and_create_cert.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -set -e -if certbot certificates | grep -q "No certificates found."; then - echo "Сертификат не найден. Создаю новый..." - certbot certonly --webroot --w /var/www/certbot/ -d $DOMAIN_URL -d $GIT_DOMAIN -d $DRONE_DOMAIN -m $DOMAIN_EMAIL --agree-tos --no-eff-email --non-interactive --config-dir /etc/letsencrypt --work-dir /var/lib/letsencrypt --logs-dir /var/log/letsencrypt -else - echo "Сертификат уже существует." - certbot renew -n -fi \ No newline at end of file diff --git a/playbooks/roles/nginx-reconfigure2/files/docker_files/nginx-compose.yaml b/playbooks/roles/nginx-reconfigure2/files/docker_files/nginx-compose.yaml deleted file mode 100644 index ea2fe35..0000000 --- a/playbooks/roles/nginx-reconfigure2/files/docker_files/nginx-compose.yaml +++ /dev/null @@ -1,49 +0,0 @@ -services: - nginx: - container_name: nginx - image: nginx:1.28.0-bookworm - environment: - USER_ID: 1000 - USER_GID: 1001 - ports: - - "80:80" - - "443:443" - volumes: - - /srv/proxy/nginx/:/etc/nginx/:ro - - /srv/proxy/certbot/letsencrypt:/etc/letsencrypt:ro - - /srv/proxy/certbot/www/:/var/www/certbot/ - - /srv/log/nginx:/var/log/nginx - - /srv/proxy/static:/usr/share/nginx/static:ro - - restart: unless-stopped - networks: - - cicd_net - - nginx_net - - test_net - - prod_net - - certbot: - container_name: certbot - build: certbot - env_file: - - .env - volumes: - - /srv/proxy/certbot/letsencrypt:/etc/letsencrypt - - /srv/proxy/certbot/www/:/var/www/certbot - - /srv/proxy/var/log/letsencrypt:/var/log/letsencrypt - restart: unless-stopped - user: root - depends_on: - - nginx - networks: - - nginx_net - -networks: - nginx_net: - external: true - cicd_net: - external: true - test_net: - external: true - prod_net: - external: true \ No newline at end of file diff --git a/playbooks/roles/nginx-reconfigure2/files/nginx/mime.types b/playbooks/roles/nginx-reconfigure2/files/nginx/mime.types deleted file mode 100644 index 79e6ab5..0000000 --- a/playbooks/roles/nginx-reconfigure2/files/nginx/mime.types +++ /dev/null @@ -1,10 +0,0 @@ -types { - text/html html; - text/css css; - application/javascript js; - text/plain txt; - image/png png; - image/jpeg jpg jpeg; - image/gif gif; - image/svg+xml svg; -} \ No newline at end of file diff --git a/playbooks/roles/nginx-reconfigure2/files/nginx/nginx.conf b/playbooks/roles/nginx-reconfigure2/files/nginx/nginx.conf deleted file mode 100644 index 2847e69..0000000 --- a/playbooks/roles/nginx-reconfigure2/files/nginx/nginx.conf +++ /dev/null @@ -1,108 +0,0 @@ -# user nginx; - -worker_processes auto; - -events { - worker_connections 1024; -} - -http { - - - include mime.types; - default_type application/octet-stream; - - - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - - access_log /var/log/nginx/access.log main; - error_log /var/log/nginx/error.log warn; - - proxy_cache_path /tmp/cache keys_zone=my_cache:10m max_size=1g inactive=60m use_temp_path=off; - - client_max_body_size 100M; - - gzip on; - gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript; - gzip_min_length 1000; - - limit_req_zone $binary_remote_addr zone=api_limit:10m rate=5r/s; - - - - upstream web_backend { - least_conn; - server web_backend1:5000; - server web_backend2:5000; - - } - - upstream gitea { - least_conn; - server gitea:3000; - } - - upstream drone { - least_conn; - server drone:80; - } - - server { - listen 9888; - server_name localhost; - - location /nginx_status { - stub_status; -# allow 127.0.0.1; -# allow 172.18.0.0/16; -# deny all; - } - } - - - - server { - listen 80; - server_name git.roniss0505.tech; - - include /etc/nginx/shared_locations.conf; - - location / { - proxy_pass http://gitea; - include /etc/nginx/proxy_common.conf; - error_page 502 504 /server_not_available.html; - } - } - - server { - listen 80; - server_name roniss0505.tech; - - include /etc/nginx/shared_locations.conf; - - location / { - proxy_pass http://drone; - include /etc/nginx/proxy_common.conf; - error_page 502 504 /server_not_available.html; - } - } - server { - listen 80; - server_name drone.roniss0505.tech; - - include /etc/nginx/shared_locations.conf; - - - location /api/ { - rewrite ^/api/(.*)$ /$1 break; #deleting "/api/" from path - proxy_pass http://web_backend; -# proxy_cache my_cache; -# proxy_cache_valid 200 1h; -# proxy_cache_valid 404 1m; - include /etc/nginx/proxy_common.conf; - error_page 502 504 /server_not_available.html; - } - } -} \ No newline at end of file diff --git a/playbooks/roles/nginx-reconfigure2/files/nginx/proxy_common.conf b/playbooks/roles/nginx-reconfigure2/files/nginx/proxy_common.conf deleted file mode 100644 index d7e6d3a..0000000 --- a/playbooks/roles/nginx-reconfigure2/files/nginx/proxy_common.conf +++ /dev/null @@ -1,3 +0,0 @@ -proxy_set_header X-Forwarded-Proto https; -proxy_set_header X-Forwarded-Host $host; -proxy_set_header X-Real-IP $remote_addr; \ No newline at end of file diff --git a/playbooks/roles/nginx-reconfigure2/files/nginx/shared_locations.conf b/playbooks/roles/nginx-reconfigure2/files/nginx/shared_locations.conf deleted file mode 100644 index 54c2ac0..0000000 --- a/playbooks/roles/nginx-reconfigure2/files/nginx/shared_locations.conf +++ /dev/null @@ -1,11 +0,0 @@ - location /rate_limit/ { - limit_req zone=api_limit burst=10 nodelay; - } - - location /logs/ { - access_log /var/log/nginx/special_access.log; - } - - location = /server_not_available.html { - root /usr/share/nginx/static; - } \ No newline at end of file diff --git a/playbooks/roles/nginx-reconfigure2/files/static/sewrver_not_availavle.html b/playbooks/roles/nginx-reconfigure2/files/static/sewrver_not_availavle.html deleted file mode 100644 index b958689..0000000 --- a/playbooks/roles/nginx-reconfigure2/files/static/sewrver_not_availavle.html +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - Сервис недоступен - - - -
-

Сервис временно недоступен

-

Мы уже работаем над восстановлением. Попробуйте войти позже.

-
- - diff --git a/playbooks/roles/nginx-reconfigure2/handlers/main.yml b/playbooks/roles/nginx-reconfigure2/handlers/main.yml deleted file mode 100644 index ad79151..0000000 --- a/playbooks/roles/nginx-reconfigure2/handlers/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# handlers file for nginx diff --git a/playbooks/roles/nginx-reconfigure2/meta/main.yml b/playbooks/roles/nginx-reconfigure2/meta/main.yml deleted file mode 100644 index c572acc..0000000 --- a/playbooks/roles/nginx-reconfigure2/meta/main.yml +++ /dev/null @@ -1,52 +0,0 @@ -galaxy_info: - author: your name - description: your role description - company: your company (optional) - - # If the issue tracker for your role is not on github, uncomment the - # next line and provide a value - # issue_tracker_url: http://example.com/issue/tracker - - # Choose a valid license ID from https://spdx.org - some suggested licenses: - # - BSD-3-Clause (default) - # - MIT - # - GPL-2.0-or-later - # - GPL-3.0-only - # - Apache-2.0 - # - CC-BY-4.0 - license: license (GPL-2.0-or-later, MIT, etc) - - min_ansible_version: 2.1 - - # If this a Container Enabled role, provide the minimum Ansible Container version. - # min_ansible_container_version: - - # - # Provide a list of supported platforms, and for each platform a list of versions. - # If you don't wish to enumerate all versions for a particular platform, use 'all'. - # To view available platforms and versions (or releases), visit: - # https://galaxy.ansible.com/api/v1/platforms/ - # - # platforms: - # - name: Fedora - # versions: - # - all - # - 25 - # - name: SomePlatform - # versions: - # - all - # - 1.0 - # - 7 - # - 99.99 - - galaxy_tags: [] - # List tags for your role here, one per line. A tag is a keyword that describes - # and categorizes the role. Users find roles by searching for tags. Be sure to - # remove the '[]' above, if you add tags to this list. - # - # NOTE: A tag is limited to a single word comprised of alphanumeric characters. - # Maximum 20 tags per role. - -dependencies: [] - # List your role dependencies here, one per line. Be sure to remove the '[]' above, - # if you add dependencies to this list. diff --git a/playbooks/roles/nginx-reconfigure2/tasks/main.yml b/playbooks/roles/nginx-reconfigure2/tasks/main.yml deleted file mode 100644 index 971ec7e..0000000 --- a/playbooks/roles/nginx-reconfigure2/tasks/main.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- -- name: Copy nginx conf - ansible.builtin.copy: - src: "../files/nginx/" - dest: "/srv/proxy/nginx/" - -- name: Copy proxy compose - ansible.builtin.copy: - src: "../files/docker_files/" - dest: "/home/{{ main_user }}/workdir/proxy/" - - -- name: Copy proxy static - ansible.builtin.copy: - src: "../files/static/" - dest: "/srv/proxy/static/" - -- name: Run nginx-compose - community.docker.docker_compose_v2: - project_src: "/home/{{ main_user }}/workdir/proxy/" - files: nginx-compose.yaml - state: present - recreate: always diff --git a/playbooks/roles/nginx-reconfigure2/tests/test.yml b/playbooks/roles/nginx-reconfigure2/tests/test.yml deleted file mode 100644 index 261c779..0000000 --- a/playbooks/roles/nginx-reconfigure2/tests/test.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- hosts: localhost - remote_user: root - roles: - - nginx diff --git a/playbooks/roles/nginx-reconfigure2/vars/main.yml b/playbooks/roles/nginx-reconfigure2/vars/main.yml deleted file mode 100644 index d45faf6..0000000 --- a/playbooks/roles/nginx-reconfigure2/vars/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# vars file for nginx