roles/prometheus/templates/prometheus/snmp.yml.j2

@@ -69,10 +69,13 @@ eatonups:
     - labelname: upsOutputLineIndex
       type: gauge
   - name: xupsEnvRemoteTemp
-#    oid: 1.3.6.1.4.1.534.1.6.5
     oid: 1.3.6.1.4.1.318.1.1.10.2.3.2.1.4
     type: gauge
-    help: The reading of an EMP's temperature sensor. - 1.3.6.1.4.1.318.1.1.10.2.3.2.1.4
+    help: The reading of an EMP's temperature sensor (APC MIB) - 1.3.6.1.4.1.318.1.1.10.2.3.2.1.4
+  - name: xupsEnvRemoteTemp
+    oid: 1.3.6.1.4.1.534.1.6.5
+    type: gauge
+    help: The reading of an EMP's temperature sensor (Eaton MIB) - 1.3.6.1.4.1.534.1.6.5
   - name: xupsEnvRemoteHumidity
     oid: 1.3.6.1.4.1.534.1.6.6
     type: gauge

roles/radius/tasks/main.yml

@@ -8,15 +8,6 @@
   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:
     name: "/var/www"
@@ -117,44 +108,6 @@
   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"
@@ -300,6 +253,12 @@
       - re2o_pub
   become_user: postgres
 
+- name: Install freeradius re2o with Python3.X
+  template:
+    src: python_re2o.j2
+    dest: /etc/freeradius/3.0/mods-enabled/python
+    mode: 0640
+    owner: freerad
 
 - name: Restart freeradius, ensure enabled
   systemd: