From 9ac6988ec1cba75ac8ae88e57958a6f90158b14d Mon Sep 17 00:00:00 2001
From: Anton Vakhrushev <anwinged@ya.ru>
Date: Fri, 20 Oct 2023 17:54:55 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BC=D0=B5=D0=BD=D1=8F=D0=BB=20?=
 =?UTF-8?q?=D0=B0=D0=B4=D1=80=D0=B5=D1=81=20=D1=81=D0=B5=D1=80=D0=B2=D0=B5?=
 =?UTF-8?q?=D1=80=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Адрес сменился после изменения конфигурации
---
 ansible/configuration.yml          | 2 +-
 ansible/hosts_prod                 | 2 +-
 ansible/roles/owner/tasks/main.yml | 3 +--
 app/gitea/docker-compose.yml       | 4 +++-
 app/gitea/tasks.py                 | 2 +-
 app/wiki/tasks.py                  | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/ansible/configuration.yml b/ansible/configuration.yml
index 8931d20..c23750c 100644
--- a/ansible/configuration.yml
+++ b/ansible/configuration.yml
@@ -71,7 +71,7 @@
     - import_role:
         name: netdata
       vars:
-        netdata_version: 'v1.40.0'
+        netdata_version: 'v1.42.4'
         netdata_exposed_port: '{{ netdata_port }}'
       tags:
         - monitoring
diff --git a/ansible/hosts_prod b/ansible/hosts_prod
index 131f823..8b7c5f0 100644
--- a/ansible/hosts_prod
+++ b/ansible/hosts_prod
@@ -1 +1 @@
-51.250.85.23
+158.160.115.150
diff --git a/ansible/roles/owner/tasks/main.yml b/ansible/roles/owner/tasks/main.yml
index 81b0686..a93ad3e 100644
--- a/ansible/roles/owner/tasks/main.yml
+++ b/ansible/roles/owner/tasks/main.yml
@@ -29,8 +29,7 @@
   set_fact:
     env_dict: '{{ owner_env | combine({
       "CURRENT_UID": uc_result.uid | default(owner_name),
-      "CURRENT_GID": uc_result.group | default(owner_group),
-    }) }}'
+      "CURRENT_GID": uc_result.group | default(owner_group) }) }}'
   tags:
     - env
 
diff --git a/app/gitea/docker-compose.yml b/app/gitea/docker-compose.yml
index 5bb4511..efc89bb 100644
--- a/app/gitea/docker-compose.yml
+++ b/app/gitea/docker-compose.yml
@@ -3,10 +3,11 @@ version: "3"
 services:
 
   server:
-    image: gitea/gitea:1.19.3
+    image: gitea/gitea:1.20.5
     environment:
       - "USER_UID=${USER_UID}"
       - "USER_GID=${USER_GID}"
+      - "GITEA__server__SSH_PORT=2222"
     restart: unless-stopped
     volumes:
       - ./data:/data
@@ -14,3 +15,4 @@ services:
       - /etc/localtime:/etc/localtime:ro
     ports:
       - "${WEB_SERVER_PORT}:3000"
+      - "2222:22"
diff --git a/app/gitea/tasks.py b/app/gitea/tasks.py
index b290c1f..bcc7393 100644
--- a/app/gitea/tasks.py
+++ b/app/gitea/tasks.py
@@ -3,7 +3,7 @@ from invoke import task
 import shlex
 
 APP_NAME = "gitea"
-SSH_HOST = f"{APP_NAME}@51.250.85.23"
+SSH_HOST = f"{APP_NAME}@158.160.115.150"
 DOCKER_REGISTRY = "cr.yandex/crplfk0168i4o8kd7ade"
 
 
diff --git a/app/wiki/tasks.py b/app/wiki/tasks.py
index eb1192e..1a62701 100644
--- a/app/wiki/tasks.py
+++ b/app/wiki/tasks.py
@@ -4,7 +4,7 @@ import subprocess
 import shlex
 
 APP_NAME = "wiki"
-SSH_HOST = f"{APP_NAME}@51.250.85.23"
+SSH_HOST = f"{APP_NAME}@158.160.115.150"
 DOCKER_REGISTRY = "cr.yandex/crplfk0168i4o8kd7ade"