tasks/configure_nfs_mounts.yml

@@ -8,14 +8,17 @@
   ansible.builtin.stat:
     path: "{{ item }}"
   loop:
-    - "{{ nfs_mounts_subapp.hosts[ansible_hostname]['access']['path'] | default('/mnt/' + ansible_hostname + '_access') }}"
-    - "{{ nfs_mounts_subapp.hosts[ansible_hostname]['ingest']['path'] | default('/mnt/' + ansible_hostname + '_ingest') }}"
-    - "{{ nfs_mounts_subapp.hosts[ansible_hostname]['import']['path'] | default('/mnt/import') }}"
-    - "{{ nfs_mounts_subapp.hosts[ansible_hostname]['sftp_upload']['path'] | default('/home/import/upload') }}"
-    - "{{ nfs_mounts_subapp.hosts[ansible_hostname]['sftp_download']['path'] | default('/home/import/download') }}"
+    - "{{ paths.access.mountpoint }}"
+    - "{{ paths.ingest.mountpoint }}"
+    - "{{ paths.ingest_transfer.mountpoint }}"
+    - "{{ paths.import.mountpoint }}"
+    - "{{ paths.import_transfer.mountpoint }}"
+    - "{{ paths.sftp_upload.mountpoint }}"
+    - "{{ paths.sftp_download.mountpoint }}"
     - "{{ paths.log_disapp.mountpoint }}"
     - "{{ paths.log_subapp.mountpoint }}"
     - "{{ paths.log_subapp_ws.mountpoint }}"
+    - "{{ paths.log_transferapp.mountpoint }}"
   register: stat_result
 - name: if dir doesn't exist, create it with correct permissions
   ansible.builtin.file:
@@ -27,7 +30,7 @@
   loop: "{{ stat_result.results }}"
   when: not item.stat.exists
 
-- name: Mounts für SubApp-Shares & Logs NEW
+- name: Mounts für SubApp-Shares & Logs
   ansible.posix.mount:
     path: "{{ item.path }}"
     src: "{{ item.src | default(omit) }}"
@@ -53,6 +56,13 @@
     - path: "{{ paths.sftp_upload.mountpoint }}"
       src: "{{ nfs_mounts_subapp.hosts[ansible_hostname]['sftp_upload']['nfs_share'] }}"
       opts: "{{ nfs_mounts_subapp.hosts[ansible_hostname]['sftp_upload']['nfs_opts'] }}"
+    # TransferApp
+    - path: "{{ paths.ingest_transfer.mountpoint }}"
+      src: "{{ nfs_mounts_subapp.hosts[ansible_hostname]['ingest_transfer']['nfs_share'] }}"
+      opts: "{{ nfs_mounts_subapp.hosts[ansible_hostname]['ingest_transfer']['nfs_opts'] }}"
+    - path: "{{ paths.import_transfer.mountpoint }}"
+      src: "{{ nfs_mounts_subapp.hosts[ansible_hostname]['import_transfer']['nfs_share'] }}"
+      opts: "{{ nfs_mounts_subapp.hosts[ansible_hostname]['import_transfer']['nfs_opts'] }}"
   tags: [notest]
 - name: create subdirectories in Shares before mounting them...
   ansible.builtin.file:
@@ -65,6 +75,7 @@
     - path: "/mnt/logs/disapp/"
     - path: "/mnt/logs/subapp/"
     - path: "/mnt/logs/subapp_ws/"
+    - path: "/mnt/logs/transferapp/"
   # tags: [notest]
 - name: ... and now mount them
   ansible.posix.mount:
@@ -89,6 +100,11 @@
       src: "/mnt/logs/subapp_ws/"
       opts: "bind,_netdev,x-systemd.requires-mounts-for=/mnt/logs/"
       fstype: none
+    # TransferApp
+    - path: "{{ paths.log_transferapp.mountpoint }}"
+      src: "/mnt/logs/transferapp/"
+      opts: "bind,_netdev,x-systemd.requires-mounts-for=/mnt/logs/"
+      fstype: none
     # SFTP
     - path: "{{ paths.sftp_download.mountpoint }}"
       src: "{{ nfs_mounts_subapp.hosts[ansible_hostname]['sftp_download']['nfs_share'] }}"
@@ -112,6 +128,10 @@
       owner: "{{ paths.log_subapp.owner }}"
       group: "{{ paths.log_subapp.group }}"
       mode: "{{ paths.log_subapp.mode }}"
+    - path: "{{ paths.log_transferapp.mountpoint }}"
+      owner: "{{ paths.log_transferapp.owner }}"
+      group: "{{ paths.log_transferapp.group }}"
+      mode: "{{ paths.log_transferapp.mode }}"
     - path: "{{ paths.log_subapp_ws.mountpoint }}"
       owner: "{{ paths.log_subapp_ws.owner }}"
       group: "{{ paths.log_subapp_ws.group }}"
@@ -128,10 +148,6 @@
       owner: "{{ vault_sftp_upload_user }}"
       group: "{{ vault_sftp_upload_group }}"
       mode: "{{ paths.access.mode }}"
-    - path: "{{ paths.access.mountpoint }}/rosetta_export/"
-      owner: "{{ paths.access.owner }}"
-      group: "{{ paths.access.group }}"
-      mode: "{{ paths.access.mode }}"
     - path: "{{ paths.sftp_download.mountpoint }}"
       owner: "{{ paths.sftp_download.owner }}"
       group: "{{ paths.sftp_download.group }}"
@@ -144,10 +160,18 @@
       owner: "{{ paths.ingest.owner }}"
       group: "{{ paths.ingest.group }}"
       mode: "{{ paths.ingest.mode }}"
+    - path: "{{ paths.ingest_transfer.mountpoint }}"
+      owner: "{{ paths.ingest_transfer.owner }}"
+      group: "{{ paths.ingest_transfer.group }}"
+      mode: "{{ paths.ingest_transfer.mode }}"
     - path: "{{ paths.import.mountpoint }}"
       owner: "{{ paths.import.owner }}"
       group: "{{ paths.import.group }}"
       mode: "{{ paths.import.mode }}"
+    - path: "{{ paths.import_transfer.mountpoint }}"
+      owner: "{{ paths.import_transfer.owner }}"
+      group: "{{ paths.import_transfer.group }}"
+      mode: "{{ paths.import_transfer.mode }}"
     - path: "{{ paths.sftp_upload.mountpoint }}"
       owner: "{{ paths.sftp_upload.owner }}"
       group: "{{ paths.sftp_upload.group }}"

tasks/install_subapp.yml

@@ -33,9 +33,9 @@
 - name: Submission / Dissemination Application installieren
   ansible.builtin.apt:
     name: [
-      "common-application4rosetta",
-      "dissemination-application4rosetta",
-      "submission-application4rosetta",
+      "common-application4archivematica",
+      "dissemination-application4archivematica",
+      "submission-application4archivematica",
     ]
     state: latest
     allow_unauthenticated: "true"

tasks/main.yml

@@ -81,6 +81,7 @@
   ansible.builtin.import_tasks: "install_move_logs.yml"
   tags: [log, cleanup]
 
+# TODO: to be double checked with other roles & removed, highly likely all tasks are outdated
 - name: cleanup remainders of METS-based SubApp
   ansible.builtin.import_tasks: "cleanup_legacy.yml"
   tags: [cleanup]