From 37993c09c534409c5c9e4189487aee5ff594778f Mon Sep 17 00:00:00 2001 From: David Kilias Date: Wed, 21 Apr 2021 17:47:45 +0200 Subject: [PATCH 1/6] entities validation service container eingebaut --- pottwal.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pottwal.yml b/pottwal.yml index 585774c..e361cc2 100644 --- a/pottwal.yml +++ b/pottwal.yml @@ -15,6 +15,7 @@ openhab_configuration_version: master uritools_host_port: 8080 + entites_validation_svc_host_port: 8082 roles: - role: docker_setup @@ -129,6 +130,24 @@ site_name: uritools.n39.eu proxy_port: "{{ uritools_host_port }}" + - name: Ensure container for entites validation service is running + docker_container: + name: entites_validation_svc + image: netz39/entites_validation_svc + pull: true + state: started + detach: yes + ports: + - "{{ entites_validation_svc_host_port }}:8080" + restart_policy: unless-stopped + + - name: Setup proxy site validation.entities.n39.eu + include_role: + name: setup-http-site-proxy + vars: + site_name: validation.entities.n39.eu + proxy_port: "{{ entites_validation_svc_host_port }}" + handlers: - name: restart mosquitto docker_container: From 1e10b079caec4c2569e6dca21e45222b153fce25 Mon Sep 17 00:00:00 2001 From: David Kilias Date: Wed, 21 Apr 2021 17:50:09 +0200 Subject: [PATCH 2/6] fix url --- pottwal.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pottwal.yml b/pottwal.yml index e361cc2..2667b46 100644 --- a/pottwal.yml +++ b/pottwal.yml @@ -141,11 +141,11 @@ - "{{ entites_validation_svc_host_port }}:8080" restart_policy: unless-stopped - - name: Setup proxy site validation.entities.n39.eu + - name: Setup proxy site entities-validation.n39.eu include_role: name: setup-http-site-proxy vars: - site_name: validation.entities.n39.eu + site_name: entities-validation.n39.eu proxy_port: "{{ entites_validation_svc_host_port }}" handlers: From f2a535a4f4503627c9ce07113d4bd278d374cb46 Mon Sep 17 00:00:00 2001 From: David Kilias Date: Wed, 21 Apr 2021 17:52:19 +0200 Subject: [PATCH 3/6] fix typo --- pottwal.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pottwal.yml b/pottwal.yml index 2667b46..ca8bca4 100644 --- a/pottwal.yml +++ b/pottwal.yml @@ -15,7 +15,7 @@ openhab_configuration_version: master uritools_host_port: 8080 - entites_validation_svc_host_port: 8082 + entities_validation_svc_host_port: 8082 roles: - role: docker_setup @@ -130,15 +130,15 @@ site_name: uritools.n39.eu proxy_port: "{{ uritools_host_port }}" - - name: Ensure container for entites validation service is running + - name: Ensure container for entities validation service is running docker_container: - name: entites_validation_svc - image: netz39/entites_validation_svc + name: entities_validation_svc + image: netz39/entities_validation_svc pull: true state: started detach: yes ports: - - "{{ entites_validation_svc_host_port }}:8080" + - "{{ entities_validation_svc_host_port }}:8080" restart_policy: unless-stopped - name: Setup proxy site entities-validation.n39.eu From 3c33244cd947b519f3a7e3284fae90706fcb92e5 Mon Sep 17 00:00:00 2001 From: David Kilias Date: Wed, 21 Apr 2021 21:14:53 +0200 Subject: [PATCH 4/6] add version to docker image --- pottwal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pottwal.yml b/pottwal.yml index ca8bca4..468f7a2 100644 --- a/pottwal.yml +++ b/pottwal.yml @@ -133,7 +133,7 @@ - name: Ensure container for entities validation service is running docker_container: name: entities_validation_svc - image: netz39/entities_validation_svc + image: netz39/entities_validation_svc:v1.0.0 pull: true state: started detach: yes From 02132684071ab46a54a36fb41f2e7ab81af7de26 Mon Sep 17 00:00:00 2001 From: David Kilias Date: Wed, 21 Apr 2021 21:20:23 +0200 Subject: [PATCH 5/6] move vallidation service to svc subdomain --- pottwal.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pottwal.yml b/pottwal.yml index 468f7a2..6b39972 100644 --- a/pottwal.yml +++ b/pottwal.yml @@ -141,11 +141,11 @@ - "{{ entities_validation_svc_host_port }}:8080" restart_policy: unless-stopped - - name: Setup proxy site entities-validation.n39.eu + - name: Setup proxy site entities-validation.svc.n39.eu include_role: name: setup-http-site-proxy vars: - site_name: entities-validation.n39.eu + site_name: entities-validation.svc.n39.eu proxy_port: "{{ entites_validation_svc_host_port }}" handlers: From 526ff3485ca6e75342fcba96c4f4b8732b3ee5ab Mon Sep 17 00:00:00 2001 From: David Kilias Date: Thu, 22 Apr 2021 00:07:06 +0200 Subject: [PATCH 6/6] fixing the typos, one at a time --- pottwal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pottwal.yml b/pottwal.yml index 6b39972..b81ad9b 100644 --- a/pottwal.yml +++ b/pottwal.yml @@ -146,7 +146,7 @@ name: setup-http-site-proxy vars: site_name: entities-validation.svc.n39.eu - proxy_port: "{{ entites_validation_svc_host_port }}" + proxy_port: "{{ entities_validation_svc_host_port }}" handlers: - name: restart mosquitto