Fix testnet domain

[skip ci]
raiden-network · Sep 7, 2017 · 73a92cb · 73a92cb
1 parent 4204b54
commit 73a92cb
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/tools/testnet/roles/logstash/tasks/main.yml b/tools/testnet/roles/logstash/tasks/main.yml
@@ -48,5 +48,5 @@
       - 5601:5601
     labels:
       traefik.enable: "true"
-      traefik.frontend.rule: "Host:logs.raidentestnet.ulo.pe"
+      traefik.frontend.rule: "Host:logs.{{ testnet_domain }}"
       traefik.frontend.entryPoints: "https"
diff --git a/tools/testnet/roles/traefik/tasks/main.yml b/tools/testnet/roles/traefik/tasks/main.yml
@@ -6,8 +6,8 @@
 
 - name: Traefik config file
   become: yes
-  copy:
-    src: files/traefik.toml
+  template:
+    src: templates/traefik.toml.j2
     dest: /etc/traefik/traefik.toml
 
 - name: Traefik raiden proxy config

diff --git a/tools/testnet/roles/traefik/templates/rules.toml.j2 b/tools/testnet/roles/traefik/templates/rules.toml.j2
@@ -11,6 +11,6 @@
     backend = "be_{{ hostvars[node]['hostname'] }}"
     passHostHeader = true
     [frontends.fe_{{ hostvars[node]['hostname'] }}.routes.route1]
-      rule = "Host:{{ hostvars[node]['hostname'].replace("_", "-") }}.raidentestnet.ulo.pe"
+      rule = "Host:{{ hostvars[node]['hostname'].replace("_", "-") }}.{{ testnet_domain }}"
       entryPoints = "http"
 {% endfor %}
diff --git a/.../testnet/roles/traefik/files/traefik.toml → ...t/roles/traefik/templates/traefik.toml.j2 b/.../testnet/roles/traefik/files/traefik.toml → ...t/roles/traefik/templates/traefik.toml.j2
@@ -17,10 +17,10 @@ logLevel = "INFO"
 email = "ulrich@brainbot.com"
 storage = "/etc/traefik/acme.json"
 entrypoint = "https"
-OnHostRule = true
+OnDemand = true
 
 [docker]
-domain = "raidentestnet.ulo.pe"
+domain = "{{ testnet_domain }}"
 endpoint = "unix:///var/run/docker.sock"
 exposedbydefault = false
 watch = true

diff --git a/tools/testnet/roles/traefik/vars/main.yml b/tools/testnet/roles/traefik/vars/main.yml
@@ -1 +1,2 @@
 docker_repo_traefik: "traefik:1.3.5"
+testnet_domain: "testnet.raiden.network"