Попытка 2

Reviewed-on: #1

.gitea/workflows/deploy.yaml

@@ -1,8 +1,9 @@
 name: Deploy to Server
 
 on:
-   branches:
+  push:
-     - master
+    branches:
+      - main
 
 jobs:
   deploy:
@@ -23,7 +24,7 @@ jobs:
         run: |
           ssh -o StrictHostKeyChecking=no ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_IP }} "
             cd ${{ secrets.PROJECT_PATH }} &&
-            git pull origin master &&
+            git pull origin main &&
             docker-compose down --remove-orphans &&
             docker-compose up -d --build
           "

.gitea/workflows/test.yaml

@@ -0,0 +1,11 @@
+name: Test Workflow
+on:
+  push:
+    branches:
+      - main
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Print message
+        run: echo "Hello, world!"

config.yaml

@@ -0,0 +1,101 @@
+# Example configuration file, it's safe to copy this as the default config file without any modification.
+
+# You don't have to copy this file to your instance,
+# just run `./act_runner generate-config > config.yaml` to generate a config file.
+
+log:
+  # The level of logging, can be trace, debug, info, warn, error, fatal
+  level: info
+
+runner:
+  # Where to store the registration result.
+  file: .runner
+  # Execute how many tasks concurrently at the same time.
+  capacity: 1
+  # Extra environment variables to run jobs.
+  envs:
+    A_TEST_ENV_NAME_1: a_test_env_value_1
+    A_TEST_ENV_NAME_2: a_test_env_value_2
+  # Extra environment variables to run jobs from a file.
+  # It will be ignored if it's empty or the file doesn't exist.
+  env_file: .env
+  # The timeout for a job to be finished.
+  # Please note that the Gitea instance also has a timeout (3h by default) for the job.
+  # So the job could be stopped by the Gitea instance if it's timeout is shorter than this.
+  timeout: 3h
+  # The timeout for the runner to wait for running jobs to finish when shutting down.
+  # Any running jobs that haven't finished after this timeout will be cancelled.
+  shutdown_timeout: 0s
+  # Whether skip verifying the TLS certificate of the Gitea instance.
+  insecure: false
+  # The timeout for fetching the job from the Gitea instance.
+  fetch_timeout: 5s
+  # The interval for fetching the job from the Gitea instance.
+  fetch_interval: 2s
+  # The labels of a runner are used to determine which jobs the runner can run, and how to run them.
+  # Like: "macos-arm64:host" or "ubuntu-latest:docker://gitea/runner-images:ubuntu-latest"
+  # Find more images provided by Gitea at https://gitea.com/gitea/runner-images .
+  # If it's empty when registering, it will ask for inputting labels.
+  # If it's empty when execute `daemon`, will use labels in `.runner` file.
+  labels:
+    - "ubuntu-latest:docker://gitea/runner-images:ubuntu-latest"
+    - "ubuntu-22.04:docker://gitea/runner-images:ubuntu-22.04"
+    - "ubuntu-20.04:docker://gitea/runner-images:ubuntu-20.04"
+
+cache:
+  # Enable cache server to use actions/cache.
+  enabled: true
+  # The directory to store the cache data.
+  # If it's empty, the cache data will be stored in $HOME/.cache/actcache.
+  dir: ""
+  # The host of the cache server.
+  # It's not for the address to listen, but the address to connect from job containers.
+  # So 0.0.0.0 is a bad choice, leave it empty to detect automatically.
+  host: ""
+  # The port of the cache server.
+  # 0 means to use a random available port.
+  port: 0
+  # The external cache server URL. Valid only when enable is true.
+  # If it's specified, act_runner will use this URL as the ACTIONS_CACHE_URL rather than start a server by itself.
+  # The URL should generally end with "/".
+  external_server: ""
+
+container:
+  # Specifies the network to which the container will connect.
+  # Could be host, bridge or the name of a custom network.
+  # If it's empty, act_runner will create a network automatically.
+  network: ""
+  # Whether to use privileged mode or not when launching task containers (privileged mode is required for Docker-in-Docker).
+  privileged: false
+  # And other options to be used when the container is started (eg, --add-host=my.gitea.url:host-gateway).
+  options:
+  # The parent directory of a job's working directory.
+  # NOTE: There is no need to add the first '/' of the path as act_runner will add it automatically. 
+  # If the path starts with '/', the '/' will be trimmed.
+  # For example, if the parent directory is /path/to/my/dir, workdir_parent should be path/to/my/dir
+  # If it's empty, /workspace will be used.
+  workdir_parent:
+  # Volumes (including bind mounts) can be mounted to containers. Glob syntax is supported, see https://github.com/gobwas/glob
+  # You can specify multiple volumes. If the sequence is empty, no volumes can be mounted.
+  # For example, if you only allow containers to mount the `data` volume and all the json files in `/src`, you should change the config to:
+  # valid_volumes:
+  #   - data
+  #   - /src/*.json
+  # If you want to allow any volume, please use the following configuration:
+  # valid_volumes:
+  #   - '**'
+  valid_volumes: []
+  # overrides the docker client host with the specified one.
+  # If it's empty, act_runner will find an available docker host automatically.
+  # If it's "-", act_runner will find an available docker host automatically, but the docker host won't be mounted to the job containers and service containers.
+  # If it's not empty or "-", the specified docker host will be used. An error will be returned if it doesn't work.
+  docker_host: ""
+  # Pull docker image(s) even if already present
+  force_pull: true
+  # Rebuild docker image(s) even if already present
+  force_rebuild: false
+
+host:
+  # The parent directory of a job's working directory.
+  # If it's empty, $HOME/.cache/act/ will be used.
+  workdir_parent:

docker-compose.yaml

@@ -1,51 +1,48 @@
 services:
-  database:
+  webserver:
-      image: postgres:17.4-alpine3.21
+    image: nginx:1.27.4-alpine
-      container_name: database
+    container_name: webserver1.1
-      ports:
+    ports:
-        - "5432:5432"     
+      - "80:80"
-      environment:
+      - "443:443"
-        POSTGRES_DB: ${POSTGRES_DB}      
+    volumes:
-        POSTGRES_USER: ${POSTGRES_USER} 
+      - /home/apotheosis/projectWeb:/usr/share/nginx/html
-        POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}  
+      - /home/domain.crt:/etc/nginx/conf.d/domain.crt
+      - /home/domain.key:/etc/nginx/conf.d/domain.key
+      - /home//domain.conf:/etc/nginx/conf.d/default.conf
+      - /etc/letsencrypt/live/super-admins.online/privkey.pem:/etc/nginx/conf.d/privkey.pem
+      - /etc/letsencrypt/live/super-admins.online/fullchain.pem:/etc/nginx/conf.d/fullchain.pem
 
-#Монтируем директорию на хосте, чтобы при повторных "docker-compose up" таблицы с нашими данными сохранялись
+  server:
-      volumes:
+    image: docker.gitea.com/gitea:1.23.7
-        - /database:/var/lib/postgresql/data 
+    container_name: gitea
-      cpus: '0.15'  
+    environment:
-      mem_limit: 256M  
+      - USER_UID=1000
+      - USER_GID=1000
+      - GITEAdatabaseDB_TYPE=postgres
+      - GITEAdatabaseHOST=db:5432
+      - GITEAdatabaseNAME=gitea
+      - GITEAdatabaseUSER=gitea
+      - GITEAdatabasePASSWD=gitea
+    restart: always
 
-      healthcheck:
+    volumes:
-        test: ["CMD-SHELL", "pg_isready -U admin -WebSite"]
+      - /home/apotheosis/gitea:/data
-        interval: 5s
+      - /etc/timezone:/etc/timezone:ro
-        timeout: 5s
+      - /etc/localtime:/etc/localtime:ro
-        retries: 5    
+    ports:
-  
+      - "3000:3000"
-  webserver: 
+      - "222:22"
-      image: nginx:1.27.4-alpine
+    depends_on:
-      container_name: webserver
+      - db
-      ports:
-        - "80:80"
-        - "443:443"
-      volumes: 
-        - /WebApp/frontend:/usr/share/nginx/html
-        - /WebApp/nginx/ssl:/etc/nginx/sites-available
-        - /WebApp/nginx/nginx.conf:/etc/nginx/nginx.conf
 
-      depends_on:
+  db:
-        - database 
+    image: docker.io/library/postgres:14
-        - backend  
+    restart: always
-      cpus: '0.15'  
+    environment:
-      mem_limit: 256M  
+      - POSTGRES_USER=gitea
-  backend:
+      - POSTGRES_PASSWORD=gitea
-      image: python:3.9
+      - POSTGRES_DB=gitea
-      container_name: backend_part
+
-      ports:
+    volumes:
-        - "5000:5000"
+      - /home/apotheosis/postgres:/var/lib/postgresql/data
-      volumes:
-        - /WebApp/backend:/media/backend
-      working_dir: /media/backend
-      command: >
-        sh -c "pip install -r requirements.txt && python server.py"
-      cpus: '0.35'  
-      mem_limit: 256M  

gitea-runner/config.yaml

@@ -0,0 +1,15 @@
+services:
+  runner-1:
+    image: gitea/act_runner:latest
+    restart: always
+    environment:
+      - CONFIG_FILE=/runner/config.yaml
+      - GITEA_INSTANCE_URL=https://super-admins.online
+      - GITEA_RUNNER_REGISTRATION_TOKEN=WRXwMh6gi6CrF3XddpkH4mcrx8sNpnyBam0FY9gj
+    volumes:
+      - ./runner-1/config.yaml:/runner/config.yaml
+      - ./runner-1/data:/data
+      - ./runner-1/cache:/root/.cache
+      - /var/run/docker.sock:/var/run/docker.sock
+    ports:
+      - "8088:8088"

gitea-runner/docker-compose.yaml

@@ -0,0 +1,14 @@
+version: '3'
+
+services:
+  gitea-runner:
+    image: gitea/act_runner:latest
+    container_name: gitea-runner
+    restart: unless-stopped
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - ./config.yaml:/runner/config.yml
+      - /var/gitea-runner:/data
+    environment:
+      - GITEA_INSTANCE_URL=https://super-admins.online
+      - GITEA_RUNNER_REGISTRATION_TOKEN=WRXwMh6gi6CrF3XddpkH4mcrx8sNpnyBam0FY9gj

nginx-compose/nginx-compose.conf

@@ -0,0 +1,47 @@
+events {
+    worker_connections 1024;
+}
+
+http {
+    server {
+        listen 80;
+        server_name super-admins.ru;
+        return 301 https://super-admins.ru$request_uri;
+    }
+
+    server {
+        listen 443 ssl;
+        server_name super-admins.ru;
+        ssl_certificate /etc/letsencrypt/live/super-admins.online/fullchain.pem;
+        ssl_certificate_key /etc/letsencrypt/live/super-admins.online/privkey.pem;
+        ssl_protocols TLSv1.2 TLSv1.3;
+        ssl_ciphers HIGH:!aNULL:!MD5;
+        ssl_prefer_server_ciphers on;
+        root   /usr/share/nginx/html; # Здесь указан путь к файлам super-admins.ru
+        index index.html index.htm;
+
+        location / {
+            try_files $uri $uri/ /index.html;
+        }
+    }
+
+    server {
+        listen 80;
+        server_name super-admins.online;
+        return 301 https://super-admins.online$request_uri;
+    }
+
+    server {
+        listen 443 ssl;
+        server_name super-admins.online;
+        ssl_certificate /etc/letsencrypt/live/super-admins.online/fullchain.pem;
+        ssl_certificate_key /etc/letsencrypt/live/super-admins.online/privkey.pem;
+        ssl_protocols TLSv1.2 TLSv1.3;
+        ssl_ciphers HIGH:!aNULL:!MD5;
+        ssl_prefer_server_ciphers on;
+
+        location / {
+            proxy_pass http://gitea:3000; # Оставил проксирование Gitea как было
+        }
+    }
+}

nginx-compose/nginx.conf.save

@@ -0,0 +1,33 @@
+server {
+    listen 80;
+    server_name super-admins.ru;
+    return 301 https://super-admins.ru$request_uri;
+}
+server {
+    listen 443 ssl;
+    server_name super-admins.ru;
+    ssl_certificate /etc/nginx/sites-available/domain.crt;
+    ssl_certificate_key /etc/nginx/sites-available/domain.key;
+    ssl_protocols TLSv1.2 TLSv1.3;
+    ssl_ciphers HIGH:!aNULL:!MD5;
+    ssl_prefer_server_ciphers on;
+    root   /usr/share/nginx/html;
+    location / {
+        try_files $uri $uri/ /index.html;
+    }
+}
+server {
+    listen 80;
+    server_name super-admins.online;
+    return 301 https://super-admins.online$request_uri;
+}
+server {
+    listen 443 ssl;
+    server_name super-admins.online;
+    ssl_certificate /usr/share/nginx/html/fullchain.pem;
+    ssl_certificate_key /usr/share/nginx/html/privkey.pem;
+    ssl_protocols TLSv1.2 TLSv1.3;
+    ssl_ciphers HIGH:!aNULL:!MD5;
+    ssl_prefer_server_ciphers on;
+location / {
+    proxy_pass http://gitea:3000;

nginx-compose/nginx.conf.save.1

@@ -0,0 +1,33 @@
+server {
+    listen 80;
+    server_name super-admins.ru;
+    return 301 https://super-admins.ru$request_uri;
+}
+server {
+    listen 443 ssl;
+    server_name super-admins.ru;
+    ssl_certificate /etc/nginx/sites-available/domain.crt;
+    ssl_certificate_key /etc/nginx/sites-available/domain.key;
+    ssl_protocols TLSv1.2 TLSv1.3;
+    ssl_ciphers HIGH:!aNULL:!MD5;
+    ssl_prefer_server_ciphers on;
+    root   /usr/share/nginx/html;
+    location / {
+        try_files $uri $uri/ /index.html;
+    }
+}
+server {
+    listen 80;
+    server_name super-admins.online;
+    return 301 https://super-admins.online$request_uri;
+}
+server {
+    listen 443 ssl;
+    server_name super-admins.online;
+    ssl_certificate /usr/share/nginx/html/fullchain.pem;
+    ssl_certificate_key /usr/share/nginx/html/privkey.pem;
+    ssl_protocols TLSv1.2 TLSv1.3;
+    ssl_ciphers HIGH:!aNULL:!MD5;
+    ssl_prefer_server_ciphers on;
+location / {
+    proxy_pass http://gitea:3000;