From 8e74e76f2e4769fc3cb500938771d5d43ccce442 Mon Sep 17 00:00:00 2001 From: "leonid.sokurov" Date: Thu, 26 Jun 2025 15:24:31 +0000 Subject: [PATCH] Revert "Merge branch 'main' into 'nubes'" This reverts merge request !1 --- cw_docker_deploy/inventory/nubes.ru/hosts | 12 ++++++------ cw_docker_deploy/vars/common.yml | 2 +- cw_docker_deploy/vars/example.local/dns/dns_zone.yml | 5 ----- .../vars/example.local/ldap/ldap_conf.yml | 8 -------- .../vars/example.local/livekit/livekit_conf.yml | 8 -------- .../{example.local => nubes.ru}/back/back_conf.yml | 8 ++++---- .../{example.local => nubes.ru}/back/back_secret.yml | 0 .../vars/{example.local => nubes.ru}/ca/ca_conf.yml | 2 +- .../{example.local => nubes.ru}/ca/ca_secret.yml | 0 .../vars/{example.local => nubes.ru}/common.yml | 0 .../{example.local => nubes.ru}/dns/dns_conf.yml | 2 +- cw_docker_deploy/vars/nubes.ru/dns/dns_zone.yml | 9 +++++++++ .../{example.local => nubes.ru}/iam/iam_conf.yml | 4 ++-- .../{example.local => nubes.ru}/iam/iam_secret.yml | 0 cw_docker_deploy/vars/nubes.ru/ldap/ldap_conf.yml | 8 ++++++++ .../{example.local => nubes.ru}/ldap/ldap_secret.yml | 0 .../vars/nubes.ru/livekit/livekit_conf.yml | 8 ++++++++ .../livekit/livekit_secret.yml | 0 .../{example.local => nubes.ru}/prep/prep_conf.yml | 0 .../{example.local => nubes.ru}/prep/prep_secret.yml | 0 .../vars/{example.local => nubes.ru}/s3/s3_conf.yml | 4 ++-- .../{example.local => nubes.ru}/s3/s3_secret.yml | 0 .../vars/{example.local => nubes.ru}/ssl_secret.yml | 0 23 files changed, 42 insertions(+), 38 deletions(-) delete mode 100644 cw_docker_deploy/vars/example.local/dns/dns_zone.yml delete mode 100644 cw_docker_deploy/vars/example.local/ldap/ldap_conf.yml delete mode 100644 cw_docker_deploy/vars/example.local/livekit/livekit_conf.yml rename cw_docker_deploy/vars/{example.local => nubes.ru}/back/back_conf.yml (67%) rename cw_docker_deploy/vars/{example.local => nubes.ru}/back/back_secret.yml (100%) rename cw_docker_deploy/vars/{example.local => nubes.ru}/ca/ca_conf.yml (81%) rename cw_docker_deploy/vars/{example.local => nubes.ru}/ca/ca_secret.yml (100%) rename cw_docker_deploy/vars/{example.local => nubes.ru}/common.yml (100%) rename cw_docker_deploy/vars/{example.local => nubes.ru}/dns/dns_conf.yml (86%) create mode 100644 cw_docker_deploy/vars/nubes.ru/dns/dns_zone.yml rename cw_docker_deploy/vars/{example.local => nubes.ru}/iam/iam_conf.yml (60%) rename cw_docker_deploy/vars/{example.local => nubes.ru}/iam/iam_secret.yml (100%) create mode 100644 cw_docker_deploy/vars/nubes.ru/ldap/ldap_conf.yml rename cw_docker_deploy/vars/{example.local => nubes.ru}/ldap/ldap_secret.yml (100%) create mode 100644 cw_docker_deploy/vars/nubes.ru/livekit/livekit_conf.yml rename cw_docker_deploy/vars/{example.local => nubes.ru}/livekit/livekit_secret.yml (100%) rename cw_docker_deploy/vars/{example.local => nubes.ru}/prep/prep_conf.yml (100%) rename cw_docker_deploy/vars/{example.local => nubes.ru}/prep/prep_secret.yml (100%) rename cw_docker_deploy/vars/{example.local => nubes.ru}/s3/s3_conf.yml (89%) rename cw_docker_deploy/vars/{example.local => nubes.ru}/s3/s3_secret.yml (100%) rename cw_docker_deploy/vars/{example.local => nubes.ru}/ssl_secret.yml (100%) diff --git a/cw_docker_deploy/inventory/nubes.ru/hosts b/cw_docker_deploy/inventory/nubes.ru/hosts index 82759f9..b94949d 100644 --- a/cw_docker_deploy/inventory/nubes.ru/hosts +++ b/cw_docker_deploy/inventory/nubes.ru/hosts @@ -1,21 +1,21 @@ [docker-host] [ca-host] -ldap ansible_host=192.168.2.7 +nubes-ldap ansible_host=192.168.2.7 [dns-host] -ldap ansible_host=192.168.2.7 +nubes-ldap ansible_host=192.168.2.7 [ldap-host] -ldap ansible_host=192.168.2.7 +nubes-ldap ansible_host=192.168.2.7 [iam-host] -iam ansible_host=192.168.2.8 +nubes-iam ansible_host=192.168.2.8 [s3-host] -s3 ansible_host=192.168.2.6 +nubes-s3 ansible_host=192.168.2.6 [livekit-host] [mon-host] -mon ansible_host=192.168.2.5 +nubes-mon ansible_host=192.168.2.5 diff --git a/cw_docker_deploy/vars/common.yml b/cw_docker_deploy/vars/common.yml index f97273b..1c179c9 100644 --- a/cw_docker_deploy/vars/common.yml +++ b/cw_docker_deploy/vars/common.yml @@ -1,2 +1,2 @@ --- -instance_name: "example.local" # Укажине название инстанса для применения переменных (пример: gt-p01.local, gt-p02.local) +instance_name: "nubes.ru" # Укажине название инстанса для применения переменных (пример: gt-p01.local, gt-p02.local) diff --git a/cw_docker_deploy/vars/example.local/dns/dns_zone.yml b/cw_docker_deploy/vars/example.local/dns/dns_zone.yml deleted file mode 100644 index 75598fb..0000000 --- a/cw_docker_deploy/vars/example.local/dns/dns_zone.yml +++ /dev/null @@ -1,5 +0,0 @@ -dns_rec: | - ldap IN A 192.168.2.7 - iam IN A 192.168.2.8 - store IN A 192.168.2.6 - mon IN A 192.168.2.5 diff --git a/cw_docker_deploy/vars/example.local/ldap/ldap_conf.yml b/cw_docker_deploy/vars/example.local/ldap/ldap_conf.yml deleted file mode 100644 index abe3577..0000000 --- a/cw_docker_deploy/vars/example.local/ldap/ldap_conf.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -# Переменные конфигурации -docker_install: "yes" # Установка Docker - "yes" или "no" - -# LDAP service -domain_lvl_2: "example" # Имя домена на втором уровне -domain_lvl_1: "local" # Имя домена на первом уровне - diff --git a/cw_docker_deploy/vars/example.local/livekit/livekit_conf.yml b/cw_docker_deploy/vars/example.local/livekit/livekit_conf.yml deleted file mode 100644 index 09b40dc..0000000 --- a/cw_docker_deploy/vars/example.local/livekit/livekit_conf.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -# Переменные конфигурации -docker_install: "yes" # Установка Docker - "yes" или "no" - -#Livekit service -livekit_wss_url: "av-d001.example.ext" # WSS url livekit -livekit_turn_url: "avt-d001.example.ext" # Turn url livekit -webhook_url: "http://cw-docker001.example.local:5098/livekit/callback" # Webhook url (callback host) diff --git a/cw_docker_deploy/vars/example.local/back/back_conf.yml b/cw_docker_deploy/vars/nubes.ru/back/back_conf.yml similarity index 67% rename from cw_docker_deploy/vars/example.local/back/back_conf.yml rename to cw_docker_deploy/vars/nubes.ru/back/back_conf.yml index 9124cf3..4fd3b76 100644 --- a/cw_docker_deploy/vars/example.local/back/back_conf.yml +++ b/cw_docker_deploy/vars/nubes.ru/back/back_conf.yml @@ -3,18 +3,18 @@ docker_install: "yes" # Установка Docker - "yes" или "no" # Docker registry -docker_registry: "registry.example.local" # Docker registry FQDN +docker_registry: "registry.co-work.ru" # Docker registry FQDN private_registry: "yes" # Приватный репозиторий - "yes" или "no" # IAM -iam_fqdn: "iam.example.local" # IAM (Keycloak) FQDN +iam_fqdn: "iam.cw-p01.local" # IAM (Keycloak) FQDN iam_realm: "cowork" # Keycloak realm # S3 store -s3_endpoint: "store-p001.example.ext:9000" # Публичный URL +s3_endpoint: "store-p001.co-work.ru:9000" # Публичный URL # Livekit -livekit_url: "https://av-p001.example.ext" # Публичный URL +livekit_url: "https://av-p001.co-work.ru" # Публичный URL # Backend apps first_init: "yes" # Первичная установка - "yes" или "no" diff --git a/cw_docker_deploy/vars/example.local/back/back_secret.yml b/cw_docker_deploy/vars/nubes.ru/back/back_secret.yml similarity index 100% rename from cw_docker_deploy/vars/example.local/back/back_secret.yml rename to cw_docker_deploy/vars/nubes.ru/back/back_secret.yml diff --git a/cw_docker_deploy/vars/example.local/ca/ca_conf.yml b/cw_docker_deploy/vars/nubes.ru/ca/ca_conf.yml similarity index 81% rename from cw_docker_deploy/vars/example.local/ca/ca_conf.yml rename to cw_docker_deploy/vars/nubes.ru/ca/ca_conf.yml index eff20b3..b2330d5 100644 --- a/cw_docker_deploy/vars/example.local/ca/ca_conf.yml +++ b/cw_docker_deploy/vars/nubes.ru/ca/ca_conf.yml @@ -1,6 +1,6 @@ --- # Переменные конфигурации -ca_domain: "example.local" # Имя доменна +ca_domain: "nubes.ru" # Имя доменна ca_country: "RU" # Страна ca_locality: "Moscow" ca_state: "Moscow" diff --git a/cw_docker_deploy/vars/example.local/ca/ca_secret.yml b/cw_docker_deploy/vars/nubes.ru/ca/ca_secret.yml similarity index 100% rename from cw_docker_deploy/vars/example.local/ca/ca_secret.yml rename to cw_docker_deploy/vars/nubes.ru/ca/ca_secret.yml diff --git a/cw_docker_deploy/vars/example.local/common.yml b/cw_docker_deploy/vars/nubes.ru/common.yml similarity index 100% rename from cw_docker_deploy/vars/example.local/common.yml rename to cw_docker_deploy/vars/nubes.ru/common.yml diff --git a/cw_docker_deploy/vars/example.local/dns/dns_conf.yml b/cw_docker_deploy/vars/nubes.ru/dns/dns_conf.yml similarity index 86% rename from cw_docker_deploy/vars/example.local/dns/dns_conf.yml rename to cw_docker_deploy/vars/nubes.ru/dns/dns_conf.yml index 4d987ff..838c8a2 100644 --- a/cw_docker_deploy/vars/example.local/dns/dns_conf.yml +++ b/cw_docker_deploy/vars/nubes.ru/dns/dns_conf.yml @@ -2,4 +2,4 @@ # Переменные конфигурации ext_forward_dns1: "77.88.8.8" # Внешний DNS сервер для перенаправления запросов ext_forward_dns2: "8.8.8.8" # Внешний DNS сервер для перенаправления запросов -dns_zone: "example.local" # DNS зона \ No newline at end of file +dns_zone: "nubes.ru" # DNS зона \ No newline at end of file diff --git a/cw_docker_deploy/vars/nubes.ru/dns/dns_zone.yml b/cw_docker_deploy/vars/nubes.ru/dns/dns_zone.yml new file mode 100644 index 0000000..cfd8392 --- /dev/null +++ b/cw_docker_deploy/vars/nubes.ru/dns/dns_zone.yml @@ -0,0 +1,9 @@ +dns_rec: | + nubes-ldap IN A 192.168.2.7 + ldap IN A 192.168.2.7 + nubes-iam IN A 192.168.2.8 + iam IN A 192.168.2.8 + nubes-s3 IN A 192.168.2.6 + store IN A 192.168.2.6 + nubes-mon IN A 192.168.2.5 + mon IN A 192.168.2.5 diff --git a/cw_docker_deploy/vars/example.local/iam/iam_conf.yml b/cw_docker_deploy/vars/nubes.ru/iam/iam_conf.yml similarity index 60% rename from cw_docker_deploy/vars/example.local/iam/iam_conf.yml rename to cw_docker_deploy/vars/nubes.ru/iam/iam_conf.yml index 3aca6fe..9effd8b 100644 --- a/cw_docker_deploy/vars/example.local/iam/iam_conf.yml +++ b/cw_docker_deploy/vars/nubes.ru/iam/iam_conf.yml @@ -3,6 +3,6 @@ docker_install: "yes" # Установка Docker - "yes" или "no" # IAM service -iam_fqdn: "iam.example.local" # IAM (Keycloak) FQDN +iam_fqdn: "iam.nubes.ru" # IAM (Keycloak) FQDN iam_realm: "cowork" # Keycloak realm -mon_fqdn: "mon.example.local" # Monitoring service FQDN \ No newline at end of file +mon_fqdn: "mon.nubes.ru" # Monitoring service FQDN \ No newline at end of file diff --git a/cw_docker_deploy/vars/example.local/iam/iam_secret.yml b/cw_docker_deploy/vars/nubes.ru/iam/iam_secret.yml similarity index 100% rename from cw_docker_deploy/vars/example.local/iam/iam_secret.yml rename to cw_docker_deploy/vars/nubes.ru/iam/iam_secret.yml diff --git a/cw_docker_deploy/vars/nubes.ru/ldap/ldap_conf.yml b/cw_docker_deploy/vars/nubes.ru/ldap/ldap_conf.yml new file mode 100644 index 0000000..2c16273 --- /dev/null +++ b/cw_docker_deploy/vars/nubes.ru/ldap/ldap_conf.yml @@ -0,0 +1,8 @@ +--- +# Переменные конфигурации +docker_install: "yes" # Установка Docker - "yes" или "no" + +# LDAP service +domain_lvl_2: "nubes" # Имя домена на втором уровне +domain_lvl_1: "ru" # Имя домена на первом уровне + diff --git a/cw_docker_deploy/vars/example.local/ldap/ldap_secret.yml b/cw_docker_deploy/vars/nubes.ru/ldap/ldap_secret.yml similarity index 100% rename from cw_docker_deploy/vars/example.local/ldap/ldap_secret.yml rename to cw_docker_deploy/vars/nubes.ru/ldap/ldap_secret.yml diff --git a/cw_docker_deploy/vars/nubes.ru/livekit/livekit_conf.yml b/cw_docker_deploy/vars/nubes.ru/livekit/livekit_conf.yml new file mode 100644 index 0000000..bff55c5 --- /dev/null +++ b/cw_docker_deploy/vars/nubes.ru/livekit/livekit_conf.yml @@ -0,0 +1,8 @@ +--- +# Переменные конфигурации +docker_install: "yes" # Установка Docker - "yes" или "no" + +#Livekit service +livekit_wss_url: "av-d001.cw-p01.local" # WSS url livekit +livekit_turn_url: "avt-d001.cw-p01.local" # Turn url livekit +webhook_url: "http://cw-pya-docker001.cw-p01.local:5098/livekit/callback" # Webhook url (callback host) diff --git a/cw_docker_deploy/vars/example.local/livekit/livekit_secret.yml b/cw_docker_deploy/vars/nubes.ru/livekit/livekit_secret.yml similarity index 100% rename from cw_docker_deploy/vars/example.local/livekit/livekit_secret.yml rename to cw_docker_deploy/vars/nubes.ru/livekit/livekit_secret.yml diff --git a/cw_docker_deploy/vars/example.local/prep/prep_conf.yml b/cw_docker_deploy/vars/nubes.ru/prep/prep_conf.yml similarity index 100% rename from cw_docker_deploy/vars/example.local/prep/prep_conf.yml rename to cw_docker_deploy/vars/nubes.ru/prep/prep_conf.yml diff --git a/cw_docker_deploy/vars/example.local/prep/prep_secret.yml b/cw_docker_deploy/vars/nubes.ru/prep/prep_secret.yml similarity index 100% rename from cw_docker_deploy/vars/example.local/prep/prep_secret.yml rename to cw_docker_deploy/vars/nubes.ru/prep/prep_secret.yml diff --git a/cw_docker_deploy/vars/example.local/s3/s3_conf.yml b/cw_docker_deploy/vars/nubes.ru/s3/s3_conf.yml similarity index 89% rename from cw_docker_deploy/vars/example.local/s3/s3_conf.yml rename to cw_docker_deploy/vars/nubes.ru/s3/s3_conf.yml index 4a893b6..1e67be6 100644 --- a/cw_docker_deploy/vars/example.local/s3/s3_conf.yml +++ b/cw_docker_deploy/vars/nubes.ru/s3/s3_conf.yml @@ -12,7 +12,7 @@ disk_lv_name: "data" # LVM Logical Volume name # Minio minio_deb_url: "https://dl.min.io/server/minio/release/linux-amd64/minio.deb" # Ссылка на deb пакет minio (Проверить перед выполнением наличие пакета) minio_path: "/s3/store" # Путь для размещения хранилища minio -minio_external_domain: "store.example.ext" -minio_internal_domain: "store.example.local" +minio_external_domain: "store-p001.cw.ngcloud.ru" +minio_internal_domain: "store.nubes.ru" minio_server_port: "9001" minio_console_port: "8443" \ No newline at end of file diff --git a/cw_docker_deploy/vars/example.local/s3/s3_secret.yml b/cw_docker_deploy/vars/nubes.ru/s3/s3_secret.yml similarity index 100% rename from cw_docker_deploy/vars/example.local/s3/s3_secret.yml rename to cw_docker_deploy/vars/nubes.ru/s3/s3_secret.yml diff --git a/cw_docker_deploy/vars/example.local/ssl_secret.yml b/cw_docker_deploy/vars/nubes.ru/ssl_secret.yml similarity index 100% rename from cw_docker_deploy/vars/example.local/ssl_secret.yml rename to cw_docker_deploy/vars/nubes.ru/ssl_secret.yml