diff --git a/ansible/inventories/prod/hosts.yml b/ansible/inventories/prod/hosts.yml index 08602d2..32e99fa 100644 --- a/ansible/inventories/prod/hosts.yml +++ b/ansible/inventories/prod/hosts.yml @@ -15,16 +15,10 @@ all: hosts: core-secrets: vps: - # ВАЖНО - # Поле ansible_password у внешних VPS — это одноразовый стартовый пароль от хостера - # для самого первого прогона роли `host`. Роль `host` сразу добавляет SSH-ключи и - # намертво отключает вход по паролю (PasswordAuthentication no), после чего этот - # пароль становится бесполезным. hosts: rus-central: ansible_host: 45.154.185.208 ansible_user: root - ansible_password: fP9vB6zP4nbS netbird: hosts: rus-central: diff --git a/ansible/roles/core_net/tasks/main.yml b/ansible/roles/core_net/tasks/main.yml index a79f8d4..53df7c4 100644 --- a/ansible/roles/core_net/tasks/main.yml +++ b/ansible/roles/core_net/tasks/main.yml @@ -12,7 +12,7 @@ ansible.builtin.apt: name: - docker.io - - docker-compose + - docker-compose-v2 state: present - name: Включить и запустить службу Docker diff --git a/ansible/roles/core_secrets/defaults/main.yml b/ansible/roles/core_secrets/defaults/main.yml index f07edc9..b26eae8 100644 --- a/ansible/roles/core_secrets/defaults/main.yml +++ b/ansible/roles/core_secrets/defaults/main.yml @@ -6,6 +6,11 @@ vaultwarden_port: 8000 vaultwarden_ws_port: 3012 infisical_port: 8080 +vaultwarden_image: "vaultwarden/server:1.37.5" +infisical_image: "infisical/infisical:v0.167.7" +infisical_postgres_image: "postgres:15-alpine" +infisical_redis_image: "redis:7-alpine" + vaultwarden_domain: "https://pass.gunihome.ru" infisical_site_url: "https://infisical.gunihome.ru" diff --git a/ansible/roles/core_secrets/tasks/main.yml b/ansible/roles/core_secrets/tasks/main.yml index df0d167..af525e8 100644 --- a/ansible/roles/core_secrets/tasks/main.yml +++ b/ansible/roles/core_secrets/tasks/main.yml @@ -13,7 +13,7 @@ ansible.builtin.apt: name: - docker.io - - docker-compose + - docker-compose-v2 state: present - name: Включить и запустить службу Docker @@ -34,6 +34,14 @@ - "{{ vaultwarden_data_dir }}" - "{{ infisical_data_dir }}" +- name: Проверить наличие обязательных секретов Infisical + ansible.builtin.assert: + that: + - infisical_postgres_password is defined and infisical_postgres_password | length > 0 + - infisical_encryption_key is defined and infisical_encryption_key | length > 0 + - infisical_auth_secret is defined and infisical_auth_secret | length > 0 + fail_msg: "Один или несколько обязательных секретов (INFISICAL_POSTGRES_PASSWORD, INFISICAL_ENCRYPTION_KEY, INFISICAL_AUTH_SECRET) не переданы через переменные окружения!" + - name: Установить compose.yaml для core-secrets ansible.builtin.template: src: compose.yaml.j2 diff --git a/ansible/roles/core_secrets/templates/compose.yaml.j2 b/ansible/roles/core_secrets/templates/compose.yaml.j2 index 151c95f..f339c6d 100644 --- a/ansible/roles/core_secrets/templates/compose.yaml.j2 +++ b/ansible/roles/core_secrets/templates/compose.yaml.j2 @@ -1,6 +1,6 @@ services: vaultwarden: - image: vaultwarden/server:latest + image: {{ vaultwarden_image }} container_name: vaultwarden restart: unless-stopped environment: @@ -19,7 +19,7 @@ services: - secrets-net infisical-db: - image: postgres:15-alpine + image: {{ infisical_postgres_image }} container_name: infisical-db restart: unless-stopped environment: @@ -37,7 +37,7 @@ services: - secrets-net infisical-redis: - image: redis:7-alpine + image: {{ infisical_redis_image }} container_name: infisical-redis restart: unless-stopped volumes: @@ -46,7 +46,7 @@ services: - secrets-net infisical: - image: infisical/infisical:latest + image: {{ infisical_image }} container_name: infisical restart: unless-stopped depends_on: