Merge branch 't36256-mediaimportctl-manages-config' into 'main'

Stop creating the mediaimport user refs #36256

See merge request sys/ansible-public!26

roles/mediaimport/tasks/main.yml

@@ -6,18 +6,6 @@
     install_recommends: false
     name: "{{ mediaimport_packages }}"
 
-## USERS
-
-- name: create users
-  loop: "{{ mediaimport_users }}"
-  when:
-    - item.name | d(false)
-    - item.passwd | d(false)
-  no_log: true
-  ansible.builtin.command: /usr/bin/mediaimportctl.py add --yes --user {{ item.name }} --passwd {{ item.passwd }}
-  args:
-    creates: /home/ftp/storage/incoming/{{ item.name }}
-
 ## MEDIAIMPORT
 
 - name: enable password login for ssh
@@ -27,17 +15,6 @@
     regexp: "^PasswordAuthentication no"
     replace: "#PasswordAuthentication yes"
 
-- name: configure mediaimport
-  when:
-    - mediaimport_ms_api_key | d(false)
-    - mediaimport_ms_server_name | d(false)
-  notify: restart mediaimport
-  ansible.builtin.template:
-    src: mediaimport.json.j2
-    dest: /etc/mediaserver/mediaimport.json
-    backup: true
-    mode: 0640
-
 - name: enable mediaimport service
   ansible.builtin.systemd:
     name: mediaimport
@@ -48,6 +25,16 @@
     name: mediaimport-cleanup.timer
     enabled: true
 
+- name: configure mediaimport admin emails
+  when:
+    - envsetup_email_admins | d(false)
+  notify: restart mediaimport
+  ansible.builtin.template:
+    src: mediaimport.json.j2
+    dest: /etc/mediaserver/mediaimport.json
+    backup: true
+    mode: 0640
+
 # FAIL2BAN
 
 - name: deploy fail2ban jail

roles/mediaimport/templates/mediaimport.json.j2

 {
-  "email_to": "support-team@ubicast.eu",
-  "users": [{% for user in mediaimport_users %}
-    {
-      "enabled": true,
-      "mediaserver_api_key": "{{ mediaimport_ms_api_key }}",
-      "mediaserver_url": "https://{{ mediaimport_ms_server_name }}",
-      "folders": [
-        {
-          "path": "/home/ftp/storage/watchfolder/{{ user.name }}"
-        }
-      ]
-    }{% if not loop.last %},{% endif %}
-  {% endfor %}]
+  "email_to": "{{ envsetup_email_admins | join(',') }}"
 }
+