clarify mediaimport tasks naming

roles/mediaimport/defaults/main.yml

 ---
 
-import_users:
+mediaimport_users:
   - name: "{{ envsetup_mediaimport_user | d() }}"
     passwd: "{{ envsetup_mediaimport_password | d() }}"
 
-import_packages:
+mediaimport_packages:
   - clamav
   - mysecureshell
   - openssh-server
@@ -15,7 +15,7 @@ import_packages:
   # required by ansible tasks
   - python3-openssl
 
-import_pureftpd_config:
+mediaimport_pureftpd_config:
   - key: AllowDotFiles
     value: "no"
   - key: CallUploadScript
@@ -29,21 +29,21 @@ import_pureftpd_config:
   - key: TLS
     value: "1"
 
-import_virus_scan_on_upload: false
+mediaimport_virus_scan_on_upload: false
 
-import_ms_api_key: "{{ envsetup_ms_api_key | d() }}"
-import_ms_server_name: "{{ envsetup_ms_server_name | d() }}"
+mediaimport_ms_api_key: "{{ envsetup_ms_api_key | d() }}"
+mediaimport_ms_server_name: "{{ envsetup_ms_server_name | d() }}"
 
-import_fail2ban_enabled: "{{ envsetup_fail2ban_enabled | d(true) }}"
-import_f2b_jail:
+mediaimport_fail2ban_enabled: "{{ envsetup_fail2ban_enabled | d(true) }}"
+mediaimport_f2b_jail:
   name: pure-ftpd
   content: |
     [pure-ftpd]
-    enabled = {% if import_fail2ban_enabled | bool %}true{% else %}false{% endif %}
+    enabled = {% if mediaimport_fail2ban_enabled | bool %}true{% else %}false{% endif %}
 
-import_firewall_enabled: true
-import_ferm_rules_filename: import
-import_ferm_input_rules:
+mediaimport_firewall_enabled: true
+mediaimport_ferm_rules_filename: import
+mediaimport_ferm_input_rules:
   - proto:
       - tcp
     dport:
@@ -51,7 +51,7 @@ import_ferm_input_rules:
       - 22
   - mod: helper
     helper: ftp
-import_ferm_output_rules: []
-import_ferm_global_settings:
+mediaimport_ferm_output_rules: []
+mediaimport_ferm_global_settings:
 
 ...

roles/mediaimport/tasks/main.yml

@@ -4,7 +4,7 @@
   package:
     force_apt_get: true
     install_recommends: false
-    name: "{{ import_packages }}"
+    name: "{{ mediaimport_packages }}"
 
 ## USERS
 
@@ -23,7 +23,7 @@
     mode: 0755
 
 - name: create users
-  loop: "{{ import_users }}"
+  loop: "{{ mediaimport_users }}"
   when:
     - item.name | d(false)
     - item.passwd | d(false)
@@ -62,13 +62,13 @@
     content: |
       STANDALONE_OR_INETD=standalone
       VIRTUALCHROOT=false
-      UPLOADSCRIPT="/home/ftp/on-upload{% if import_virus_scan_on_upload %} --scan-virus{% endif %}"
+      UPLOADSCRIPT="/home/ftp/on-upload{% if mediaimport_virus_scan_on_upload %} --scan-virus{% endif %}"
       UPLOADUID=0
       UPLOADGID=0
 
 - name: configure pure-ftpd
   notify: restart pure-ftpd
-  loop: "{{ import_pureftpd_config }}"
+  loop: "{{ mediaimport_pureftpd_config }}"
   copy:
     dest: /etc/pure-ftpd/conf/{{ item.key }}
     content: "{{ item.value }}"
@@ -81,21 +81,21 @@
     state: directory
 
 - name: generate an private key
-  register: import_privkey
+  register: mediaimport_privkey
   openssl_privatekey:
     path: /etc/ssl/{{ ansible_fqdn }}/key.pem
 
 - name: generate an csr
-  when: import_privkey is changed
-  register: import_csr
+  when: mediaimport_privkey is changed
+  register: mediaimport_csr
   openssl_csr:
     path: /etc/ssl/{{ ansible_fqdn }}/csr.pem
     privatekey_path: /etc/ssl/{{ ansible_fqdn }}/key.pem
     common_name: "{{ ansible_fqdn }}"
 
 - name: generate a self-signed certificate
-  when: import_csr is changed
-  register: import_cert
+  when: mediaimport_csr is changed
+  register: mediaimport_cert
   openssl_certificate:
     path: /etc/ssl/{{ ansible_fqdn }}/cert.pem
     privatekey_path: /etc/ssl/{{ ansible_fqdn }}/key.pem
@@ -103,7 +103,7 @@
     provider: selfsigned
 
 - name: concatenate key and certificate
-  when: import_cert is changed
+  when: mediaimport_cert is changed
   notify: restart pure-ftpd
   shell: >
     cat /etc/ssl/{{ ansible_fqdn }}/key.pem /etc/ssl/{{ ansible_fqdn }}/cert.pem > /etc/ssl/private/pure-ftpd.pem;
@@ -138,8 +138,8 @@
 
 - name: configure mediaimport
   when:
-    - import_ms_api_key | d(false)
-    - import_ms_server_name | d(false)
+    - mediaimport_ms_api_key | d(false)
+    - mediaimport_ms_server_name | d(false)
   notify: restart mediaimport
   template:
     src: mediaimport.json.j2
@@ -155,21 +155,21 @@
 # FAIL2BAN
 
 - name: fail2ban
-  when: import_fail2ban_enabled
+  when: mediaimport_fail2ban_enabled
   vars:
-    f2b_jail: "{{ import_f2b_jail }}"
+    f2b_jail: "{{ mediaimport_f2b_jail }}"
   include_role:
     name: fail2ban
 
 # FIREWALL
 
 - name: firewall
-  when: import_firewall_enabled
+  when: mediaimport_firewall_enabled
   vars:
-    ferm_rules_filename: "{{ import_ferm_rules_filename }}"
-    ferm_input_rules: "{{ import_ferm_input_rules }}"
-    ferm_output_rules: "{{ import_ferm_output_rules }}"
-    ferm_global_settings: "{{ import_ferm_global_settings }}"
+    ferm_rules_filename: "{{ mediaimport_ferm_rules_filename }}"
+    ferm_input_rules: "{{ mediaimport_ferm_input_rules }}"
+    ferm_output_rules: "{{ mediaimport_ferm_output_rules }}"
+    ferm_global_settings: "{{ mediaimport_ferm_global_settings }}"
   include_role:
     name: ferm-configure
 

roles/mediaimport/templates/mediaimport.json.j2

 {
   "email_to": "support-team@ubicast.eu",
-  "users": [{% for user in import_users %}
+  "users": [{% for user in mediaimport_users %}
     {
       "enabled": true,
-      "mediaserver_api_key": "{{ import_ms_api_key }}",
-      "mediaserver_url": "https://{{ import_ms_server_name }}",
+      "mediaserver_api_key": "{{ mediaimport_ms_api_key }}",
+      "mediaserver_url": "https://{{ mediaimport_ms_server_name }}",
       "folders": [
         {
           "path": "/home/ftp/storage/watchfolder/{{ user.name }}"

roles/mediaimport/templates/sftp_config.j2

@@ -14,7 +14,7 @@
         LimitConnectionByUser   2
         LimitConnectionByIP     10
         Home                    /home/ftp/storage/incoming/$USER
-        CallbackUpload          "/home/ftp/on-upload{% if import_virus_scan_on_upload %} --scan-virus{% endif %} /home/ftp/storage/incoming/$USER$LAST_FILE_PATH"
+        CallbackUpload          "/home/ftp/on-upload{% if mediaimport_virus_scan_on_upload %} --scan-virus{% endif %} /home/ftp/storage/incoming/$USER$LAST_FILE_PATH"
         IdleTimeOut             5m
         ResolveIP               false
         HideNoAccess            true