diff --git a/hosts b/hosts index c7564c2..4d1c1a2 100644 --- a/hosts +++ b/hosts @@ -358,7 +358,7 @@ prometheus-rives.adm.auro.re dhcp-rives.adm.auro.re dns-rives.adm.auro.re radius-rives.adm.auro.re -routeur-rives.auro.re +routeur-rives.adm.auro.re [rives_unifi] r3-4-4.borne.auro.re diff --git a/roles/prometheus_node/tasks/main.yml b/roles/prometheus_node/tasks/main.yml index 7ca6350..19cb5a0 100644 --- a/roles/prometheus_node/tasks/main.yml +++ b/roles/prometheus_node/tasks/main.yml @@ -7,8 +7,7 @@ register: apt_result retries: 3 until: apt_result is succeeded - when: - - ansible_lsb.codename == 'buster' + when: ansible_lsb.codename == 'buster' or ansible_lsb.codename == 'bullseye' # Prometheus 2 node is in stretch-backports - name: Install Prometheus node-exporter (stretch-backports) diff --git a/roles/radius/tasks/main.yml b/roles/radius/tasks/main.yml index 303a86f..37a5212 100644 --- a/roles/radius/tasks/main.yml +++ b/roles/radius/tasks/main.yml @@ -5,6 +5,17 @@ loop: - "deb" - "deb-src" + when: + - ansible_lsb.codename == 'buster' + +- name: Add backports repositories + apt_repository: + repo: "{{ item }} http://deb.debian.org/debian bullseye main contrib non-free" + loop: + - "deb" + - "deb-src" + when: + - ansible_lsb.codename == 'bullseye' - name: Ensure /var/www exists file: @@ -34,7 +45,6 @@ - name: try to install freeradius-python3 (this will fail on post-install) apt: name: freeradius-python3 - default_release: buster-backports update_cache: true ignore_errors: true @@ -47,7 +57,6 @@ - name: reinstall broken package (this might fail too, for different reasons) apt: name: freeradius-python3 - default_release: buster-backports force: true ignore_errors: true @@ -108,6 +117,44 @@ shell: cmd: "cat apt_requirements_radius.txt | grep -v freeradius-python3 | xargs apt-get -y install" chdir: /var/www/re2o/ + when: + - ansible_lsb.codename == 'buster' + +- name: Install radius requirements (except freeradius-python3) for bullseye + apt: + name: + - python3-django + - python3-dateutil + - texlive-latex-base + - texlive-fonts-recommended + - python3-djangorestframework + - python3-django-reversion + - python3-pip + - python3-pil + - libsasl2-dev + - libldap2-dev + - libssl-dev + - python3-pycryptodome + - python3-git + - javascript-common + - libjs-jquery + - libjs-jquery-ui + - libjs-jquery-timepicker + - libjs-bootstrap + - fonts-font-awesome + - graphviz + - git + - gettext + - libfreeradius3 + - freeradius-utils + - freeradius + - freeradius-common + - freeradius-python3 + - python3-dev + - python3-mysqldb + - python3-django-ldapdb + when: + - ansible_lsb.codename == 'bullseye' - name: Install PyPi requirements for radius command: "pip3 install -r /var/www/re2o/pip_requirements.txt"