Update http-proxy-anubis to optionally include a policyHEADmaster

4 files changed, 15 insertions, 4 deletions

diff --git a/play.yml b/play.yml
index 1a75b43..5dcb946 100644
--- a/play.yml
+++ b/play.yml
@@ -57,11 +57,11 @@
   tags: critical
   roles:
   - role: git-server
-  - role: cri-podman
-  - role: http-proxy-anubis
+  - role: git-server-cgit
   - role: http-server-apache2
+  - role: http-proxy-anubis
+  - role: cri-podman
   - role: fiche
-  - role: git-server-cgit
 
 - name: Apply local critical infrastructure on oolah
   hosts: oolah
diff --git a/roles/http-proxy-anubis-env/tasks/main.yml b/roles/http-proxy-anubis-env/tasks/main.yml
index 2c77768..fb654a8 100644
--- a/roles/http-proxy-anubis-env/tasks/main.yml
+++ b/roles/http-proxy-anubis-env/tasks/main.yml
@@ -7,3 +7,11 @@
       owner: root
       group: httpd
       mode: "0640"
+  - name: Ensure policy file is up-to-date
+    ansible.builtin.copy:
+      dest: "{{ fs_etc }}/anubis/{{ env_name }}.policy"
+      content: "{{ policy }}"
+      owner: root
+      group: httpd
+      mode: "0640"
+    when: policy is defined
diff --git a/roles/http-proxy-anubis-env/templates/env.j2 b/roles/http-proxy-anubis-env/templates/env.j2
index 928a9b1..35d3202 100644
--- a/roles/http-proxy-anubis-env/templates/env.j2
+++ b/roles/http-proxy-anubis-env/templates/env.j2
@@ -5,3 +5,6 @@ METRICS_BIND={{ bind_address_metrics | default("") }}:{{ bind_port_metrics }}
 {% endif %}
 SERVE_ROBOTS_TXT=0
 TARGET={{ upstream }}
+{% if policy is defined %}
+POLICY_FNAME="{{ fs_etc }}/anubis/{{ env_name }}.policy"
+{% endif %}
diff --git a/roles/http-proxy-anubis/vars/main.yml b/roles/http-proxy-anubis/vars/main.yml
index caf8b99..cac115a 100644
--- a/roles/http-proxy-anubis/vars/main.yml
+++ b/roles/http-proxy-anubis/vars/main.yml
@@ -1,4 +1,4 @@
-version: "1.19.1"
+version: "1.26.2"
 translate:
   arch:
     x86_64: "amd64"