diff options
| author | ckonstanski <ckonstanski@pippiandcarlos.com> | 2018-01-16 19:06:09 +0000 |
|---|---|---|
| committer | ckonstanski <ckonstanski@pippiandcarlos.com> | 2018-01-16 19:06:09 +0000 |
| commit | 25804923a7ad337c60319552333fe6578019411f (patch) | |
| tree | 539f9c0697ee3e8419558f259fe2dafa45093d92 /playbooks | |
| parent | 5fc01d72d249c7d2db42cc0dd51735cbde7e6bf3 (diff) | |
autocommit Tue Jan 16 19:06:09 UTC 2018
Diffstat (limited to 'playbooks')
| -rw-r--r-- | playbooks/docker_registry.yaml | 6 | ||||
| -rw-r--r-- | playbooks/install_docker_registry.yaml | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/playbooks/docker_registry.yaml b/playbooks/docker_registry.yaml index 20dfb73..3666deb 100644 --- a/playbooks/docker_registry.yaml +++ b/playbooks/docker_registry.yaml @@ -33,9 +33,9 @@ - name: "Copy SSL certs into nginx directory" shell: | - cp "/etc/ssl/certs/{{ cn }}.crt" /root/docker-registry/nginx/ - cp "/etc/ssl/certs/{{ cn }}.ca" /root/docker-registry/nginx/ - cp "/etc/ssl/private/{{ cn }}.key" /root/docker-registry/nginx/ + cp "/etc/ssl/certs/{{ inventory_hostname }}.crt" /root/docker-registry/nginx/ + cp "/etc/ssl/certs/{{ inventory_hostname }}.ca" /root/docker-registry/nginx/ + cp "/etc/ssl/private/{{ inventory_hostname }}.key" /root/docker-registry/nginx/ when: ansible_distribution == "Ubuntu" or ansible_distribution == "Gentoo" - name: "Create password file" diff --git a/playbooks/install_docker_registry.yaml b/playbooks/install_docker_registry.yaml index f22e643..0a0ad8b 100644 --- a/playbooks/install_docker_registry.yaml +++ b/playbooks/install_docker_registry.yaml @@ -1,4 +1,5 @@ --- +- include: ssl.yaml - include: docker.yaml - include: docker_compose.yaml - include: docker_registry.yaml |