From 5b4dd3cbf386bd45c9f61ce1e46a71de91c1d7f0 Mon Sep 17 00:00:00 2001
From: "Owen W. Taylor" <otaylor@fishsoup.net>
Date: Fri, 12 Mar 2021 12:57:17 -0500
Subject: [PATCH] flatpak-indexer: update to a newer upstream

 * Fix permissions on generated tardiff files
 * Clean up unused deltas and icons
 * Update times in config files to be readable (30m) rather than
   now-deprecated mix of seconds (1800) and days.
---
 .../flatpak-indexer/templates/configmap.yml           | 11 ++++++-----
 .../flatpak-indexer/vars/production.yml               |  2 +-
 roles/openshift-apps/flatpak-indexer/vars/staging.yml |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/roles/openshift-apps/flatpak-indexer/templates/configmap.yml b/roles/openshift-apps/flatpak-indexer/templates/configmap.yml
index 58cd8d57c2..060990aeca 100644
--- a/roles/openshift-apps/flatpak-indexer/templates/configmap.yml
+++ b/roles/openshift-apps/flatpak-indexer/templates/configmap.yml
@@ -17,8 +17,9 @@ data:
     deltas_uri: https://cdn.registry.fedoraproject.org/deltas/
     icons_uri: https://cdn.registry.fedoraproject.org/app-icons/
 {% endif %}
+    clean_files_after: 1d
     daemon:
-        update_interval: 1800
+        update_interval: 30m
     registries:
         fedora:
             public_url: https://registry.fedoraproject.org/
@@ -31,14 +32,14 @@ data:
             tag: latest
             bodhi_status: stable
             extract_icons: True
-            delta_keep_days: 30
+            delta_keep: 30d
         latest-annotations:
             output: ${OUTPUT_DIR}/fedora/flatpak-latest-annotations.json
             registry: fedora
             tag: latest
             bodhi_status: stable
             extract_icons: True
-            delta_keep_days: 30
+            delta_keep: 30d
             flatpak_annotations: True
 {% for architecture in [ 'amd64', 'arm64' ] %}
         latest-{{ architecture }}:
@@ -48,7 +49,7 @@ data:
             tag: latest
             bodhi_status: stable
             extract_icons: True
-            delta_keep_days: 30
+            delta_keep: 30d
         latest-{{ architecture }}-annotations:
             output: ${OUTPUT_DIR}/fedora/flatpak-latest-{{ architecture }}-annotations.json
             registry: fedora
@@ -56,7 +57,7 @@ data:
             tag: latest
             bodhi_status: stable
             extract_icons: True
-            delta_keep_days: 30
+            delta_keep: 30d
             flatpak_annotations: True
 {% endfor %}
         testing:
diff --git a/roles/openshift-apps/flatpak-indexer/vars/production.yml b/roles/openshift-apps/flatpak-indexer/vars/production.yml
index a96146f2f0..0a36d3bf85 100644
--- a/roles/openshift-apps/flatpak-indexer/vars/production.yml
+++ b/roles/openshift-apps/flatpak-indexer/vars/production.yml
@@ -1,2 +1,2 @@
 ---
-flatpak_indexer_git_ref: b239f79e58015ab32ec4069e1fff3f12a3cc16cb
+flatpak_indexer_git_ref: 999b10dc393a533cc1cd65988a36681f91497d1c
diff --git a/roles/openshift-apps/flatpak-indexer/vars/staging.yml b/roles/openshift-apps/flatpak-indexer/vars/staging.yml
index a96146f2f0..0a36d3bf85 100644
--- a/roles/openshift-apps/flatpak-indexer/vars/staging.yml
+++ b/roles/openshift-apps/flatpak-indexer/vars/staging.yml
@@ -1,2 +1,2 @@
 ---
-flatpak_indexer_git_ref: b239f79e58015ab32ec4069e1fff3f12a3cc16cb
+flatpak_indexer_git_ref: 999b10dc393a533cc1cd65988a36681f91497d1c