Zjednodušení kolekcí

WebarchivCZ · Jul 8, 2024 · d0d3eb2 · d0d3eb2
1 parent e48f8c9
commit d0d3eb2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 40 deletions.
diff --git a/.prettierignore b/.prettierignore
@@ -0,0 +1 @@
+docs/Pywb/navrhy.md
diff --git a/ci/group_vars/test/collecton.yaml b/ci/group_vars/test/collecton.yaml
@@ -1,40 +1,7 @@
-volume_to_collection_mapping:
-  # Collections of Topics
-  ## 2024-06-VolbyDoEU
-  ### Index
-  - /mnt/index/topics/2024-06-VolbyDoEU/:/webarchive/collections/2024-06-VolbyDoEU/indexes/
-  ### Archives
-  - /mnt/archive/24/topics/Topics-2024-06-VolbyDoEU2:/webarchive/collections/2024-06-VolbyDoEU/archive/Topics-2024-06-VolbyDoEU2
-  - /mnt/archive/24/topics/Topics-2024-06-VolbyDoEU3:/webarchive/collections/2024-06-VolbyDoEU/archive/Topics-2024-06-VolbyDoEU3
-  - /mnt/archive/24/topics/Topics-2024-06-VolbyDoEU-MistrovstviSvetaVHokeji:/webarchive/collections/2024-06-VolbyDoEU/archive/Topics-2024-06-VolbyDoEU-MistrovstviSvetaVHokeji
-  ## 2024-CUNI
-  ### Index
-  - /mnt/index/topics/2024-CUNI/:/webarchive/collections/2024-CUNI/indexes/
-  ### Archives
-  - /mnt/archive/24/topics/Topics-2024-01-T-CUNI-MagistratHlMPrahy-NarArchiv-MilanKundera-UtokNaFilozofickeFakulteUK:/webarchive/collections/2024-CUNI/archive/Topics-2024-01-T-CUNI-MagistratHlMPrahy-NarArchiv-MilanKundera-UtokNaFilozofickeFakulteUK
-  - /mnt/archive/24/topics/Topics-2024-02-T-CUNI-MagistratHlMPrahy-NarArchiv-UtokNaFilozofickeFakulteUK-DezinfoWeby-10WebuProVecnost:/webarchive/collections/2024-CUNI/archive/Topics-2024-02-T-CUNI-MagistratHlMPrahy-NarArchiv-UtokNaFilozofickeFakulteUK-DezinfoWeby-10WebuProVecnost
-  - /mnt/archive/24/topics/Topics-2024-03-T-CUNI-MagistratHlMPrahy-NarArchiv:/webarchive/collections/2024-CUNI/archive/Topics-2024-03-T-CUNI-MagistratHlMPrahy-NarArchiv
-  - /mnt/archive/24/topics/Topics-2024-04-T-CUNI-MagistratHlMPrahy-NarArchiv-BedrichSmetana-VolbyDoEU2024:/webarchive/collections/2024-CUNI/archive/Topics-2024-04-T-CUNI-MagistratHlMPrahy-NarArchiv-BedrichSmetana-VolbyDoEU2024
-  - /mnt/archive/24/topics/Topics-2024-04-T-CUNI-MagistratHlMPrahy-NarArchiv-BedrichSmetana-VolbyDoEU2024-2:/webarchive/collections/2024-CUNI/archive/Topics-2024-04-T-CUNI-MagistratHlMPrahy-NarArchiv-BedrichSmetana-VolbyDoEU2024-2
-  - /mnt/archive/24/topics/Topics-2024-04-T-CUNI-MagistratHlMPrahy-NarArchiv-BedrichSmetana-VolbyDoEU2024-3:/webarchive/collections/2024-CUNI/archive/Topics-2024-04-T-CUNI-MagistratHlMPrahy-NarArchiv-BedrichSmetana-VolbyDoEU2024-3
-  - /mnt/archive/24/topics/Topics-2024-05-CUNI-MagistratHlMPrahy-NarArchiv-ErotAPorno-Rajce-SlevyLetaky:/webarchive/collections/2024-CUNI/archive/Topics-2024-05-CUNI-MagistratHlMPrahy-NarArchiv-ErotAPorno-Rajce-SlevyLetaky
-  - /mnt/archive/24/topics/Topics-2024-05-CUNI-MagistratHlMPrahy-NarArchiv-ErotAPorno-Rajce-SlevyLetaky-2:/webarchive/collections/2024-CUNI/archive/Topics-2024-05-CUNI-MagistratHlMPrahy-NarArchiv-ErotAPorno-Rajce-SlevyLetaky-2
-  - /mnt/archive/24/topics/Topics-2024-06-CUNI-MagistratHlMPrahy-NarArchiv-Webzdarma-RizikoveWeby:/webarchive/collections/2024-CUNI/archive/Topics-2024-06-CUNI-MagistratHlMPrahy-NarArchiv-Webzdarma-RizikoveWeby
-  - /mnt/archive/24/topics/Topics-2024-06-CUNI-MagistratHlMPrahy-NarArchiv-Webzdarma-RizikoveWeby-2:/webarchive/collections/2024-CUNI/archive/Topics-2024-06-CUNI-MagistratHlMPrahy-NarArchiv-Webzdarma-RizikoveWeby-2
-  ## 2024-WikiSources
-  ### Index
-  - /mnt/index/topics/2024-WikiSources/:/webarchive/collections/2024-WikiSources/indexes/
-  ### Archives
-  - /mnt/archive/24/topics/Topics-2024-01-T-WikiSources:/webarchive/collections/2024-WikiSources/archive/Topics-2024-01-T-WikiSources
-  - /mnt/archive/24/topics/Topics-2024-01-T-WikiSources-2:/webarchive/collections/2024-WikiSources/archive/Topics-2024-01-T-WikiSources-2
-  ## 2024-Covid19-ValkaNaUkrajine
-  ### Index
-  - /mnt/index/topics/2024-Covid19-ValkaNaUkrajine/:/webarchive/collections/2024-Covid19-ValkaNaUkrajine/indexes/
-  ### Archives
-  - /mnt/archive/24/topics/Topics-2024-02-T-Covid19-ValkaNaUkrajine:/webarchive/collections/2024-Covid19-ValkaNaUkrajine/archive/Topics-2024-02-T-Covid19-ValkaNaUkrajine
-  - /mnt/archive/24/topics/Topics-2024-03-T-Covid19-ValkaNaUkrajine:/webarchive/collections/2024-Covid19-ValkaNaUkrajine/archive/Topics-2024-03-T-Covid19-ValkaNaUkrajine
-  - /mnt/archive/24/topics/Topics-2024-04-T-Covid19-ValkaNaUkrajine:/webarchive/collections/2024-Covid19-ValkaNaUkrajine/archive/Topics-2024-04-T-Covid19-ValkaNaUkrajine
-  - /mnt/archive/24/topics/Topics-2024-05-T-Covid19-ValkaNaUkrajine:/webarchive/collections/2024-Covid19-ValkaNaUkrajine/archive/Topics-2024-05-T-Covid19-ValkaNaUkrajine
-  - /mnt/archive/24/topics/Topics-2024-06-T-Covid19-ValkaNaUkrajine:/webarchive/collections/2024-Covid19-ValkaNaUkrajine/archive/Topics-2024-06-T-Covid19-ValkaNaUkrajine
+collection:
+  # Collection provides archive to collection mapping
+  - /mnt/index/collections:/webarchive/collections
+  # always mount the archive directory as read-only
+  - /mnt/archive:/mnt/archive:ro
   # pywb configuration
   - "{{ pywb_dir }}/config.yaml:/webarchive/config.yaml"
diff --git a/ci/templates/docker-compose.yaml.j2 b/ci/templates/docker-compose.yaml.j2
@@ -16,8 +16,8 @@ services:
   pywb:
     image: webrecorder/pywb:2.7.4
     volumes: 
-{% for mapping in volume_to_collection_mapping %}
-      - "{{ mapping }}"
+{% for path in collection %}
+      - "{{ path }}"
 {% endfor %}
     labels:
       - "traefik.http.routers.pywb.rule=Host(`whoami.docker.localhost`) || Host(`10.3.0.21`) || Host(`localhost`)"