From 85cf780eba7d62affe3a65b686f3cd4caf436fe9 Mon Sep 17 00:00:00 2001 From: David Kilias Date: Fri, 3 Nov 2023 07:39:54 +0100 Subject: [PATCH] feat: use new and maintained brotherql-web docker image - switch printer adress to dns-name - add tags to ansible jobs --- host-radon.yml | 10 ++++++---- host_vars/radon.n39.eu/vars.yml | 3 +-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/host-radon.yml b/host-radon.yml index cc7f3e4..f6eebf7 100644 --- a/host-radon.yml +++ b/host-radon.yml @@ -19,7 +19,6 @@ pwr_meter_pulse_gw_image: netz39/power-meter-pulse-gateway:0.3.0 brotherql_host_port: 9004 - brotherql_web_image: pklaus/brother_ql_web:alpine_9e20b6d roles: # role 'docker_setup' applied through group 'docker_host' @@ -188,16 +187,18 @@ - name: Setup docker container for BrotherQL Web UI printer docker_container: name: brotherql-web - image: "{{ brotherql_web_image }}" + image: dersimn/brother_ql_web:2.1.7-alpine pull: true restart_policy: unless-stopped state: started ports: - "127.0.0.1:{{ brotherql_host_port }}:8013" - command: " ./brother_ql_web.py --model QL-720NW tcp://{{ brotherql_printer_ip }}" + command: "--default-label-size 62 --model QL-720NW tcp://{{ brotherql_printer_host }}" detach: yes env: TZ: "{{ timezone }}" + tags: + - labelprinter - name: Setup proxy site labelprinter.n39.eu include_role: @@ -205,7 +206,8 @@ vars: site_name: labelprinter.n39.eu proxy_port: "{{ brotherql_host_port }}" - + tags: + - labelprinter handlers: - name: restart mosquitto diff --git a/host_vars/radon.n39.eu/vars.yml b/host_vars/radon.n39.eu/vars.yml index fe6278f..36f7d92 100644 --- a/host_vars/radon.n39.eu/vars.yml +++ b/host_vars/radon.n39.eu/vars.yml @@ -3,5 +3,4 @@ server_admin: "admin+radon@netz39.de" pwr_meter_amqp_user: "pwr-meter" pwr_meter_amqp_pass: "{{ vault_pwr_meter_amqp_pass }}" pwr_meter_api_token: "{{ vault_pwr_meter_api_token }}" -# See https://git.n39.eu/Netz39_Admin/config.descartes/src/branch/live/dns_dhcp.txt -brotherql_printer_ip: "172.23.48.53" +brotherql_printer_host: "brotherql-720nw.n39.eu"