diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index fcd5588..f5cb393 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -1,6 +1,6 @@ --- # defaults file for docker -registry_site_name: asgard.orion-technologies.io +registry_site: asgard.orion-technologies.io registry_site_email: price@orion-technologies.io registry_system_user: docker-reg registry_login_user: asgard diff --git a/roles/docker/tasks/setup-docker-registry.yml b/roles/docker/tasks/setup-docker-registry.yml index 7284044..9f1f0df 100644 --- a/roles/docker/tasks/setup-docker-registry.yml +++ b/roles/docker/tasks/setup-docker-registry.yml @@ -20,7 +20,7 @@ become: true ansible.builtin.template: src: "templates/registry-site.nginx" - dest: "/etc/nginx/sites-available/{{ registry_site_name }}" + dest: "/etc/nginx/sites-available/{{ registry_site }}" mode: 0644 owner: root group: root @@ -30,21 +30,21 @@ become: true ansible.builtin.file: state: link - src: "/etc/nginx/sites-available/{{ registry_site_name }}" - dest: "/etc/nginx/sites-enabled/{{ registry_site_name }}" + src: "/etc/nginx/sites-available/{{ registry_site }}" + dest: "/etc/nginx/sites-enabled/{{ registry_site }}" owner: root group: root - name: Check if Obtaining an SSL Certificate is Required become: true ansible.builtin.stat: - path: "/etc/letsencrypt/live/{{ registry_site_name }}" + path: "/etc/letsencrypt/live/{{ registry_site }}" register: ssl_cert_stat - name: Obtain SSL Certificate For Registry Site if Necessary become: true # yamllint disable-line rule:line-length - ansible.builtin.command: sudo certbot --nginx -d "{{ registry_site_name }}" -d "www.{{ registry_site_name }}" -m "{{ registry_site_email }}" --agree-tos --non-interactive + ansible.builtin.command: sudo certbot --nginx -d "{{ registry_site }}" -d "www.{{ registry_site }}" -m "{{ registry_site_email }}" --agree-tos --non-interactive when: not ssl_cert_stat.stat.exists - name: Create Docker Registry User diff --git a/roles/docker/templates/registry-site.nginx b/roles/docker/templates/registry-site.nginx index f39882f..af06723 100644 --- a/roles/docker/templates/registry-site.nginx +++ b/roles/docker/templates/registry-site.nginx @@ -4,7 +4,7 @@ server { # Add index.php to the list if you are using PHP index index.html index.htm index.nginx-debian.html; - server_name {{ registry_site_name }} www.{{ registry_site_name }}; + server_name {{ registry_site }} www.{{ registry_site }}; # disable limits to avoid HTTP 413 for large image uploads client_max_body_size 0;