From df1a71fe5c1b79bca9462e17fcbe5cfc7d85a2d4 Mon Sep 17 00:00:00 2001
From: Florent Thiery <florent.thiery@ubicast.eu>
Date: Wed, 13 Jul 2022 09:20:22 +0000
Subject: [PATCH] Stop creating the mediaimport user refs #36256
---
roles/mediaimport/tasks/main.yml | 33 ++++++-------------
.../mediaimport/templates/mediaimport.json.j2 | 15 ++-------
2 files changed, 12 insertions(+), 36 deletions(-)
diff --git a/roles/mediaimport/tasks/main.yml b/roles/mediaimport/tasks/main.yml
index 9b79be8b..e432c469 100644
--- a/roles/mediaimport/tasks/main.yml
+++ b/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
diff --git a/roles/mediaimport/templates/mediaimport.json.j2 b/roles/mediaimport/templates/mediaimport.json.j2
index aa2ac42d..c02528e6 100644
--- a/roles/mediaimport/templates/mediaimport.json.j2
+++ b/roles/mediaimport/templates/mediaimport.json.j2
@@ -1,15 +1,4 @@
{
- "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(',') }}"
}
+
--
GitLab