From c7a4049903227cebbf5b7b8fdf65bdcec61937f6 Mon Sep 17 00:00:00 2001 From: Maxime Bombar Date: Mon, 10 Aug 2020 04:56:14 +0200 Subject: [PATCH] [Draft] Install freeradius with rlm_python3 --- host_vars/re2o-newinfra.adm.crans.org.yml | 2 +- host_vars/routeur-sam.adm.crans.org.yml | 7 ++++++ hosts | 1 + roles/freeradius/tasks/main.yml | 24 +++++++++++++++++++ .../apt/preferences.d/freeradius_python3.j2 | 5 ++++ roles/re2o/tasks/main.yml | 17 +------------ 6 files changed, 39 insertions(+), 17 deletions(-) create mode 100644 roles/freeradius/template/apt/preferences.d/freeradius_python3.j2 diff --git a/host_vars/re2o-newinfra.adm.crans.org.yml b/host_vars/re2o-newinfra.adm.crans.org.yml index 9a00f5a1..92db5fa6 100644 --- a/host_vars/re2o-newinfra.adm.crans.org.yml +++ b/host_vars/re2o-newinfra.adm.crans.org.yml @@ -7,6 +7,6 @@ interfaces: loc_re2o: owner: root group: nounou - version: master + version: master_freeradius_python3 settings_local_owner: root settings_local_group: nounou diff --git a/host_vars/routeur-sam.adm.crans.org.yml b/host_vars/routeur-sam.adm.crans.org.yml index 0c4bc74b..08f96f3e 100644 --- a/host_vars/routeur-sam.adm.crans.org.yml +++ b/host_vars/routeur-sam.adm.crans.org.yml @@ -14,3 +14,10 @@ loc_keepalived: tag: VI_DHCP state: MASTER priority: 150 + +loc_re2o: + owner: freerad + group: nounou + version: master_freeradius_python3 + settings_local_owner: freerad + settings_local_group: nounou diff --git a/hosts b/hosts index a875a9ee..d1d3fb60 100644 --- a/hosts +++ b/hosts @@ -27,6 +27,7 @@ [re2o] re2o-newinfra.adm.crans.org +routeur-sam.adm.crans.org [bdd] tealc.adm.crans.org diff --git a/roles/freeradius/tasks/main.yml b/roles/freeradius/tasks/main.yml index 36df1917..033cf907 100644 --- a/roles/freeradius/tasks/main.yml +++ b/roles/freeradius/tasks/main.yml @@ -1,4 +1,28 @@ --- +- name: Add buster-backports to apt sources + apt_repository: + repo: deb http://{{ mirror }}/debian buster-backports main + state: present + +- name: Pin freeradius from backports + template: + src: apt/preferences.d/freeradius_python3.j2 + dest: /etc/apt/prefederences.d/freeradius_python3 + +- name: Install freeradius + apt: + update_cache: true + install_recommends: false + name: + - freeradius + - freeradius-common + - freeradius-utils + - freeradius-python3 + - libfreeradius3 + register: apt_result + retries: 3 + until: apt_result is succeeded + - name: Symlink radius certificates file: src: /etc/letsencrypt/live/crans.org/{{ item }} diff --git a/roles/freeradius/template/apt/preferences.d/freeradius_python3.j2 b/roles/freeradius/template/apt/preferences.d/freeradius_python3.j2 new file mode 100644 index 00000000..5e0e1e89 --- /dev/null +++ b/roles/freeradius/template/apt/preferences.d/freeradius_python3.j2 @@ -0,0 +1,5 @@ +{{ ansible_header | comment }} + +Package: *freeradius* +Pin: release a=buster-backports +Pin-Priority: 990 diff --git a/roles/re2o/tasks/main.yml b/roles/re2o/tasks/main.yml index b16c0b55..dcf13f81 100644 --- a/roles/re2o/tasks/main.yml +++ b/roles/re2o/tasks/main.yml @@ -1,15 +1,8 @@ --- -- name: Install re2o dependancies +- name: Install re2o dependencies apt: update_cache: true name: - - python-django - - python-dateutil - - python-djangorestframework - - python-django-reversion - - python-pip - - python-psycopg2 - - ipython - python3-django - python3-dateutil - python3-djangorestframework @@ -29,14 +22,6 @@ retries: 3 until: apt_result is succeeded -- name: Install re2o pip dependancies - pip: - executable: pip2 - name: - - django-bootstrap3 - - django-ldapdb==1.3.0 - - django-macaddress - - name: Install re2o pip3 dependancies pip: executable: pip3