diff --git a/ansible/playbooks/paas/roles/ansible-docker/defaults/main.yml b/ansible/playbooks/paas/roles/ansible-docker/defaults/main.yml index 5123c51c..36380a0a 100644 --- a/ansible/playbooks/paas/roles/ansible-docker/defaults/main.yml +++ b/ansible/playbooks/paas/roles/ansible-docker/defaults/main.yml @@ -9,13 +9,10 @@ docker_tls_configuration: false docker_tcp_listen_address: "127.0.0.1" docker_tcp_listen_port: 2376 -docker_private_registry_state: false -docker_private_registry_url: "" -docker_private_registry_username: "" -docker_private_registry_password: "" -docker_private_registry_config: - - /etc/docker/config.json - - /root/.docker/config.json +docker_private_registry: + url: "" + username: "" + password: "" # DNS docker_dns_configuration: true @@ -25,6 +22,12 @@ docker_dns_servers: docker_metrics_addr: "{{ docker_tcp_listen_address }}:9323" +docker_runtimes: [] + # - key: nvidia + # value: + # args: {} + # path: nvidia-container-runtime + # TLS # CA docker_ca_install_tls_ca_host: localhost diff --git a/ansible/playbooks/paas/roles/ansible-docker/tasks/install.yml b/ansible/playbooks/paas/roles/ansible-docker/tasks/install.yml index dd13b02f..2f406869 100644 --- a/ansible/playbooks/paas/roles/ansible-docker/tasks/install.yml +++ b/ansible/playbooks/paas/roles/ansible-docker/tasks/install.yml @@ -63,21 +63,18 @@ - name: Create home docker directory ansible.builtin.file: path: "{{ item }}" - recurse: true state: directory mode: '0755' loop: - /root/.docker -- name: Copy config.json +- name: Copy config.json to root directory ansible.builtin.template: src: config.json.j2 - dest: "{{ item }}" + dest: /root/.docker/config.json owner: root group: root mode: '0600' - when: docker_private_registry_state - loop: "{{ docker_private_registry_config }}" notify: Docker_restart - name: Copy daemon.json for DNS resolution diff --git a/ansible/playbooks/paas/roles/ansible-docker/templates/config.json.j2 b/ansible/playbooks/paas/roles/ansible-docker/templates/config.json.j2 index 595fe403..753a6ec5 100644 --- a/ansible/playbooks/paas/roles/ansible-docker/templates/config.json.j2 +++ b/ansible/playbooks/paas/roles/ansible-docker/templates/config.json.j2 @@ -1,7 +1,7 @@ { "auths": { - "{{ docker_private_registry_url }}": { - "auth": "{{ (docker_private_registry_username + ':' + docker_private_registry_password) | b64encode }}" + "{{ docker_private_registry.url }}": { + "auth": "{{ (docker_private_registry.username + ':' + docker_private_registry.password) | b64encode }}" } } } diff --git a/ansible/playbooks/paas/roles/ansible-docker/templates/daemon.json.j2 b/ansible/playbooks/paas/roles/ansible-docker/templates/daemon.json.j2 index 95048c5e..6dcbb879 100644 --- a/ansible/playbooks/paas/roles/ansible-docker/templates/daemon.json.j2 +++ b/ansible/playbooks/paas/roles/ansible-docker/templates/daemon.json.j2 @@ -1,4 +1,8 @@ { "metrics-addr" : "{{ docker_metrics_addr }}", - "dns": [{% for item in docker_dns_servers %}"{{ item }}"{% if not loop.last %},{% endif %}{% endfor %}] + "dns": [{% for item in docker_dns_servers %}"{{ item }}"{% if not loop.last %},{% endif %}{% endfor %}], + "runtimes": { + {%- for runtime in docker_runtimes | default([]) -%} + "{{ runtime.key }}": {{ runtime.value | to_json }}{% if not loop.last %},{% endif %}{% endfor %} + } } diff --git a/ansible/playbooks/paas/roles/coredns/templates/Corefile.j2 b/ansible/playbooks/paas/roles/coredns/templates/Corefile.j2 index 9dd4e207..f74e37f3 100644 --- a/ansible/playbooks/paas/roles/coredns/templates/Corefile.j2 +++ b/ansible/playbooks/paas/roles/coredns/templates/Corefile.j2 @@ -4,7 +4,7 @@ service.nomad.:1053 { #debug #log nomad { - address https://{{ hostvars[nomad_primary_master_node | default(inventory_hostname)]['ansible_' + nomad_iface].ipv4.address | default('127.0.0.1') }}:4646 + address https://{{ hostvars[nomad_primary_master_node | default(inventory_hostname)]['ansible_' + hostvars[nomad_primary_master_node | default(inventory_hostname)].nomad_iface].ipv4.address | default('127.0.0.1') }}:4646 token {{ lookup('simple-stack-ui', type='secret', key=nomad_primary_master_node | default(inventory_hostname), subkey='nomad_management_token', missing='error') }} ttl 10 } diff --git a/ansible/playbooks/paas/roles/coredns/vars/upstream.yml b/ansible/playbooks/paas/roles/coredns/vars/upstream.yml index 036aa64c..df805dec 100644 --- a/ansible/playbooks/paas/roles/coredns/vars/upstream.yml +++ b/ansible/playbooks/paas/roles/coredns/vars/upstream.yml @@ -1,4 +1,4 @@ --- -latest_version: "{{ (lookup('url', 'https://api.github.com/repos/{{ image.upstream.user }}/{{ image.upstream.repo }}/releases/latest', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json).get('tag_name') | replace('v', '') }}" +latest_version: "{{ (lookup('url', 'https://api.github.com/repos/' + image.upstream.user + '/' + image.upstream.repo + '/releases/latest', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json).get('tag_name') | replace('v', '') }}" upstream_file_name: "{{ image.upstream.file | replace('REPO', image.upstream.repo) | replace('VERSION', latest_version) | replace('OS', image.upstream.os) | replace('ARCH', upstream_default_arch) | replace('FORMAT', image.upstream.format) }}" upstream_file_url: "https://github.com/{{ image.upstream.user }}/{{ image.upstream.repo }}/releases/download/v{{ latest_version }}/{{ upstream_file_name }}" diff --git a/ansible/playbooks/paas/roles/nomad/defaults/main.yml b/ansible/playbooks/paas/roles/nomad/defaults/main.yml index 2c06958d..53d05854 100644 --- a/ansible/playbooks/paas/roles/nomad/defaults/main.yml +++ b/ansible/playbooks/paas/roles/nomad/defaults/main.yml @@ -18,6 +18,7 @@ nomad_group: simplestack nomad_dc_name: dc1 nomad_project: "{{ fact_instance.project }}" +nomad_provider: "{{ fact_instance.provider }}" nomad_region: "{{ fact_instance.region }}" nomad_location: "{{ fact_instance.region }}" @@ -199,8 +200,8 @@ nomad_tls_ip_range: "{{ ((range(0,256) | map('regex_replace', '^', 'IP:192.168.0 nomad_tls_check_delay: "+2w" # TLS Server -nomad_tls_cert_server: "{{ nomad_dc_name }}-server-nomad.pem" -nomad_tls_privatekey_server: "{{ nomad_dc_name }}-server-nomad.key" +nomad_tls_cert_server: "{{ nomad_region }}-{{ nomad_provider }}-{{ nomad_dc_name }}-server-nomad.pem" +nomad_tls_privatekey_server: "{{ nomad_region }}-{{ nomad_provider }}-{{ nomad_dc_name }}-server-nomad.key" nomad_tls_common_name_server: "*.{{ nomad_dc_name }}.{{ nomad_tls_common_name }}" nomad_tls_subject_alt_name_server: "DNS:localhost,IP:127.0.0.1,IP:172.17.0.1,{{ nomad_tls_ip_range }},DNS:server.global.nomad,DNS:server.{{ nomad_region }}.nomad,DNS:server.{{ nomad_dc_name }}.nomad,DNS:*.{{ nomad_dc_name }}.nomad" diff --git a/ansible/playbooks/paas/roles/nomad/tasks/04_tls_certs.yml b/ansible/playbooks/paas/roles/nomad/tasks/04_tls_certs.yml index d09a3da5..0b6e2b54 100644 --- a/ansible/playbooks/paas/roles/nomad/tasks/04_tls_certs.yml +++ b/ansible/playbooks/paas/roles/nomad/tasks/04_tls_certs.yml @@ -1,11 +1,11 @@ --- -- name: "Certificate | Create TLS directory on target" +- name: "Nomad | Create TLS directory on target" ansible.builtin.file: path: "{{ nomad_tls_host_certificate_dir }}" state: directory mode: '0755' -- name: "Certificate | Copy Public certs on nodes - {{ nomad_tls_ca_pubkey }}" +- name: "Nomad | Copy Public certs on nodes - {{ nomad_tls_ca_pubkey }}" ansible.builtin.copy: src: "{{ nomad_tls_ca_host_dir }}/{{ nomad_tls_ca_pubkey }}" dest: "{{ nomad_tls_host_certificate_dir }}/{{ nomad_tls_ca_pubkey }}" @@ -42,7 +42,7 @@ certificate_client_privatekey: "{{ nomad_tls_privatekey_server }}" certificate_common_name: "{{ nomad_tls_common_name_server }}" certificate_subject_alt_name: "{{ nomad_tls_subject_alt_name_server }}" - run_once: true + # run_once: true when: not cert_tls_server_present.stat.exists or (cert_tls_server_present.stat.exists and not tls_check_server.valid_at.delay) - name: "Nomad | Copy certificates on server nodes" @@ -64,7 +64,7 @@ block: - name: "Nomad | Check if TLS cert exists for Client" ansible.builtin.stat: - path: "{{ nomad_tls_ca_host_dir }}{{ nomad_tls_cert_client }}" + path: "{{ nomad_tls_host_certificate_dir }}/{{ nomad_tls_cert_client }}" register: cert_tls_client_present - name: "Nomad | Get information on generated certificate for Clients" @@ -88,7 +88,7 @@ certificate_client_privatekey: "{{ nomad_tls_privatekey_client }}" certificate_common_name: "{{ nomad_tls_common_name_client }}" certificate_subject_alt_name: "{{ nomad_tls_subject_alt_name_client }}" - run_once: true + # run_once: true when: not cert_tls_client_present.stat.exists or (cert_tls_client_present.stat.exists and not tls_check_client.valid_at.delay) diff --git a/ansible/playbooks/paas/roles/nomad/tasks/06_configuration.yml b/ansible/playbooks/paas/roles/nomad/tasks/06_configuration.yml index ad553fe4..98f5629f 100644 --- a/ansible/playbooks/paas/roles/nomad/tasks/06_configuration.yml +++ b/ansible/playbooks/paas/roles/nomad/tasks/06_configuration.yml @@ -38,6 +38,7 @@ owner: nomad group: nomad mode: "0644" + notify: Nomad_restart - name: "Nomad Install | Copy configurations files for servers" ansible.builtin.template: diff --git a/ansible/playbooks/paas/roles/nomad/tasks/07_autoeligibility.yml b/ansible/playbooks/paas/roles/nomad/tasks/07_autoeligibility.yml index 3f0c4d0b..31356c66 100644 --- a/ansible/playbooks/paas/roles/nomad/tasks/07_autoeligibility.yml +++ b/ansible/playbooks/paas/roles/nomad/tasks/07_autoeligibility.yml @@ -17,10 +17,6 @@ return_content: true register: nomad_policies_list_raw - - name: Debug nomad_policies_list_raw (for auto eligibility) - ansible.builtin.debug: - msg: "{{ nomad_policies_list_raw.json }}" - - name: "Nomad Policy | Set policies list fact" ansible.builtin.set_fact: nomad_policies_list: "{{ nomad_policies_list_raw.json | community.general.json_query('[*].Name') | string }}" diff --git a/ansible/playbooks/paas/roles/nomad/templates/nomad.hcl.j2 b/ansible/playbooks/paas/roles/nomad/templates/nomad.hcl.j2 index a222679b..63e31586 100644 --- a/ansible/playbooks/paas/roles/nomad/templates/nomad.hcl.j2 +++ b/ansible/playbooks/paas/roles/nomad/templates/nomad.hcl.j2 @@ -79,12 +79,14 @@ telemetry { circonus_broker_select_tag = "" } +{% if nomad_servers | length >= 3 %} autopilot { cleanup_dead_servers = {{ nomad_autopilot_cleanup_dead_servers | lower }} last_contact_threshold = "{{ nomad_autopilot_last_contact_threshold }}" max_trailing_logs = {{ nomad_autopilot_max_trailing_logs }} server_stabilization_time = "{{ nomad_autopilot_server_stabilization_time }}" } +{% endif %} limits { http_max_conns_per_client = 300 diff --git a/ansible/playbooks/saas/roles/nomad/tasks/job_action.yml b/ansible/playbooks/saas/roles/nomad/tasks/job_action.yml index 210728ad..affd3419 100644 --- a/ansible/playbooks/saas/roles/nomad/tasks/job_action.yml +++ b/ansible/playbooks/saas/roles/nomad/tasks/job_action.yml @@ -14,9 +14,10 @@ environment: NOMAD_ADDR: "https://{{ nomad_http_ip }}:4646" NOMAD_TOKEN: "{{ lookup('simple-stack-ui', type='secret', key=inventory_hostname, subkey='nomad_management_token', missing='error') }}" - NOMAD_CLIENT_CERT: "{{ nomad_tls_host_certificate_dir }}/{{ nomad_tls_cert_server }}" - NOMAD_CLIENT_KEY: "{{ nomad_tls_host_certificate_dir }}/{{ nomad_tls_privatekey_server }}" - NOMAD_CACERT: "{{ nomad_tls_host_certificate_dir }}/{{ nomad_tls_ca_pubkey }}" + NOMAD_SKIP_VERIFY: true + # NOMAD_CLIENT_CERT: "{{ nomad_tls_host_certificate_dir }}/{{ nomad_tls_cert_server }}" + # NOMAD_CLIENT_KEY: "{{ nomad_tls_host_certificate_dir }}/{{ nomad_tls_privatekey_server }}" + # NOMAD_CACERT: "{{ nomad_tls_host_certificate_dir }}/{{ nomad_tls_ca_pubkey }}" register: nomad_job_start failed_when: nomad_job_start.rc >= 2 changed_when: diff --git a/ansible/playbooks/saas/roles/nomad/tasks/job_periodic_run.yml b/ansible/playbooks/saas/roles/nomad/tasks/job_periodic_run.yml index 61a04302..4d812a43 100644 --- a/ansible/playbooks/saas/roles/nomad/tasks/job_periodic_run.yml +++ b/ansible/playbooks/saas/roles/nomad/tasks/job_periodic_run.yml @@ -6,9 +6,10 @@ environment: NOMAD_ADDR: "https://{{ nomad_http_ip }}:4646" NOMAD_TOKEN: "{{ lookup('simple-stack-ui', type='secret', key=inventory_hostname, subkey='nomad_management_token', missing='error') }}" - NOMAD_CLIENT_CERT: "{{ nomad_tls_host_certificate_dir }}/{{ nomad_tls_cert_server }}" - NOMAD_CLIENT_KEY: "{{ nomad_tls_host_certificate_dir }}/{{ nomad_tls_privatekey_server }}" - NOMAD_CACERT: "{{ nomad_tls_host_certificate_dir }}/{{ nomad_tls_ca_pubkey }}" + NOMAD_SKIP_VERIFY: true + # NOMAD_CLIENT_CERT: "{{ nomad_tls_host_certificate_dir }}/{{ nomad_tls_cert_server }}" + # NOMAD_CLIENT_KEY: "{{ nomad_tls_host_certificate_dir }}/{{ nomad_tls_privatekey_server }}" + # NOMAD_CACERT: "{{ nomad_tls_host_certificate_dir }}/{{ nomad_tls_ca_pubkey }}" register: nomad_job_start failed_when: nomad_job_start.rc >= 2 changed_when: diff --git a/ansible/playbooks/saas/roles/nomad/tasks/job_restart.yml b/ansible/playbooks/saas/roles/nomad/tasks/job_restart.yml index e445e948..146a8071 100644 --- a/ansible/playbooks/saas/roles/nomad/tasks/job_restart.yml +++ b/ansible/playbooks/saas/roles/nomad/tasks/job_restart.yml @@ -4,8 +4,9 @@ environment: NOMAD_ADDR: "https://{{ nomad_http_ip }}:4646" NOMAD_TOKEN: "{{ lookup('simple-stack-ui', type='secret', key=inventory_hostname, subkey='nomad_management_token', missing='error') }}" - NOMAD_CLIENT_CERT: "{{ nomad_tls_host_certificate_dir }}/{{ nomad_tls_cert_server }}" - NOMAD_CLIENT_KEY: "{{ nomad_tls_host_certificate_dir }}/{{ nomad_tls_privatekey_server }}" - NOMAD_CACERT: "{{ nomad_tls_host_certificate_dir }}/{{ nomad_tls_ca_pubkey }}" + NOMAD_SKIP_VERIFY: true + # NOMAD_CLIENT_CERT: "{{ nomad_tls_host_certificate_dir }}/{{ nomad_tls_cert_server }}" + # NOMAD_CLIENT_KEY: "{{ nomad_tls_host_certificate_dir }}/{{ nomad_tls_privatekey_server }}" + # NOMAD_CACERT: "{{ nomad_tls_host_certificate_dir }}/{{ nomad_tls_ca_pubkey }}" register: nomad_job_restart changed_when: nomad_job_restart.rc != 0 diff --git a/ansible/playbooks/saas/roles/nomad/tasks/job_run.yml b/ansible/playbooks/saas/roles/nomad/tasks/job_run.yml index ad993bda..c83d58ce 100644 --- a/ansible/playbooks/saas/roles/nomad/tasks/job_run.yml +++ b/ansible/playbooks/saas/roles/nomad/tasks/job_run.yml @@ -6,9 +6,10 @@ environment: NOMAD_ADDR: "https://{{ nomad_http_ip }}:4646" NOMAD_TOKEN: "{{ lookup('simple-stack-ui', type='secret', key=inventory_hostname, subkey='nomad_management_token', missing='error') }}" - NOMAD_CLIENT_CERT: "{{ nomad_tls_host_certificate_dir }}/{{ nomad_tls_cert_server }}" - NOMAD_CLIENT_KEY: "{{ nomad_tls_host_certificate_dir }}/{{ nomad_tls_privatekey_server }}" - NOMAD_CACERT: "{{ nomad_tls_host_certificate_dir }}/{{ nomad_tls_ca_pubkey }}" + NOMAD_SKIP_VERIFY: true + # NOMAD_CLIENT_CERT: "{{ nomad_tls_host_certificate_dir }}/{{ nomad_tls_cert_server }}" + # NOMAD_CLIENT_KEY: "{{ nomad_tls_host_certificate_dir }}/{{ nomad_tls_privatekey_server }}" + # NOMAD_CACERT: "{{ nomad_tls_host_certificate_dir }}/{{ nomad_tls_ca_pubkey }}" register: nomad_job_start failed_when: nomad_job_start.rc >= 2 changed_when: diff --git a/ansible/playbooks/saas/roles/nomad/tasks/job_stop.yml b/ansible/playbooks/saas/roles/nomad/tasks/job_stop.yml index 7f50852d..73b49d9c 100644 --- a/ansible/playbooks/saas/roles/nomad/tasks/job_stop.yml +++ b/ansible/playbooks/saas/roles/nomad/tasks/job_stop.yml @@ -4,9 +4,10 @@ environment: NOMAD_ADDR: "https://{{ nomad_http_ip }}:4646" NOMAD_TOKEN: "{{ lookup('simple-stack-ui', type='secret', key=inventory_hostname, subkey='nomad_management_token', missing='error') }}" - NOMAD_CLIENT_CERT: "{{ nomad_tls_host_certificate_dir }}/{{ nomad_tls_cert_server }}" - NOMAD_CLIENT_KEY: "{{ nomad_tls_host_certificate_dir }}/{{ nomad_tls_privatekey_server }}" - NOMAD_CACERT: "{{ nomad_tls_host_certificate_dir }}/{{ nomad_tls_ca_pubkey }}" + NOMAD_SKIP_VERIFY: true + # NOMAD_CLIENT_CERT: "{{ nomad_tls_host_certificate_dir }}/{{ nomad_tls_cert_server }}" + # NOMAD_CLIENT_KEY: "{{ nomad_tls_host_certificate_dir }}/{{ nomad_tls_privatekey_server }}" + # NOMAD_CACERT: "{{ nomad_tls_host_certificate_dir }}/{{ nomad_tls_ca_pubkey }}" register: nomad_job_stop failed_when: | nomad_job_stop.rc >=1 and diff --git a/ansible/playbooks/saas/roles/traefik/tasks/main.yml b/ansible/playbooks/saas/roles/traefik/tasks/main.yml index ecb898bf..65d5fad2 100644 --- a/ansible/playbooks/saas/roles/traefik/tasks/main.yml +++ b/ansible/playbooks/saas/roles/traefik/tasks/main.yml @@ -3,8 +3,8 @@ ansible.builtin.uri: url: "https://{{ nomad_http_ip }}:4646/v1/acl/policies" ca_path: "/etc/ssl/simplestack/simplestack-ca.pem" - client_cert: "/etc/ssl/simplestack/{{ fact_instance.datacenter }}-server-nomad.pem" - client_key: "/etc/ssl/simplestack/{{ fact_instance.datacenter }}-server-nomad.key" + client_cert: "/etc/ssl/simplestack/{{ fact_instance.region }}-{{ fact_instance.provider }}-dc1-server-nomad.pem" + client_key: "/etc/ssl/simplestack/{{ fact_instance.region }}-{{ fact_instance.provider }}-dc1-server-nomad.key" method: GET headers: X-Nomad-Token: "{{ lookup('simple-stack-ui', type='secret', key=inventory_hostname, subkey='nomad_management_token', missing='error') }}" @@ -18,8 +18,8 @@ ansible.builtin.uri: url: "https://{{ nomad_http_ip }}:4646/v1/acl/policy/traefik" ca_path: "/etc/ssl/simplestack/simplestack-ca.pem" - client_cert: "/etc/ssl/simplestack/{{ fact_instance.datacenter }}-server-nomad.pem" - client_key: "/etc/ssl/simplestack/{{ fact_instance.datacenter }}-server-nomad.key" + client_cert: "/etc/ssl/simplestack/{{ fact_instance.region }}-{{ fact_instance.provider }}-dc1-server-nomad.pem" + client_key: "/etc/ssl/simplestack/{{ fact_instance.region }}-{{ fact_instance.provider }}-dc1-server-nomad.key" method: POST headers: X-Nomad-Token: "{{ lookup('simple-stack-ui', type='secret', key=inventory_hostname, subkey='nomad_management_token', missing='error') }}" @@ -41,8 +41,8 @@ ansible.builtin.uri: url: "https://{{ nomad_http_ip }}:4646/v1/acl/tokens" ca_path: "/etc/ssl/simplestack/simplestack-ca.pem" - client_cert: "/etc/ssl/simplestack/{{ fact_instance.datacenter }}-server-nomad.pem" - client_key: "/etc/ssl/simplestack/{{ fact_instance.datacenter }}-server-nomad.key" + client_cert: "/etc/ssl/simplestack/{{ fact_instance.region }}-{{ fact_instance.provider }}-dc1-server-nomad.pem" + client_key: "/etc/ssl/simplestack/{{ fact_instance.region }}-{{ fact_instance.provider }}-dc1-server-nomad.key" method: GET headers: X-Nomad-Token: "{{ lookup('simple-stack-ui', type='secret', key=inventory_hostname, subkey='nomad_management_token', missing='error') }}" @@ -56,8 +56,8 @@ ansible.builtin.uri: url: "https://{{ nomad_http_ip }}:4646/v1/acl/token" ca_path: "/etc/ssl/simplestack/simplestack-ca.pem" - client_cert: "/etc/ssl/simplestack/{{ fact_instance.datacenter }}-server-nomad.pem" - client_key: "/etc/ssl/simplestack/{{ fact_instance.datacenter }}-server-nomad.key" + client_cert: "/etc/ssl/simplestack/{{ fact_instance.region }}-{{ fact_instance.provider }}-dc1-server-nomad.pem" + client_key: "/etc/ssl/simplestack/{{ fact_instance.region }}-{{ fact_instance.provider }}-dc1-server-nomad.key" method: PUT headers: X-Nomad-Token: "{{ lookup('simple-stack-ui', type='secret', key=inventory_hostname, subkey='nomad_management_token', missing='error') }}" diff --git a/ansible/playbooks/saas/roles/traefik/templates/traefik.toml b/ansible/playbooks/saas/roles/traefik/templates/traefik.toml index 94137953..e4500e99 100644 --- a/ansible/playbooks/saas/roles/traefik/templates/traefik.toml +++ b/ansible/playbooks/saas/roles/traefik/templates/traefik.toml @@ -2,9 +2,9 @@ checkNewVersion = false sendAnonymousUsage = false -[api] - dashboard = true - insecure = true +#[api] +# dashboard = true +# insecure = true [entryPoints] [entryPoints.http] diff --git a/ansible/playbooks/saas/roles/traefik/templates/traefik_tag.j2 b/ansible/playbooks/saas/roles/traefik/templates/traefik_tag.j2 index 5b57eca5..6807b530 100644 --- a/ansible/playbooks/saas/roles/traefik/templates/traefik_tag.j2 +++ b/ansible/playbooks/saas/roles/traefik/templates/traefik_tag.j2 @@ -5,7 +5,7 @@ "traefik.http.routers.{{ service_name }}.tls.certresolver=myresolver", "traefik.http.routers.{{ service_name }}.tls.options=mintls12@file", "traefik.http.routers.{{ service_name }}.entrypoints=https", -"traefik.http.routers.{{ service_name }}.rule=Host(`{{ domain }}`){% if software.domain_alias is defined and software.domain_alias != "" %} || Host(`{{ software.domain_alias }}`){% endif %}", +"traefik.http.routers.{{ service_name }}.rule=Host(`{{ domain }}`){% if software.domain_alias is defined and software.domain_alias != "" %}{% for alias in (software.domain_alias | split(',')) %} || Host(`{{ alias }}`){% endfor %}{% endif %}", "traefik.http.middlewares.{{ service_name }}.redirectscheme.scheme=https", "traefik.http.middlewares.{{ service_name }}.redirectscheme.permanent=true", "traefik.http.middlewares.{{ service_name }}-headers.headers.customResponseHeaders.Strict-Transport-Security=max-age=63072000", diff --git a/ansible/playbooks/saas/roles/wordpress/tasks/build.yml b/ansible/playbooks/saas/roles/wordpress/tasks/build.yml index 89be0979..eb4be163 100644 --- a/ansible/playbooks/saas/roles/wordpress/tasks/build.yml +++ b/ansible/playbooks/saas/roles/wordpress/tasks/build.yml @@ -7,9 +7,7 @@ - name: Set custom variables ansible.builtin.set_fact: image_version: "{{ (latest_version | split('-'))[0] }}" - image_name: "{{ image.name }}" - image_labels: "{{ image.labels }}" - image_build: "{{ image.build }}" + image_definition: "{{ image }}" - name: End playbook if no new version ansible.builtin.meta: end_host diff --git a/ansible/playbooks/saas/roles/wordpress/vars/actions.yml b/ansible/playbooks/saas/roles/wordpress/vars/actions.yml index c73939b1..c4caf77b 100644 --- a/ansible/playbooks/saas/roles/wordpress/vars/actions.yml +++ b/ansible/playbooks/saas/roles/wordpress/vars/actions.yml @@ -7,4 +7,4 @@ wordpress_actions: - "{{ software_path }}/var/backup:/var/backup:rw" - "/usr/local/bin/wordpress-backup:/usr/local/bin/wordpress-backup:ro" - "/usr/local/bin/wordpress-restore:/usr/local/bin/wordpress-restore:ro" - image: "wordpress:{{ softwares.wordpress.version }}" + image: "{{ docker_private_registry.url }}/wordpress:{{ softwares.wordpress.version }}" diff --git a/ui/index.js.map b/ui/index.js.map index d634edcc..2e07593c 100644 --- a/ui/index.js.map +++ b/ui/index.js.map @@ -308,7 +308,7 @@ "auth": 1, "params": "id:string", "id": "variables_update", - "input": "*type:String, *key:String, status:Boolean, value:String", + "input": "*type:String, *key:String, value:String", "name": "Update a variable set" }, { @@ -488,7 +488,6 @@ }, { "name": "Infrastructures/import", - "params": "*id:UID", "input": "*color:Color, *description:String, *dtcreated:String, *icon:Icon, isarchived:Boolean, *name:String, *tfstate:Json" }, { @@ -541,7 +540,7 @@ }, { "name": "Softwares/import", - "params": "*id:UID", + "params": "*iid:UID", "input": "*domain:String,domain_alias:String,*exposition:String,*instance:String,*size:String,*software:String,*version:String" }, { @@ -609,7 +608,7 @@ { "name": "Variables/update", "params": "*id:UID", - "input": "*type:String, *key:String, status:Boolean, value:String" + "input": "*type:String, *key:String, value:String" }, { "name": "Variables/remove", @@ -621,7 +620,7 @@ }, { "name": "Variables/import", - "params": "*id:UID", + "params": "*iid:UID", "input": "*key:String, *key2:String, *type:String, *value:Json" } ] diff --git a/ui/public/forms/variable.html b/ui/public/forms/variable.html index e5f2afbe..9c25de74 100644 --- a/ui/public/forms/variable.html +++ b/ui/public/forms/variable.html @@ -17,9 +17,6 @@
-
- @(Use this key in inventory) -