refactor: split machine deploys from one-time secrets migration
Roles stay under the machine that runs them, CI applies only a known product, and the /opt/secrets move is a one-shot playbook instead of part of every core-secrets run. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
1 parent
341538fba9
commit
9c692522fb
85 files changed
+537
-492
No files matched your search
File renamed without changes.
File renamed without changes.
+2
@@ -37,6 +37,8 @@ entries:
|
||||
attrs:
|
||||
group: !KeyOf group-admins
|
||||
|
||||
# providers ниже — полный список embedded outpost.
|
||||
# Новый proxy-провайдер добавляется в этот файл, а не только в интерфейсе.
|
||||
- model: authentik_outposts.outpost
|
||||
identifiers:
|
||||
name: authentik Embedded Outpost
|
||||
File renamed without changes.
+6
-6
@@ -4,7 +4,7 @@ services:
|
||||
container_name: authentik-db
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
POSTGRES_PASSWORD: {{ authentik_postgres_password }}
|
||||
POSTGRES_PASSWORD: {{ authentik_postgres_password | to_json }}
|
||||
POSTGRES_USER: authentik
|
||||
POSTGRES_DB: authentik
|
||||
volumes:
|
||||
@@ -18,7 +18,7 @@ services:
|
||||
- authentik-net
|
||||
|
||||
authentik-redis:
|
||||
image: redis:alpine
|
||||
image: redis:7-alpine
|
||||
container_name: authentik-redis
|
||||
restart: unless-stopped
|
||||
volumes:
|
||||
@@ -41,8 +41,8 @@ services:
|
||||
AUTHENTIK_POSTGRESQL__HOST: authentik-db
|
||||
AUTHENTIK_POSTGRESQL__USER: authentik
|
||||
AUTHENTIK_POSTGRESQL__NAME: authentik
|
||||
AUTHENTIK_POSTGRESQL__PASSWORD: {{ authentik_postgres_password }}
|
||||
AUTHENTIK_SECRET_KEY: {{ authentik_secret_key }}
|
||||
AUTHENTIK_POSTGRESQL__PASSWORD: {{ authentik_postgres_password | to_json }}
|
||||
AUTHENTIK_SECRET_KEY: {{ authentik_secret_key | to_json }}
|
||||
AUTHENTIK_DISABLE_UPDATE_CHECK: "true"
|
||||
AUTHENTIK_DISABLE_STARTUP_ANALYTICS: "true"
|
||||
AUTHENTIK_ERROR_REPORTING__ENABLED: "false"
|
||||
@@ -71,8 +71,8 @@ services:
|
||||
AUTHENTIK_POSTGRESQL__HOST: authentik-db
|
||||
AUTHENTIK_POSTGRESQL__USER: authentik
|
||||
AUTHENTIK_POSTGRESQL__NAME: authentik
|
||||
AUTHENTIK_POSTGRESQL__PASSWORD: {{ authentik_postgres_password }}
|
||||
AUTHENTIK_SECRET_KEY: {{ authentik_secret_key }}
|
||||
AUTHENTIK_POSTGRESQL__PASSWORD: {{ authentik_postgres_password | to_json }}
|
||||
AUTHENTIK_SECRET_KEY: {{ authentik_secret_key | to_json }}
|
||||
AUTHENTIK_DISABLE_UPDATE_CHECK: "true"
|
||||
AUTHENTIK_DISABLE_STARTUP_ANALYTICS: "true"
|
||||
AUTHENTIK_ERROR_REPORTING__ENABLED: "false"
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
+1
@@ -9,3 +9,4 @@ http:
|
||||
- authentik@file
|
||||
tls:
|
||||
certResolver: letsencrypt
|
||||
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
+1
@@ -2,3 +2,4 @@
|
||||
- name: Перезапустить Traefik
|
||||
ansible.builtin.command: docker compose -f {{ traefik_dir }}/compose.yaml up -d --force-recreate --remove-orphans
|
||||
changed_when: true
|
||||
tags: [always]
|
||||
@@ -1,26 +1,4 @@
|
||||
---
|
||||
- name: Установить базовые пакеты Debian
|
||||
ansible.builtin.apt:
|
||||
name:
|
||||
- python3
|
||||
- ca-certificates
|
||||
- curl
|
||||
state: present
|
||||
update_cache: true
|
||||
|
||||
- name: Установить Docker и Docker Compose
|
||||
ansible.builtin.apt:
|
||||
name:
|
||||
- docker.io
|
||||
- docker-compose
|
||||
state: present
|
||||
|
||||
- name: Включить и запустить службу Docker
|
||||
ansible.builtin.systemd:
|
||||
name: docker
|
||||
enabled: true
|
||||
state: started
|
||||
|
||||
- name: Создать каталоги Traefik
|
||||
ansible.builtin.file:
|
||||
path: "{{ item }}"
|
||||
File renamed without changes.
File renamed without changes.
+3
-11
@@ -1,22 +1,14 @@
|
||||
---
|
||||
secrets_dir: /opt/secrets
|
||||
vaultwarden_data_dir: /opt/secrets/vaultwarden/data
|
||||
infisical_data_dir: /opt/secrets/infisical
|
||||
vaultwarden_port: 8000
|
||||
vaultwarden_ws_port: 3012
|
||||
infisical_dir: /opt/infisical
|
||||
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"
|
||||
|
||||
infisical_postgres_user: "infisical"
|
||||
infisical_postgres_user: infisical
|
||||
infisical_postgres_db: infisical
|
||||
infisical_postgres_password: "{{ lookup('env', 'INFISICAL_POSTGRES_PASSWORD') }}"
|
||||
infisical_postgres_db: "infisical"
|
||||
infisical_encryption_key: "{{ lookup('env', 'INFISICAL_ENCRYPTION_KEY') }}"
|
||||
infisical_auth_secret: "{{ lookup('env', 'INFISICAL_AUTH_SECRET') }}"
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
---
|
||||
- name: Создать каталоги Infisical
|
||||
ansible.builtin.file:
|
||||
path: "{{ item.path }}"
|
||||
state: directory
|
||||
owner: "{{ item.owner }}"
|
||||
group: "{{ item.group }}"
|
||||
mode: "{{ item.mode }}"
|
||||
loop:
|
||||
- { path: "{{ infisical_dir }}", owner: "root", group: "root", mode: "0755" }
|
||||
- { path: "{{ infisical_dir }}/db", owner: "70", group: "70", mode: "0700" }
|
||||
- { path: "{{ infisical_dir }}/redis", owner: "999", group: "999", mode: "0700" }
|
||||
|
||||
- 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 для Infisical
|
||||
ansible.builtin.template:
|
||||
src: compose.yaml.j2
|
||||
dest: "{{ infisical_dir }}/compose.yaml"
|
||||
owner: root
|
||||
group: root
|
||||
mode: "0600"
|
||||
no_log: true
|
||||
|
||||
- name: Запустить Infisical
|
||||
ansible.builtin.command: docker compose -f {{ infisical_dir }}/compose.yaml up -d --remove-orphans
|
||||
register: compose_up
|
||||
changed_when: "'Started' in compose_up.stderr or 'Created' in compose_up.stderr or 'Recreated' in compose_up.stderr or 'Pulled' in compose_up.stderr"
|
||||
@@ -0,0 +1,51 @@
|
||||
name: infisical
|
||||
|
||||
services:
|
||||
infisical-db:
|
||||
image: {{ infisical_postgres_image }}
|
||||
container_name: infisical-db
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
POSTGRES_USER: {{ infisical_postgres_user | to_json }}
|
||||
POSTGRES_PASSWORD: {{ infisical_postgres_password | to_json }}
|
||||
POSTGRES_DB: {{ infisical_postgres_db | to_json }}
|
||||
volumes:
|
||||
- {{ infisical_dir }}/db:/var/lib/postgresql/data
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", "pg_isready -U {{ infisical_postgres_user }} -d {{ infisical_postgres_db }}"]
|
||||
interval: 5s
|
||||
timeout: 5s
|
||||
retries: 10
|
||||
start_period: 20s
|
||||
|
||||
infisical-redis:
|
||||
image: {{ infisical_redis_image }}
|
||||
container_name: infisical-redis
|
||||
restart: unless-stopped
|
||||
volumes:
|
||||
- {{ infisical_dir }}/redis:/data
|
||||
healthcheck:
|
||||
test: ["CMD", "redis-cli", "ping"]
|
||||
interval: 5s
|
||||
timeout: 3s
|
||||
retries: 10
|
||||
start_period: 5s
|
||||
|
||||
infisical:
|
||||
image: {{ infisical_image }}
|
||||
container_name: infisical
|
||||
restart: unless-stopped
|
||||
depends_on:
|
||||
infisical-db:
|
||||
condition: service_healthy
|
||||
infisical-redis:
|
||||
condition: service_healthy
|
||||
environment:
|
||||
NODE_ENV: production
|
||||
ENCRYPTION_KEY: {{ infisical_encryption_key | to_json }}
|
||||
AUTH_SECRET: {{ infisical_auth_secret | to_json }}
|
||||
DB_CONNECTION_URI: {{ ("postgres://" ~ infisical_postgres_user ~ ":" ~ (infisical_postgres_password | urlencode) ~ "@infisical-db:5432/" ~ infisical_postgres_db) | to_json }}
|
||||
REDIS_URL: redis://infisical-redis:6379
|
||||
SITE_URL: {{ infisical_site_url | to_json }}
|
||||
ports:
|
||||
- "{{ infisical_port }}:8080"
|
||||
@@ -0,0 +1,6 @@
|
||||
---
|
||||
vaultwarden_dir: /opt/vaultwarden
|
||||
vaultwarden_data_dir: /opt/vaultwarden/data
|
||||
vaultwarden_port: 8000
|
||||
vaultwarden_image: "vaultwarden/server:1.37.5"
|
||||
vaultwarden_domain: "https://pass.gunihome.ru"
|
||||
@@ -0,0 +1,24 @@
|
||||
---
|
||||
- name: Создать каталоги Vaultwarden
|
||||
ansible.builtin.file:
|
||||
path: "{{ item }}"
|
||||
state: directory
|
||||
owner: root
|
||||
group: root
|
||||
mode: "0755"
|
||||
loop:
|
||||
- "{{ vaultwarden_dir }}"
|
||||
- "{{ vaultwarden_data_dir }}"
|
||||
|
||||
- name: Установить compose.yaml для Vaultwarden
|
||||
ansible.builtin.template:
|
||||
src: compose.yaml.j2
|
||||
dest: "{{ vaultwarden_dir }}/compose.yaml"
|
||||
owner: root
|
||||
group: root
|
||||
mode: "0644"
|
||||
|
||||
- name: Запустить Vaultwarden
|
||||
ansible.builtin.command: docker compose -f {{ vaultwarden_dir }}/compose.yaml up -d --remove-orphans
|
||||
register: compose_up
|
||||
changed_when: "'Started' in compose_up.stderr or 'Created' in compose_up.stderr or 'Recreated' in compose_up.stderr or 'Pulled' in compose_up.stderr"
|
||||
@@ -0,0 +1,17 @@
|
||||
name: vaultwarden
|
||||
|
||||
services:
|
||||
vaultwarden:
|
||||
image: {{ vaultwarden_image }}
|
||||
container_name: vaultwarden
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
DOMAIN: {{ vaultwarden_domain | to_json }}
|
||||
SIGNUPS_ALLOWED: "false"
|
||||
INVITATIONS_ALLOWED: "true"
|
||||
SHOW_PASSWORD_HINT: "false"
|
||||
TZ: Asia/Krasnoyarsk
|
||||
volumes:
|
||||
- {{ vaultwarden_data_dir }}:/data
|
||||
ports:
|
||||
- "{{ vaultwarden_port }}:80"
|
||||
@@ -1,56 +0,0 @@
|
||||
---
|
||||
- name: Установить базовые пакеты Debian
|
||||
ansible.builtin.apt:
|
||||
name:
|
||||
- python3
|
||||
- ca-certificates
|
||||
- curl
|
||||
- rsync
|
||||
state: present
|
||||
update_cache: true
|
||||
|
||||
- name: Установить Docker и Docker Compose
|
||||
ansible.builtin.apt:
|
||||
name:
|
||||
- docker.io
|
||||
- docker-compose
|
||||
state: present
|
||||
|
||||
- name: Включить и запустить службу Docker
|
||||
ansible.builtin.systemd:
|
||||
name: docker
|
||||
enabled: true
|
||||
state: started
|
||||
|
||||
- name: Создать каталоги для сервисов secrets
|
||||
ansible.builtin.file:
|
||||
path: "{{ item }}"
|
||||
state: directory
|
||||
owner: root
|
||||
group: root
|
||||
mode: "0755"
|
||||
loop:
|
||||
- "{{ secrets_dir }}"
|
||||
- "{{ 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
|
||||
dest: "{{ secrets_dir }}/compose.yaml"
|
||||
owner: root
|
||||
group: root
|
||||
mode: "0640"
|
||||
|
||||
- name: Запустить сервисы core-secrets через Docker Compose
|
||||
ansible.builtin.command: docker compose -f {{ secrets_dir }}/compose.yaml up -d --remove-orphans
|
||||
register: compose_up
|
||||
changed_when: "'Started' in compose_up.stderr or 'Created' in compose_up.stderr or 'Recreated' in compose_up.stderr or 'Pulled' in compose_up.stderr"
|
||||
@@ -1,73 +0,0 @@
|
||||
services:
|
||||
vaultwarden:
|
||||
image: {{ vaultwarden_image }}
|
||||
container_name: vaultwarden
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
- DOMAIN={{ vaultwarden_domain }}
|
||||
- SIGNUPS_ALLOWED=false
|
||||
- INVITATIONS_ALLOWED=true
|
||||
- SHOW_PASSWORD_HINT=false
|
||||
- WEBSOCKET_ENABLED=true
|
||||
- TZ=Asia/Krasnoyarsk
|
||||
volumes:
|
||||
- {{ vaultwarden_data_dir }}:/data
|
||||
ports:
|
||||
- "{{ vaultwarden_port }}:80"
|
||||
- "{{ vaultwarden_ws_port }}:3012"
|
||||
networks:
|
||||
- secrets-net
|
||||
|
||||
infisical-db:
|
||||
image: {{ infisical_postgres_image }}
|
||||
container_name: infisical-db
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
POSTGRES_USER: {{ infisical_postgres_user }}
|
||||
POSTGRES_PASSWORD: {{ infisical_postgres_password }}
|
||||
POSTGRES_DB: {{ infisical_postgres_db }}
|
||||
volumes:
|
||||
- {{ infisical_data_dir }}/db:/var/lib/postgresql/data
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", "pg_isready -U {{ infisical_postgres_user }} -d {{ infisical_postgres_db }}"]
|
||||
interval: 5s
|
||||
timeout: 5s
|
||||
retries: 10
|
||||
networks:
|
||||
- secrets-net
|
||||
|
||||
infisical-redis:
|
||||
image: {{ infisical_redis_image }}
|
||||
container_name: infisical-redis
|
||||
restart: unless-stopped
|
||||
volumes:
|
||||
- {{ infisical_data_dir }}/redis:/data
|
||||
networks:
|
||||
- secrets-net
|
||||
|
||||
infisical:
|
||||
image: {{ infisical_image }}
|
||||
container_name: infisical
|
||||
restart: unless-stopped
|
||||
depends_on:
|
||||
infisical-db:
|
||||
condition: service_healthy
|
||||
infisical-redis:
|
||||
condition: service_started
|
||||
environment:
|
||||
- NODE_ENV=production
|
||||
- ENCRYPTION_KEY={{ infisical_encryption_key }}
|
||||
- AUTH_SECRET={{ infisical_auth_secret }}
|
||||
- DB_CONNECTION_URI=postgres://{{ infisical_postgres_user }}:{{ infisical_postgres_password }}@infisical-db:5432/{{ infisical_postgres_db }}
|
||||
- REDIS_URL=redis://infisical-redis:6379
|
||||
- SITE_URL={{ infisical_site_url }}
|
||||
ports:
|
||||
- "{{ infisical_port }}:8080"
|
||||
networks:
|
||||
- secrets-net
|
||||
|
||||
networks:
|
||||
secrets-net:
|
||||
name: secrets-net
|
||||
driver: bridge
|
||||
|
||||
+1
-2
@@ -5,8 +5,7 @@ netbird_ports:
|
||||
- 443/tcp
|
||||
- 3478/udp
|
||||
|
||||
netbird_domain: "{{ lookup('env', 'NETBIRD_DOMAIN') | default('central.myguni.ru', true) }}"
|
||||
netbird_letsencrypt_email: "{{ lookup('env', 'NETBIRD_LETSENCRYPT_EMAIL') | default(letsencrypt_email | default(admin_email | default('vvkarpenok@gmail.com')), true) }}"
|
||||
netbird_letsencrypt_email: "{{ letsencrypt_email }}"
|
||||
|
||||
netbird_auth_secret: "{{ lookup('env', 'NETBIRD_AUTH_SECRET') }}"
|
||||
netbird_datastore_key: "{{ lookup('env', 'NETBIRD_DATASTORE_KEY') }}"
|
||||
File renamed without changes.
File renamed without changes.
+2
-1
@@ -1,8 +1,9 @@
|
||||
---
|
||||
- name: Перезапустить NetBird
|
||||
ansible.builtin.command: docker compose up -d --remove-orphans
|
||||
ansible.builtin.command: docker compose up -d --force-recreate --remove-orphans
|
||||
args:
|
||||
chdir: "{{ netbird_dir }}"
|
||||
register: compose_up
|
||||
changed_when: "'Started' in compose_up.stderr or 'Created' in compose_up.stderr or 'Recreated' in compose_up.stderr"
|
||||
tags: [always]
|
||||
|
||||
+2
-1
@@ -21,11 +21,12 @@
|
||||
- name: Проверить наличие обязательных секретов NetBird
|
||||
ansible.builtin.assert:
|
||||
that:
|
||||
- netbird_domain is defined and netbird_domain | length > 3
|
||||
- netbird_auth_secret is defined and netbird_auth_secret | length > 0
|
||||
- netbird_datastore_key is defined and netbird_datastore_key | length > 0
|
||||
- netbird_session_key is defined and netbird_session_key | length > 0
|
||||
- netbird_letsencrypt_email is defined and netbird_letsencrypt_email | length > 3
|
||||
fail_msg: "Один или несколько обязательных секретов NetBird (NETBIRD_AUTH_SECRET, NETBIRD_DATASTORE_KEY, NETBIRD_SESSION_KEY, NETBIRD_LETSENCRYPT_EMAIL) не переданы из Infisical!"
|
||||
fail_msg: "Не задан домен NetBird (host_vars) или один из секретов NETBIRD_AUTH_SECRET, NETBIRD_DATASTORE_KEY, NETBIRD_SESSION_KEY, NETBIRD_LETSENCRYPT_EMAIL."
|
||||
tags:
|
||||
- config
|
||||
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
Reference in new issue
Block a user