From fdc8fdb7c26295b033f2c116bad8bb7c1ebb9800 Mon Sep 17 00:00:00 2001 From: giancarlo Date: Wed, 29 Jun 2022 11:49:26 +0200 Subject: [PATCH] Updated Variables --- README.md | 4 ++-- defaults/main.yml | 4 ++-- tasks/main.yml | 2 +- templates/epas-teleworker-docker-compose.yml.j2 | 2 +- templates/pg-create-user-db.sh.j2 | 2 +- templates/postgresql.yml | 2 +- vars/main.yml | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 394a785..89d2c94 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ epas_teleworker_docker_registry: 'docker-registry.services.iit.cnr.it' epas_teleworker_docker_server_image: '{{ epas_teleworker_docker_registry }}/epas/telework-stampings:latest' epas_teleworker_docker_server_build: './' epas_teleworker_docker_registry_user: 'epas.user' -#epas_teleworker_docker_registry_pwd: 'use a vault file' +#epas_teleworker_docker_registry_password: 'use a vault file' epas_teleworker_docker_network: 'epas_net' epas_teleworker_attachments_node: 'localhost' epas_teleworker_node_constraints: 'node.labels.epas_teleworker_storage == attachments' @@ -35,7 +35,7 @@ epas_teleworker_db_name: 'epas_teleworker_prod_db' epas_teleworker_db_allowed_hosts: - '127.0.0.1' epas_teleworker_db_user: 'epas_teleworker_prod_user' -#epas_teleworker_db_pwd: 'set it in a vault file' +#epas_teleworker_db_password: 'set it in a vault file' epas_teleworker_db_host_auth_method: 'password' epas_teleworker_db_volume: 'epas_teleworker_prod_pg_data' epas_teleworker_db_constraints: '[node.labels.epas_teleworker_pg_data==epas_teleworker_db]' diff --git a/defaults/main.yml b/defaults/main.yml index a9c6880..9fd51e4 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -5,7 +5,7 @@ epas_teleworker_docker_registry: 'docker-registry.services.iit.cnr.it' epas_teleworker_docker_server_image: '{{ epas_teleworker_docker_registry }}/epas/telework-stampings:latest' epas_teleworker_docker_server_build: './' epas_teleworker_docker_registry_user: 'epas.user' -#epas_teleworker_docker_registry_pwd: 'use a vault file' +#epas_teleworker_docker_registry_password: 'use a vault file' epas_teleworker_docker_network: 'epas_net' epas_teleworker_attachments_node: 'localhost' epas_teleworker_node_constraints: 'node.labels.epas_teleworker_storage == attachments' @@ -25,7 +25,7 @@ epas_teleworker_db_name: 'epas_teleworker_prod_db' epas_teleworker_db_allowed_hosts: - '127.0.0.1' epas_teleworker_db_user: 'epas_teleworker_prod_user' -#epas_teleworker_db_pwd: 'set it in a vault file' +#epas_teleworker_db_password: 'set it in a vault file' epas_teleworker_db_host_auth_method: 'password' epas_teleworker_db_volume: 'epas_teleworker_prod_pg_data' epas_teleworker_db_constraints: '[node.labels.epas_teleworker_pg_data==epas_teleworker_db]' diff --git a/tasks/main.yml b/tasks/main.yml index 33a8c6d..1c6fba4 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -29,7 +29,7 @@ template: src=epas-teleworker-docker-compose.yml.j2 dest={{ epas_teleworker_compose_dir }}/docker-epas-teleworker-stack.yml owner=root group=root mode='0400' - name: Login into the IIT registry - shell: docker login -u {{ epas_teleworker_docker_registry_user }} -p {{ epas_teleworker_docker_registry_pwd }} {{ epas_teleworker_docker_registry }} + shell: docker login -u {{ epas_teleworker_docker_registry_user }} -p {{ epas_teleworker_docker_registry_password }} {{ epas_teleworker_docker_registry }} - name: Start the ePAS Teleworker stack docker_stack: diff --git a/templates/epas-teleworker-docker-compose.yml.j2 b/templates/epas-teleworker-docker-compose.yml.j2 index 1bd61a1..a030fc3 100644 --- a/templates/epas-teleworker-docker-compose.yml.j2 +++ b/templates/epas-teleworker-docker-compose.yml.j2 @@ -32,7 +32,7 @@ services: - POSTGRESQL_SERVER_PORT={{ epas_teleworker_db_port }} - POSTGRESQL_DATABASE_NAME={{ epas_teleworker_db_name }} - POSTGRESQL_USERNAME={{ epas_teleworker_db_user }} - - POSTGRESQL_PASSWORD={{ epas_teleworker_db_pwd }} + - POSTGRESQL_PASSWORD={{ epas_teleworker_db_password }} deploy: mode: replicated replicas: 1 diff --git a/templates/pg-create-user-db.sh.j2 b/templates/pg-create-user-db.sh.j2 index 68fd650..f5ed414 100644 --- a/templates/pg-create-user-db.sh.j2 +++ b/templates/pg-create-user-db.sh.j2 @@ -3,7 +3,7 @@ set -e psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL - CREATE USER {{ epas_teleworker_db_user }} password '{{ epas_teleworker_db_pwd }}'; + CREATE USER {{ epas_teleworker_db_user }} password '{{ epas_teleworker_db_password }}'; CREATE DATABASE {{ epas_teleworker_db_name }} OWNER {{ epas_teleworker_db_user }} ENCODING UTF8 LC_COLLATE 'en_US.UTF-8' LC_CTYPE 'en_US.UTF-8' diff --git a/templates/postgresql.yml b/templates/postgresql.yml index d3a8b8f..b43564c 100644 --- a/templates/postgresql.yml +++ b/templates/postgresql.yml @@ -5,7 +5,7 @@ services: environment: - POSTGRES_DB={{epas_telewoerker_db_name}} - POSTGRES_USER={{epas_telewoerker_db_user}} - - POSTGRES_PASSWORD={{epas_teleworker_db_pwd}} + - POSTGRES_PASSWORD={{epas_teleworker_db_password}} - POSTGRES_HOST_AUTH_METHOD={{epas_teleworker_db_host_auth_method}} - PGDATA=/var/lib/postgresql/data/pg_data ports: diff --git a/vars/main.yml b/vars/main.yml index a20b17e..86c0372 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -2,4 +2,4 @@ epas_teleworker_compose_dir: '/srv/epas_teleworker_stack' epas_psql_pg_data: - - { db_host: '{{ epas_teleworker_db_host }}', pgsql_version: '{{ epas_teleworker_pg_version }}', name: '{{ epas_teleworker_db_name }}', encoding: 'UTF8', user: '{{ epas_teleworker_db_user }}', roles: 'NOCREATEDB,NOSUPERUSER', pwd: '{{ epas_teleworker_db_pwd }}', managedb: True, allowed_hosts: '{{ epas_teleworker_db_allowed_hosts }}' } + - { db_host: '{{ epas_teleworker_db_host }}', pgsql_version: '{{ epas_teleworker_pg_version }}', name: '{{ epas_teleworker_db_name }}', encoding: 'UTF8', user: '{{ epas_teleworker_db_user }}', roles: 'NOCREATEDB,NOSUPERUSER', pwd: '{{ epas_teleworker_db_password }}', managedb: True, allowed_hosts: '{{ epas_teleworker_db_allowed_hosts }}' }