From 4ff50e8a9741979aa7a768ebf2b15ee72c5e1d5d Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Mon, 23 Nov 2020 22:00:08 +0100
Subject: [PATCH] Update to 2020-11-23 22:00

---
 roles/radius_server/tasks/main.yml             | 21 +++++++++++++++++++--
 roles/radius_server/templates/radiusd.conf.j2  |  6 +++++-
 roles/squid/files/acl/software_various.domains |  3 +++
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/roles/radius_server/tasks/main.yml b/roles/radius_server/tasks/main.yml
index f657cd4..49c7e49 100644
--- a/roles/radius_server/tasks/main.yml
+++ b/roles/radius_server/tasks/main.yml
@@ -15,15 +15,32 @@
     - modules
   tags: radius
 
+- name: Create radiusd unit snippet dir
+  file: path=/etc/systemd/system/radiusd.service.d/ state=directory
+  tags: radius
+
+- name: Remove obsolete systemd unit override
+  file: path=/etc/systemd/system/radiusd.service state=absent
+  register: rad_old_unit
+  tags: radius
+
 - name: Overwrite radiusd unit file
-  template: src=radiusd.service.j2 dest=/etc/systemd/system/radiusd.service
+  copy:
+    content: |
+      [Service]
+      ExecStartPre=
+      ExecStartPre=-/bin/chown -R radiusd.radiusd /var/run/radiusd
+      ExecStartPre=/usr/sbin/radiusd -C -d /etc/radius
+      ExecStart=
+      ExecStart=/usr/sbin/radiusd -d /etc/radius
+    dest: /etc/systemd/system/radiusd.service.d/99-ansible.conf
   register: rad_unit
   notify: restart radiusd
   tags: radius
 
 - name: Reload systemd
   systemd: daemon_reload=True
-  when: rad_unit.changed
+  when: rad_unit.changed or rad_old_unit.changed
   tags: radius
 
 - name: Install client certificate checker script
diff --git a/roles/radius_server/templates/radiusd.conf.j2 b/roles/radius_server/templates/radiusd.conf.j2
index 2756f61..40886de 100644
--- a/roles/radius_server/templates/radiusd.conf.j2
+++ b/roles/radius_server/templates/radiusd.conf.j2
@@ -1,11 +1,15 @@
 prefix = /usr
+localstatedir = /var/lib/radiusd
+logdir = /var/log/radius
+run_dir = /run/radiusd
 correct_escapes = true
 max_request_time = 30
 cleanup_delay = 5
 max_requests = 16384
 hostname_lookups = no
 log {
-  destination = stdout
+  destination = syslog
+  syslog_facility = daemon
   colourise = yes
   stripped_names = no
   auth = yes
diff --git a/roles/squid/files/acl/software_various.domains b/roles/squid/files/acl/software_various.domains
index 27f5106..c5b1b30 100644
--- a/roles/squid/files/acl/software_various.domains
+++ b/roles/squid/files/acl/software_various.domains
@@ -325,3 +325,6 @@ tt-rss.org
 # RPM Fusion
 rpmfusion.org
 download1.rpmfusion.org
+
+# Composer
+getcomposer.org