From ca467c55d8bbd633870c1fcaff0677bc2c6eaa9f Mon Sep 17 00:00:00 2001
From: Emil Renner Berthing <esmil@labitat.dk>
Date: Sat, 29 Feb 2020 14:09:39 +0100
Subject: space_server: update to Fedora 31

---
 roles/space_server/tasks/radius.yml | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'roles/space_server/tasks/radius.yml')

diff --git a/roles/space_server/tasks/radius.yml b/roles/space_server/tasks/radius.yml
index a3f4183..2747d31 100644
--- a/roles/space_server/tasks/radius.yml
+++ b/roles/space_server/tasks/radius.yml
@@ -9,7 +9,7 @@
   with_items:
   - radiusd.conf
   - mods-available/eap
-  - mods-available/python-assha
+  - mods-available/python3-assha
   - sites-available/labitat
   - sites-available/labitat-inner
   notify:
@@ -17,7 +17,7 @@
 
 - name: Create assha python script
   copy:
-    dest: '/etc/raddb/mods-config/python/assha.py'
+    dest: '/etc/raddb/mods-config/python3/assha.py'
     src: 'radius/assha.py'
     owner: root
     group: root
@@ -42,6 +42,7 @@
     state: '{{ item.state }}'
     owner: root
     group: radiusd
+    follow: no
     force: yes
   with_items:
   - { name: default,       state: absent }
@@ -58,11 +59,11 @@
     state: '{{ item.state }}'
     owner: root
     group: radiusd
+    follow: no
     force: yes
   with_items:
-  - { name: files,        state: absent }
-  - { name: python,       state: absent }
-  - { name: python-assha, state: link }
+  - { name: files,         state: absent }
+  - { name: python3-assha, state: link }
   notify:
   - restart radiusd
 
@@ -116,6 +117,14 @@
     group: root
     mode: 0644
 
+- name: Set PYTHONPATH for radiusd
+  copy:
+    dest: '/etc/systemd/system/radiusd.service.d/pythonpath.conf'
+    src: 'radius/pythonpath.conf'
+    owner: root
+    group: root
+    mode: 0644
+
 - name: Enable radiusd service
   systemd:
     name: radiusd.service
-- 
cgit v1.2.1