Skip to content

Commit cc3a884

Browse files
author
Anandkumar Patel
committed
make clean
1 parent 052fbbd commit cc3a884

5 files changed

Lines changed: 8 additions & 7 deletions

File tree

ansible/group_vars/alpha-swarm-manager.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
name: "swarm-manager"
22

33
# container_kill_start settings
4-
container_image: swarm
5-
container_tag: 1.2.0
4+
container_image: soft-swarm
5+
container_tag: latest
66

77
container_run_opts: >
88
-d

ansible/navi.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@
2626
- role: nginx-proxied-service
2727
nginx_host: "{{ groups['userland'][0] }}"
2828
target_ip_address: "{{ hostvars[groups['navi'][0]]['ansible_default_ipv4']['address'] }}"
29-
templates: [ 01-navi.conf ]
29+
templates: [ 69-navi.conf ]
3030
nginx_config: proxy

ansible/roles/content-domain-certs/tasks/main.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
- name: put certs in place
1010
tags: [ certs ]
1111
become: true
12+
register: add_certs
1213
copy:
1314
src: "{{ user_content_domain }}/{{ item }}"
1415
dest: /etc/ssl/certs/{{ user_content_domain }}/{{ item }}
@@ -23,6 +24,7 @@
2324
- name: create chained cert
2425
tags: [ certs ]
2526
become: true
27+
when: add_certs.changed
2628
shell: >
2729
cat
2830
/etc/ssl/certs/{{ user_content_domain }}/cert.pem

ansible/roles/nginx-proxied-service/tasks/main.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@
33
- name: get socket server ports
44
tags: [ configure_proxy, deploy ]
55
become: true
6+
when: hosted_ports is defined
67
shell: |
78
for c in $(docker ps | awk '/{{ name }}/{ print $1 }'); do
8-
{% if hosted_ports is defined %}
9-
{% for hosted_port in hosted_ports %}
9+
{% for hosted_port in hosted_ports %}
1010
docker port $c {{ hosted_port }} | cut -d ':' -f 2
11-
{% endfor %}
12-
{% endif %}
11+
{% endfor %}
1312
done
1413
args:
1514
executable: /bin/bash

ansible/roles/nginx-proxied-service/templates/01-navi.conf renamed to ansible/roles/nginx-proxied-service/templates/69-navi.conf

File renamed without changes.

0 commit comments

Comments
 (0)