From bd4e3f49c6c279ad521caee4c7fe5cfd1a55c088 Mon Sep 17 00:00:00 2001 From: Kirill Svidunovich Date: Sat, 11 Nov 2023 16:58:10 +0300 Subject: [PATCH] Update cite domain name --- .env.example | 5 ++- .github/workflows/main.yml | 16 +++---- docker-compose.production.yml | 44 +++++++++---------- docker-compose.yml | 38 ++++++++-------- gateway/nginx.conf | 4 +- hakaton/hakaton/app_data.py | 2 +- hakaton/hakaton/settings.py | 4 +- hakaton/run_django_not_prod.sh | 2 +- .../user/management/commands/csv_db_import.py | 10 ----- 9 files changed, 58 insertions(+), 67 deletions(-) diff --git a/.env.example b/.env.example index ac5f1d7..96795e0 100644 --- a/.env.example +++ b/.env.example @@ -1,13 +1,14 @@ + # Secrets ACCESS_TOKEN_LIFETIME=1 SECRET_KEY='django-insecure-' # Domain -CITE_DOMAIN=hr-praktikum.domain.com +CITE_DOMAIN=hr-practicum.domain.com CITE_IP=11.111.111.111 # Frontend Vite -VITE_API_URL=hr-praktikum.domain.com/api/v1 +VITE_API_URL=hr-practicum.domain.com/api/v1 # Database settings DB_ENGINE=django.db.backends.postgresql diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3ad5100..69cdc9d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -64,13 +64,13 @@ jobs: with: context: ./hakaton/ push: True - tags: ${{ secrets.DOCKERHUB_USERNAME }}/hr_praktikum_backend:latest + tags: ${{ secrets.DOCKERHUB_USERNAME }}/hr_practicum_backend:latest - name: Push gateway image to the Dockerhub uses: docker/build-push-action@v4 with: context: ./gateway/ push: True - tags: ${{ secrets.DOCKERHUB_USERNAME }}/hr_praktikum_gateway:latest + tags: ${{ secrets.DOCKERHUB_USERNAME }}/hr_practicum_gateway:latest deploy_on_server: name: Deploy project on server @@ -86,7 +86,7 @@ jobs: username: ${{ secrets.SSH_USERNAME }} key: ${{ secrets.SSH_KEY }} source: "docker-compose.production.yml" - target: "/home/hr_praktikum/" + target: "/home/hr_practicum/" - name: Executing remote ssh commands to deploy uses: appleboy/ssh-action@master with: @@ -94,13 +94,13 @@ jobs: username: ${{ secrets.SSH_USERNAME }} key: ${{ secrets.SSH_KEY }} script: | - cd /home/hr_praktikum + cd /home/hr_practicum sudo docker compose down sudo rm docker-compose.yml sudo mv docker-compose.production.yml docker-compose.yml - sudo docker image rm ${{ secrets.DOCKERHUB_USERNAME }}/hr_praktikum_backend - sudo docker image rm ${{ secrets.DOCKERHUB_USERNAME }}/hr_praktikum_gateway - sudo docker volume rm hr_praktikum_hr_praktikum_static_volume + sudo docker image rm ${{ secrets.DOCKERHUB_USERNAME }}/hr_practicum_backend + sudo docker image rm ${{ secrets.DOCKERHUB_USERNAME }}/hr_practicum_gateway + sudo docker volume rm hr_practicum_hr_practicum_static_volume sudo docker compose up -d --build sudo service nginx restart @@ -114,4 +114,4 @@ jobs: with: to: ${{ secrets.TELEGRAM_ME_ID }} token: ${{ secrets.TELEGRAM_BOT_TOKEN }} - message: Деплой "Hr-Praktikum backend" выполнен успешно! + message: Деплой "Hr-practicum backend" выполнен успешно! diff --git a/docker-compose.production.yml b/docker-compose.production.yml index 8883d71..bd535ab 100644 --- a/docker-compose.production.yml +++ b/docker-compose.production.yml @@ -1,47 +1,47 @@ version: '3.8' volumes: - hr_praktikum_database_volume: - hr_praktikum_static_volume: - hr_praktikum_media_volume: + hr_practicum_database_volume: + hr_practicum_static_volume: + hr_practicum_media_volume: services: - hr_praktikum_database: + hr_practicum_database: image: postgres:15-alpine volumes: - - hr_praktikum_database_volume:/var/lib/postgresql/data/ + - hr_practicum_database_volume:/var/lib/postgresql/data/ env_file: - .env - hr_praktikum_redis: + hr_practicum_redis: image: redis:7.2.1-alpine - hr_praktikum_backend: - image: thesuncatcher222/hr_praktikum_backend:latest + hr_practicum_backend: + image: thesuncatcher222/hr_practicum_backend:latest env_file: .env volumes: - - hr_praktikum_static_volume:/app/static - - hr_praktikum_media_volume:/app/media + - hr_practicum_static_volume:/app/static + - hr_practicum_media_volume:/app/media depends_on: - - hr_praktikum_database - - hr_praktikum_redis + - hr_practicum_database + - hr_practicum_redis - hr_praktikum_frontend: - image: thesuncatcher222/hr_praktikum_frontend:latest + hr_practicum_frontend: + image: thesuncatcher222/hr_practicum_frontend:latest volumes: - - hr_praktikum_static_volume:/app/build + - hr_practicum_static_volume:/app/build env_file: .env depends_on: - - hr_praktikum_backend + - hr_practicum_backend - hr_praktikum_gateway: - image: thesuncatcher222/hr_praktikum_gateway:latest + hr_practicum_gateway: + image: thesuncatcher222/hr_practicum_gateway:latest ports: - "8000:8000" volumes: - - hr_praktikum_static_volume:/var/html/static/ - - hr_praktikum_media_volume:/var/html/media/ + - hr_practicum_static_volume:/var/html/static/ + - hr_practicum_media_volume:/var/html/media/ depends_on: - - hr_praktikum_backend - - hr_praktikum_frontend + - hr_practicum_backend + - hr_practicum_frontend diff --git a/docker-compose.yml b/docker-compose.yml index 219904c..2afc06e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,47 +1,47 @@ version: '3.8' volumes: - hr_praktikum_database_volume: - hr_praktikum_static_volume: - hr_praktikum_media_volume: + hr_practicum_database_volume: + hr_practicum_static_volume: + hr_practicum_media_volume: services: - hr_praktikum_database: + hr_practicum_database: image: postgres:15-alpine volumes: - - hr_praktikum_database_volume:/var/lib/postgresql/data/ + - hr_practicum_database_volume:/var/lib/postgresql/data/ env_file: - .env - hr_praktikum_redis: + hr_practicum_redis: image: redis:7.2.1-alpine - hr_praktikum_backend: + hr_practicum_backend: build: ./hakaton/ env_file: .env volumes: - - hr_praktikum_static_volume:/app/static - - hr_praktikum_media_volume:/app/media + - hr_practicum_static_volume:/app/static + - hr_practicum_media_volume:/app/media depends_on: - - hr_praktikum_database - - hr_praktikum_redis + - hr_practicum_database + - hr_practicum_redis - hr_praktikum_frontend: + hr_practicum_frontend: build: ../frontend/ volumes: - - hr_praktikum_static_volume:/app/build + - hr_practicum_static_volume:/app/build env_file: .env depends_on: - - hr_praktikum_backend + - hr_practicum_backend - hr_praktikum_gateway: + hr_practicum_gateway: build: ./gateway/ ports: - "8000:8000" volumes: - - hr_praktikum_static_volume:/var/html/static/ - - hr_praktikum_media_volume:/var/html/media/ + - hr_practicum_static_volume:/var/html/static/ + - hr_practicum_media_volume:/var/html/media/ depends_on: - - hr_praktikum_backend - - hr_praktikum_frontend + - hr_practicum_backend + - hr_practicum_frontend diff --git a/gateway/nginx.conf b/gateway/nginx.conf index 27ace8a..0d498b3 100644 --- a/gateway/nginx.conf +++ b/gateway/nginx.conf @@ -6,14 +6,14 @@ server { location /admin/ { proxy_set_header Host $http_host; - proxy_pass http://hr_praktikum_backend:8000/admin/; + proxy_pass http://hr_practicum_backend:8000/admin/; } location /api/ { proxy_set_header Host $http_host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_pass http://hr_praktikum_backend:8000/api/; + proxy_pass http://hr_practicum_backend:8000/api/; } location /media/ { diff --git a/hakaton/hakaton/app_data.py b/hakaton/hakaton/app_data.py index 4266fee..bf8a66e 100644 --- a/hakaton/hakaton/app_data.py +++ b/hakaton/hakaton/app_data.py @@ -101,7 +101,7 @@ def user_avatar_path(instance, filename) -> str: """Email settings.""" -DEFAULT_FROM_EMAIL = 'Praktikum Services' +DEFAULT_FROM_EMAIL = 'practicum Services' EMAIL_HOST: str = os.getenv('EMAIL_HOST') EMAIL_PORT: int = int(os.getenv('EMAIL_PORT')) diff --git a/hakaton/hakaton/settings.py b/hakaton/hakaton/settings.py index ac07d47..54531ef 100644 --- a/hakaton/hakaton/settings.py +++ b/hakaton/hakaton/settings.py @@ -33,8 +33,8 @@ CELERY_TASK_TRACK_STARTED = True CELERY_TASK_TIME_LIMIT = 30 * 60 -CELERY_BROKER_URL = 'redis://hr_praktikum_redis:6379/0' -CELERY_RESULT_BACKEND = 'redis://hr_praktikum_redis:6379/0' +CELERY_BROKER_URL = 'redis://hr_practicum_redis:6379/0' +CELERY_RESULT_BACKEND = 'redis://hr_practicum_redis:6379/0' """Email settings.""" diff --git a/hakaton/run_django_not_prod.sh b/hakaton/run_django_not_prod.sh index bc92673..9b1709a 100644 --- a/hakaton/run_django_not_prod.sh +++ b/hakaton/run_django_not_prod.sh @@ -4,7 +4,7 @@ echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ echo @@@@@@@@@@@@@@@@@@@@@@@ waiting for database @@@@@@@@@@@@@@@@@@@@@@@@ echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ -while ! pg_isready -h hr_praktikum_database -p 5432; do +while ! pg_isready -h hr_practicum_database -p 5432; do echo "База данных недоступна, ждем 5 секунд..." sleep 5 done diff --git a/hakaton/user/management/commands/csv_db_import.py b/hakaton/user/management/commands/csv_db_import.py index 6f3094c..a633ce9 100644 --- a/hakaton/user/management/commands/csv_db_import.py +++ b/hakaton/user/management/commands/csv_db_import.py @@ -179,15 +179,6 @@ def import_vacancy_student_status() -> None: return -def create_admin(): - """Создает модель суперпользователя.""" - email: str = 'admin@email.com' - password: str = 'admin' - if not User.objects.filter(email=email): - User.objects.create_superuser(email=email, password=password) - return - - def create_student(): """Создает объекты разных студентов.""" csv_data: csv.DictReader = import_csv(csv_name='student') @@ -370,7 +361,6 @@ def handle(self, *args: any, **options: any): import_skill_category() import_skill() import_vacancy_student_status() - create_admin() create_student() create_vacancy() except Exception as err: