Merge pull request #3015 from etkecc/buscarron-remove-basicauth
buscarron: migrate to native /metrics auth
This commit is contained in:
commit
daf0d2a459
@ -41,14 +41,13 @@ matrix_bot_buscarron_container_network: matrix-bot-buscarron
|
|||||||
# Use this to expose this container to another reverse proxy, which runs in a different container network.
|
# Use this to expose this container to another reverse proxy, which runs in a different container network.
|
||||||
matrix_bot_buscarron_container_additional_networks: []
|
matrix_bot_buscarron_container_additional_networks: []
|
||||||
|
|
||||||
# enable basic auth for metrics
|
# /metrics login
|
||||||
matrix_bot_buscarron_basicauth_enabled: false
|
matrix_bot_buscarron_metrics_login: ''
|
||||||
# temporary file name on the host that runs ansible
|
# /metrics password
|
||||||
matrix_bot_buscarron_basicauth_file: "/tmp/matrix_bot_buscarron_htpasswd"
|
matrix_bot_buscarron_metrics_password: ''
|
||||||
# username
|
# /metrics allowed ips
|
||||||
matrix_bot_buscarron_basicauth_user: ''
|
matrix_bot_buscarron_metrics_ips: []
|
||||||
# password
|
|
||||||
matrix_bot_buscarron_basicauth_password: ''
|
|
||||||
|
|
||||||
# matrix_bot_buscarron_container_labels_traefik_enabled controls whether labels to assist a Traefik reverse-proxy will be attached to the container.
|
# matrix_bot_buscarron_container_labels_traefik_enabled controls whether labels to assist a Traefik reverse-proxy will be attached to the container.
|
||||||
# See `../templates/labels.j2` for details.
|
# See `../templates/labels.j2` for details.
|
||||||
|
@ -40,21 +40,6 @@
|
|||||||
- {path: "{{ matrix_bot_buscarron_docker_src_files_path }}", when: true}
|
- {path: "{{ matrix_bot_buscarron_docker_src_files_path }}", when: true}
|
||||||
when: "item.when | bool"
|
when: "item.when | bool"
|
||||||
|
|
||||||
- name: Determine basicauth filename
|
|
||||||
ansible.builtin.set_fact:
|
|
||||||
matrix_bot_buscarron_basicauth_file_tmp: "{{ matrix_bot_buscarron_basicauth_file }}_{{ inventory_hostname }}"
|
|
||||||
when: matrix_bot_buscarron_basicauth_enabled | bool
|
|
||||||
|
|
||||||
- name: Generate basic auth file
|
|
||||||
community.general.htpasswd:
|
|
||||||
path: "{{ matrix_bot_buscarron_basicauth_file }}"
|
|
||||||
name: "{{ matrix_bot_buscarron_basicauth_user }}"
|
|
||||||
password: "{{ matrix_bot_buscarron_basicauth_password }}"
|
|
||||||
mode: 0640
|
|
||||||
become: false
|
|
||||||
delegate_to: 127.0.0.1
|
|
||||||
when: matrix_bot_buscarron_basicauth_enabled | bool
|
|
||||||
|
|
||||||
- name: Ensure buscarron support files installed
|
- name: Ensure buscarron support files installed
|
||||||
ansible.builtin.template:
|
ansible.builtin.template:
|
||||||
src: "{{ role_path }}/templates/{{ item }}.j2"
|
src: "{{ role_path }}/templates/{{ item }}.j2"
|
||||||
@ -66,14 +51,6 @@
|
|||||||
- env
|
- env
|
||||||
- labels
|
- labels
|
||||||
|
|
||||||
- name: Ensure temporary basic auth file is removed
|
|
||||||
ansible.builtin.file:
|
|
||||||
path: "{{ matrix_bot_buscarron_basicauth_file }}"
|
|
||||||
state: absent
|
|
||||||
become: false
|
|
||||||
delegate_to: 127.0.0.1
|
|
||||||
when: matrix_bot_buscarron_basicauth_enabled | bool
|
|
||||||
|
|
||||||
- name: Ensure buscarron image is pulled
|
- name: Ensure buscarron image is pulled
|
||||||
community.docker.docker_image:
|
community.docker.docker_image:
|
||||||
name: "{{ matrix_bot_buscarron_docker_image }}"
|
name: "{{ matrix_bot_buscarron_docker_image }}"
|
||||||
|
@ -17,6 +17,9 @@ BUSCARRON_PM_REPLYTO={{ matrix_bot_buscarron_pm_replyto }}
|
|||||||
BUSCARRON_SMTP_FROM={{ matrix_bot_buscarron_smtp_from }}
|
BUSCARRON_SMTP_FROM={{ matrix_bot_buscarron_smtp_from }}
|
||||||
BUSCARRON_SMTP_VALIDATION={{ matrix_bot_buscarron_smtp_validation }}
|
BUSCARRON_SMTP_VALIDATION={{ matrix_bot_buscarron_smtp_validation }}
|
||||||
BUSCARRON_NOENCRYPTION={{ matrix_bot_buscarron_noencryption }}
|
BUSCARRON_NOENCRYPTION={{ matrix_bot_buscarron_noencryption }}
|
||||||
|
BUSCARRON_METRICS_LOGIN={{ matrix_bot_buscarron_metrics_login }}
|
||||||
|
BUSCARRON_METRICS_PASSWORD={{ matrix_bot_buscarron_metrics_password }}
|
||||||
|
BUSCARRON_METRICS_IPS={{ matrix_bot_buscarron_metrics_ips|default([])|join(" ") }}
|
||||||
{% set forms = [] %}
|
{% set forms = [] %}
|
||||||
{% for form in matrix_bot_buscarron_forms -%}{{- forms.append(form.name) -}}
|
{% for form in matrix_bot_buscarron_forms -%}{{- forms.append(form.name) -}}
|
||||||
BUSCARRON_{{ form.name|upper }}_ROOM={{ form.room|default('') }}
|
BUSCARRON_{{ form.name|upper }}_ROOM={{ form.room|default('') }}
|
||||||
|
@ -19,11 +19,6 @@ traefik.http.middlewares.matrix-bot-buscarron-strip-prefix.stripprefix.prefixes=
|
|||||||
{% set middlewares = middlewares + ['matrix-bot-buscarron-strip-prefix'] %}
|
{% set middlewares = middlewares + ['matrix-bot-buscarron-strip-prefix'] %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% if matrix_bot_buscarron_basicauth_enabled %}
|
|
||||||
traefik.http.middlewares.matrix-bot-buscarron-auth.basicauth.users={{ lookup('ansible.builtin.file', matrix_bot_buscarron_basicauth_file) }}
|
|
||||||
{% set middlewares_metrics = middlewares + ['matrix-bot-buscarron-auth'] %}
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
{% if matrix_bot_buscarron_container_labels_traefik_additional_response_headers.keys() | length > 0 %}
|
{% if matrix_bot_buscarron_container_labels_traefik_additional_response_headers.keys() | length > 0 %}
|
||||||
{% for name, value in matrix_bot_buscarron_container_labels_traefik_additional_response_headers.items() %}
|
{% for name, value in matrix_bot_buscarron_container_labels_traefik_additional_response_headers.items() %}
|
||||||
traefik.http.middlewares.matrix-bot-buscarron-add-headers.headers.customresponseheaders.{{ name }}={{ value }}
|
traefik.http.middlewares.matrix-bot-buscarron-add-headers.headers.customresponseheaders.{{ name }}={{ value }}
|
||||||
@ -46,21 +41,6 @@ traefik.http.routers.matrix-bot-buscarron.tls.certResolver={{ matrix_bot_buscarr
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
traefik.http.services.matrix-bot-buscarron.loadbalancer.server.port=8080
|
traefik.http.services.matrix-bot-buscarron.loadbalancer.server.port=8080
|
||||||
|
|
||||||
{% if middlewares_metrics | length > 0 %}
|
|
||||||
traefik.http.routers.matrix-bot-buscarron-metrics.rule={{ matrix_bot_buscarron_container_labels_traefik_metrics_rule }}
|
|
||||||
{% if matrix_bot_buscarron_container_labels_traefik_priority | int > 0 %}
|
|
||||||
traefik.http.routers.matrix-bot-buscarron-metrics.priority={{ matrix_bot_buscarron_container_labels_traefik_priority }}
|
|
||||||
{% endif %}
|
|
||||||
traefik.http.routers.matrix-bot-buscarron-metrics.service=matrix-bot-buscarron
|
|
||||||
traefik.http.routers.matrix-bot-buscarron-metrics.middlewares={{ middlewares_metrics | join(',') }}
|
|
||||||
traefik.http.routers.matrix-bot-buscarron-metrics.entrypoints={{ matrix_bot_buscarron_container_labels_traefik_entrypoints }}
|
|
||||||
traefik.http.routers.matrix-bot-buscarron-metrics.tls={{ matrix_bot_buscarron_container_labels_traefik_tls | to_json }}
|
|
||||||
{% if matrix_bot_buscarron_container_labels_traefik_tls %}
|
|
||||||
traefik.http.routers.matrix-bot-buscarron-metrics.tls.certResolver={{ matrix_bot_buscarron_container_labels_traefik_tls_certResolver }}
|
|
||||||
{% endif %}
|
|
||||||
traefik.http.services.matrix-bot-buscarron-metrics.loadbalancer.server.port=8080
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{{ matrix_bot_buscarron_container_labels_additional_labels }}
|
{{ matrix_bot_buscarron_container_labels_additional_labels }}
|
||||||
|
Loading…
Reference in New Issue
Block a user