From dbb294679c2348d26174f50b2a4f20402e7478f0 Mon Sep 17 00:00:00 2001 From: Wojciech Kozlowski Date: Sat, 8 Jul 2023 15:34:11 +0200 Subject: [PATCH] Make variable names consistent --- inventory/group_vars/asgard/vars.yml | 47 +++++++++++-------- .../deploy/cloud/meta/argument_specs.yml | 38 ++++++++------- .../cloud/templates/nextcloud/database.name | 2 +- .../templates/nextcloud/database.password | 2 +- .../cloud/templates/nextcloud/database.user | 2 +- .../systemd/container-cloud-nextcloud.service | 6 +-- .../deploy/git/meta/argument_specs.yml | 38 ++++++++------- .../systemd/container-git-gitea.service | 12 ++--- .../deploy/notes/meta/argument_specs.yml | 38 ++++++++------- .../systemd/container-notes-joplin.service | 12 ++--- .../deploy/www/meta/argument_specs.yml | 13 ++--- .../roles/services/deploy/www/tasks/main.yml | 4 +- 12 files changed, 114 insertions(+), 100 deletions(-) diff --git a/inventory/group_vars/asgard/vars.yml b/inventory/group_vars/asgard/vars.yml index 78672bc..47a8c99 100644 --- a/inventory/group_vars/asgard/vars.yml +++ b/inventory/group_vars/asgard/vars.yml @@ -48,36 +48,43 @@ services_resolv_host: "valkyrie" services: rproxy: {} www: - repo_user: "{{ vault_services.www.repo_user }}" - repo_token: "{{ vault_services.www.repo_token }}" + repo: + user: "{{ vault_services.www.repo.user }}" + token: "{{ vault_services.www.repo.token }}" lrproxy: {} database: password: "{{ vault_services.database.password }}" cloud: domain: "{{ vault_services.cloud.domain }}" - database_name: "{{ vault_services.cloud.database_name }}" - database_user: "{{ vault_services.cloud.database_user }}" - database_password: "{{ vault_services.cloud.database_password }}" - smtp_host: "{{ vault_services.cloud.smtp_host }}" - smtp_name: "{{ vault_services.cloud.smtp_name }}" - smtp_password: "{{ vault_services.cloud.smtp_password }}" + database: + name: "{{ vault_services.cloud.database.name }}" + user: "{{ vault_services.cloud.database.user }}" + password: "{{ vault_services.cloud.database.password }}" + smtp: + host: "{{ vault_services.cloud.smtp.host }}" + user: "{{ vault_services.cloud.smtp.user }}" + password: "{{ vault_services.cloud.smtp.password }}" git: domain: "{{ vault_services.git.domain }}" - database_name: "{{ vault_services.git.database_name }}" - database_user: "{{ vault_services.git.database_user }}" - database_passwd: "{{ vault_services.git.database_passwd }}" - smtp_host: "{{ vault_services.git.smtp_host }}" - smtp_user: "{{ vault_services.git.smtp_user }}" - smtp_passwd: "{{ vault_services.git.smtp_passwd }}" + database: + name: "{{ vault_services.git.database.name }}" + user: "{{ vault_services.git.database.user }}" + password: "{{ vault_services.git.database.password }}" + smtp: + host: "{{ vault_services.git.smtp.host }}" + user: "{{ vault_services.git.smtp.user }}" + password: "{{ vault_services.git.smtp.password }}" ssh_port: 2770 notes: domain: "{{ vault_services.notes.domain }}" - database_name: "{{ vault_services.notes.database_name }}" - database_user: "{{ vault_services.notes.database_user }}" - database_password: "{{ vault_services.notes.database_password }}" - smtp_host: "{{ vault_services.notes.smtp_host }}" - smtp_name: "{{ vault_services.notes.smtp_name }}" - smtp_password: "{{ vault_services.notes.smtp_password }}" + database: + name: "{{ vault_services.notes.database.name }}" + user: "{{ vault_services.notes.database.user }}" + password: "{{ vault_services.notes.database.password }}" + smtp: + host: "{{ vault_services.notes.smtp.host }}" + user: "{{ vault_services.notes.smtp.user }}" + password: "{{ vault_services.notes.smtp.password }}" music: domain: "{{ vault_services.music.domain }}" password_encryption_key: "{{ vault_services.music.password_encryption_key }}" diff --git a/playbooks/roles/services/deploy/cloud/meta/argument_specs.yml b/playbooks/roles/services/deploy/cloud/meta/argument_specs.yml index 5420418..d281cc5 100644 --- a/playbooks/roles/services/deploy/cloud/meta/argument_specs.yml +++ b/playbooks/roles/services/deploy/cloud/meta/argument_specs.yml @@ -30,21 +30,23 @@ argument_specs: domain: type: "str" required: true - database_name: - type: "str" - required: true - database_user: - type: "str" - required: true - database_password: - type: "str" - required: true - smtp_host: - type: "str" - required: true - smtp_name: - type: "str" - required: true - smtp_password: - type: "str" - required: true + database: + name: + type: "str" + required: true + user: + type: "str" + required: true + password: + type: "str" + required: true + smtp: + host: + type: "str" + required: true + user: + type: "str" + required: true + password: + type: "str" + required: true diff --git a/playbooks/roles/services/deploy/cloud/templates/nextcloud/database.name b/playbooks/roles/services/deploy/cloud/templates/nextcloud/database.name index 549d8c5..8da9087 100644 --- a/playbooks/roles/services/deploy/cloud/templates/nextcloud/database.name +++ b/playbooks/roles/services/deploy/cloud/templates/nextcloud/database.name @@ -1 +1 @@ -{{ services[services_service_name].database_name }} +{{ services[services_service_name].database.name }} diff --git a/playbooks/roles/services/deploy/cloud/templates/nextcloud/database.password b/playbooks/roles/services/deploy/cloud/templates/nextcloud/database.password index 37c8246..4067a9b 100644 --- a/playbooks/roles/services/deploy/cloud/templates/nextcloud/database.password +++ b/playbooks/roles/services/deploy/cloud/templates/nextcloud/database.password @@ -1 +1 @@ -{{ services[services_service_name].database_password }} +{{ services[services_service_name].database.password }} diff --git a/playbooks/roles/services/deploy/cloud/templates/nextcloud/database.user b/playbooks/roles/services/deploy/cloud/templates/nextcloud/database.user index 4fa88f0..23d7866 100644 --- a/playbooks/roles/services/deploy/cloud/templates/nextcloud/database.user +++ b/playbooks/roles/services/deploy/cloud/templates/nextcloud/database.user @@ -1 +1 @@ -{{ services[services_service_name].database_user }} +{{ services[services_service_name].database.user }} diff --git a/playbooks/roles/services/deploy/cloud/templates/systemd/container-cloud-nextcloud.service b/playbooks/roles/services/deploy/cloud/templates/systemd/container-cloud-nextcloud.service index 0ceef49..6751240 100644 --- a/playbooks/roles/services/deploy/cloud/templates/systemd/container-cloud-nextcloud.service +++ b/playbooks/roles/services/deploy/cloud/templates/systemd/container-cloud-nextcloud.service @@ -35,12 +35,12 @@ ExecStart=/usr/bin/podman run \ -e POSTGRES_PASSWORD_FILE=/run/secrets/database.password \ -e NEXTCLOUD_TRUSTED_DOMAINS="{{ services[services_service_name].domain }}" \ -e OVERWRITEPROTOCOL="https" \ - -e SMTP_HOST="{{ services[services_service_name].smtp_host }}" \ + -e SMTP_HOST="{{ services[services_service_name].smtp.host }}" \ -e SMTP_SECURE="ssl" \ -e SMTP_PORT=465 \ -e SMTP_AUTHTYPE="PLAIN" \ - -e SMTP_NAME="{{ services[services_service_name].smtp_name }}" \ - -e SMTP_PASSWORD="{{ services[services_service_name].smtp_password }}" \ + -e SMTP_NAME="{{ services[services_service_name].smtp.user }}" \ + -e SMTP_PASSWORD="{{ services[services_service_name].smtp.password }}" \ -e MAIL_FROM_ADDRESS="cloud" \ -e MAIL_DOMAIN="{{ services[services_service_name].domain }}" \ --name=pod-cloud-nextcloud \ diff --git a/playbooks/roles/services/deploy/git/meta/argument_specs.yml b/playbooks/roles/services/deploy/git/meta/argument_specs.yml index 911d615..2053ee1 100644 --- a/playbooks/roles/services/deploy/git/meta/argument_specs.yml +++ b/playbooks/roles/services/deploy/git/meta/argument_specs.yml @@ -30,24 +30,26 @@ argument_specs: domain: type: "str" required: true - database_name: - type: "str" - required: true - database_user: - type: "str" - required: true - database_passwd: - type: "str" - required: true - smtp_host: - type: "str" - required: true - smtp_name: - type: "str" - required: true - smtp_passwd: - type: "str" - required: true + database: + name: + type: "str" + required: true + user: + type: "str" + required: true + password: + type: "str" + required: true + smtp: + host: + type: "str" + required: true + user: + type: "str" + required: true + password: + type: "str" + required: true ssh_port: type: "int" required: true diff --git a/playbooks/roles/services/deploy/git/templates/systemd/container-git-gitea.service b/playbooks/roles/services/deploy/git/templates/systemd/container-git-gitea.service index 45e8ead..1fd603e 100644 --- a/playbooks/roles/services/deploy/git/templates/systemd/container-git-gitea.service +++ b/playbooks/roles/services/deploy/git/templates/systemd/container-git-gitea.service @@ -29,9 +29,9 @@ ExecStart=/usr/bin/podman run \ -e USER_GID="1000" \ -e GITEA__database__DB_TYPE="postgres" \ -e GITEA__database__HOST="pod-database:5432" \ - -e GITEA__database__NAME="{{ services[services_service_name].database_name }}" \ - -e GITEA__database__USER="{{ services[services_service_name].database_user }}" \ - -e GITEA__database__PASSWD="{{ services[services_service_name].database_passwd }}" \ + -e GITEA__database__NAME="{{ services[services_service_name].database.name }}" \ + -e GITEA__database__USER="{{ services[services_service_name].database.user }}" \ + -e GITEA__database__PASSWD="{{ services[services_service_name].database.password }}" \ -e GITEA__server__DOMAIN="{{ services[services_service_name].domain }}" \ -e GITEA__server__ROOT_URL="https://%(DOMAIN)s/" \ -e GITEA__server__START_SSH_SERVER="true" \ @@ -40,9 +40,9 @@ ExecStart=/usr/bin/podman run \ -e GITEA__mailer__ENABLED="true" \ -e GITEA__mailer__FROM="Gitea " \ -e GITEA__mailer__MAILER_TYPE="smtp" \ - -e GITEA__mailer__HOST="{{ services[services_service_name].smtp_host }}" \ - -e GITEA__mailer__USER="{{ services[services_service_name].smtp_user }}" \ - -e GITEA__mailer__PASSWD="{{ services[services_service_name].smtp_passwd }}" \ + -e GITEA__mailer__HOST="{{ services[services_service_name].smtp.host }}" \ + -e GITEA__mailer__USER="{{ services[services_service_name].smtp.user }}" \ + -e GITEA__mailer__PASSWD="{{ services[services_service_name].smtp.password }}" \ -e GITEA__service__DISABLE_REGISTRATION="true" \ -e GITEA__service__ENABLE_NOTIFY_MAIL="true" \ --name=pod-git-gitea \ diff --git a/playbooks/roles/services/deploy/notes/meta/argument_specs.yml b/playbooks/roles/services/deploy/notes/meta/argument_specs.yml index 23793c2..d5be416 100644 --- a/playbooks/roles/services/deploy/notes/meta/argument_specs.yml +++ b/playbooks/roles/services/deploy/notes/meta/argument_specs.yml @@ -30,21 +30,23 @@ argument_specs: domain: type: "str" required: true - database_name: - type: "str" - required: true - database_user: - type: "str" - required: true - database_password: - type: "str" - required: true - smtp_host: - type: "str" - required: true - smtp_name: - type: "str" - required: true - smtp_password: - type: "str" - required: true + database: + name: + type: "str" + required: true + user: + type: "str" + required: true + password: + type: "str" + required: true + smtp: + host: + type: "str" + required: true + user: + type: "str" + required: true + password: + type: "str" + required: true diff --git a/playbooks/roles/services/deploy/notes/templates/systemd/container-notes-joplin.service b/playbooks/roles/services/deploy/notes/templates/systemd/container-notes-joplin.service index ad191ba..4ceb5a5 100644 --- a/playbooks/roles/services/deploy/notes/templates/systemd/container-notes-joplin.service +++ b/playbooks/roles/services/deploy/notes/templates/systemd/container-notes-joplin.service @@ -27,17 +27,17 @@ ExecStart=/usr/bin/podman run \ -e APP_BASE_URL="https://{{ services[services_service_name].domain }}" \ -e APP_PORT="22300" \ -e DB_CLIENT="pg" \ - -e POSTGRES_PASSWORD="{{ services[services_service_name].database_password }}" \ - -e POSTGRES_DATABASE="{{ services[services_service_name].database_name }}" \ - -e POSTGRES_USER="{{ services[services_service_name].database_user }}" \ + -e POSTGRES_PASSWORD="{{ services[services_service_name].database.password }}" \ + -e POSTGRES_DATABASE="{{ services[services_service_name].database.name }}" \ + -e POSTGRES_USER="{{ services[services_service_name].database.user }}" \ -e POSTGRES_PORT="5432" \ -e POSTGRES_HOST="pod-database" \ -e MAILER_ENABLED="true" \ - -e MAILER_HOST="{{ services[services_service_name].smtp_host }}" \ + -e MAILER_HOST="{{ services[services_service_name].smtp.host }}" \ -e MAILER_PORT=465 \ -e MAILER_SECURITY="tls" \ - -e MAILER_AUTH_USER="{{ services[services_service_name].smtp_name }}" \ - -e MAILER_AUTH_PASSWORD="{{ services[services_service_name].smtp_password }}" \ + -e MAILER_AUTH_USER="{{ services[services_service_name].smtp.user }}" \ + -e MAILER_AUTH_PASSWORD="{{ services[services_service_name].smtp.password }}" \ -e MAILER_NOREPLY_NAME="Joplin" \ -e MAILER_NOREPLY_EMAIL="notes@{{ services[services_service_name].domain }}" \ -e STORAGE_DRIVER="Type=Filesystem; Path=/data" \ diff --git a/playbooks/roles/services/deploy/www/meta/argument_specs.yml b/playbooks/roles/services/deploy/www/meta/argument_specs.yml index 4b8715f..7a1138a 100644 --- a/playbooks/roles/services/deploy/www/meta/argument_specs.yml +++ b/playbooks/roles/services/deploy/www/meta/argument_specs.yml @@ -22,9 +22,10 @@ argument_specs: required: true services: www: - repo_user: - type: "str" - required: true - repo_token: - type: "str" - required: true + repo: + user: + type: "str" + required: true + token: + type: "str" + required: true diff --git a/playbooks/roles/services/deploy/www/tasks/main.yml b/playbooks/roles/services/deploy/www/tasks/main.yml index 65a2536..c775d28 100644 --- a/playbooks/roles/services/deploy/www/tasks/main.yml +++ b/playbooks/roles/services/deploy/www/tasks/main.yml @@ -56,8 +56,8 @@ - name: "clone website repository" ansible.builtin.git: repo: "\ - https://{{ services[services_service_name].repo_user }}:\ - {{ services[services_service_name].repo_token }}@\ + https://{{ services[services_service_name].repo.user }}:\ + {{ services[services_service_name].repo.token }}@\ git.wojciechkozlowski.eu/wojtek/wojciechkozlowski.eu.git" dest: "\ {{ services_service_user_home }}/.config/{{ services_service_user_name }}/\