From 1d5c1773150f047e4be225ec3a51652212bd2cc4 Mon Sep 17 00:00:00 2001
From: stelcheck <mtrudel@wizcorp.jp>
Date: Wed, 8 May 2019 17:08:51 +0900
Subject: [PATCH] traefik-expose: entrypoints control

---
 buildconfig.yml                                          | 4 ++--
 docker-image/ansible/roles/traefik-expose/README.md      | 6 ++++--
 docker-image/ansible/roles/traefik-expose/tasks/main.yml | 2 ++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/buildconfig.yml b/buildconfig.yml
index 29a11b1..d58144c 100644
--- a/buildconfig.yml
+++ b/buildconfig.yml
@@ -41,7 +41,7 @@ binary:
   name: "dawn"
 
   # The current version of the binary
-  version: "0.15.2"
+  version: "0.15.3"
 
   # (Optional) URLs to call when attempting auto-update.
   # Defaults:
@@ -78,7 +78,7 @@ image:
   name: dawn
 
   # Current image version
-  version: "0.15.2"
+  version: "0.15.3"
 
   # Root folder where most files will be uploaded or mounted
   root_folder: /dawn
diff --git a/docker-image/ansible/roles/traefik-expose/README.md b/docker-image/ansible/roles/traefik-expose/README.md
index 51c4e5c..582307b 100644
--- a/docker-image/ansible/roles/traefik-expose/README.md
+++ b/docker-image/ansible/roles/traefik-expose/README.md
@@ -9,11 +9,13 @@ expose services that might not be running in swarm (ie. vault, ldap, etc...).
 dependencies:
   - role: traefik-expose
   	# required
-    service_name: grafana
+	service_name: grafana
+	# optional, defaults to http,https - useful if you need to define additional entrypoints
+	service_entrypoints: https
 	# required
     service_port: 3000
 	# optional, defaults to {{ private_ipv4 }}
     service_ip: "{{ group_ipv4.monitor[0] }}"
 	# optional, defaults to http
 	service_scheme: https
-```
\ No newline at end of file
+```
diff --git a/docker-image/ansible/roles/traefik-expose/tasks/main.yml b/docker-image/ansible/roles/traefik-expose/tasks/main.yml
index 92d7c80..1ffbf0d 100644
--- a/docker-image/ansible/roles/traefik-expose/tasks/main.yml
+++ b/docker-image/ansible/roles/traefik-expose/tasks/main.yml
@@ -12,6 +12,8 @@
       value: "1"
     - key: "traefik/frontends/{{ service_name }}/backend"
       value: "{{ service_name }}"
+    - key: "traefik/frontends/{{ service_name }}/entrypoints"
+      value: "{{ service_entrypoints | default('http,https') }}"
     - key: "traefik/frontends/{{ service_name }}/routes/{{ service_name }}/rule"
       value: "Host:{{ service_name }}.{{ local_domain_name }}"
     - key: "traefik/frontends/{{ service_name }}/whitelist/sourcerange"