Merge pull request 'Add rspamd RPM remote' (#63) from benvin/rspamd-rpm-remote into main

Reviewed-on: #63

.woodpecker/apply.yaml

@@ -1,10 +1,12 @@
 when:
   - event: push
     branch: main
+  - event: manual
+    branch: main
 
 steps:
   - name: apply
-    image: git.unkin.net/unkin/almalinux9-opentofu:20260606
+    image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/opentofu:0.1.0
     environment:
       VAULT_AUTH_METHOD: kubernetes
       VAULT_VERSION: "1.20.0"

.woodpecker/plan.yaml

@@ -3,7 +3,7 @@ when:
 
 steps:
   - name: plan
-    image: git.unkin.net/unkin/almalinux9-opentofu:20260606
+    image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/opentofu:0.1.0
     environment:
       VAULT_AUTH_METHOD: kubernetes
       VAULT_VERSION: "1.20.0"

.woodpecker/pre-commit.yaml

@@ -3,7 +3,7 @@ when:
 
 steps:
   - name: pre-commit
-    image: git.unkin.net/unkin/almalinux9-opentofu:20260606
+    image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/opentofu:0.1.0
     commands:
       - uvx pre-commit run --all-files
     backend_options:

Makefile

@@ -21,7 +21,7 @@ init:
 
 plan: init
 	@$(call vault_env) && \
-	terragrunt run --all --parallelism 4 --non-interactive plan
+	terragrunt run --all --parallelism 4 --non-interactive plan -- -lock=false
 
 apply: init
 	@$(call vault_env) && \

config/config.hcl

@@ -12,6 +12,11 @@ locals {
       trimsuffix(basename(file_path), ".yaml") => content
       if startswith(file_path, "remote_alpine/")
     }
+    remote_cargo = {
+      for file_path, content in local.all_configs :
+      trimsuffix(basename(file_path), ".yaml") => content
+      if startswith(file_path, "remote_cargo/")
+    }
     remote_docker = {
       for file_path, content in local.all_configs :
       trimsuffix(basename(file_path), ".yaml") => content
@@ -22,6 +27,16 @@ locals {
       trimsuffix(basename(file_path), ".yaml") => content
       if startswith(file_path, "remote_generic/")
     }
+    remote_github_deb = {
+      for file_path, content in local.all_configs :
+      trimsuffix(basename(file_path), ".yaml") => content
+      if startswith(file_path, "remote_github_deb/")
+    }
+    remote_github_rpm = {
+      for file_path, content in local.all_configs :
+      trimsuffix(basename(file_path), ".yaml") => content
+      if startswith(file_path, "remote_github_rpm/")
+    }
     remote_goproxy = {
       for file_path, content in local.all_configs :
       trimsuffix(basename(file_path), ".yaml") => content
@@ -32,6 +47,11 @@ locals {
       trimsuffix(basename(file_path), ".yaml") => content
       if startswith(file_path, "remote_helm/")
     }
+    remote_npm = {
+      for file_path, content in local.all_configs :
+      trimsuffix(basename(file_path), ".yaml") => content
+      if startswith(file_path, "remote_npm/")
+    }
     remote_pypi = {
       for file_path, content in local.all_configs :
       trimsuffix(basename(file_path), ".yaml") => content

config/local_generic/jellyfin-plugins.yaml

@@ -0,0 +1,2 @@
+---
+description: "Jellyfin plugin zips built in-house (JPRM release archives published on tag)"

config/local_generic/nvim-plugins.yaml

@@ -0,0 +1,2 @@
+---
+description: "Neovim plugin release archives (<plugin>-<version>.zip) installed by arti-pack"

config/remote_cargo/crates-io.yaml

@@ -0,0 +1,6 @@
+base_url: https://index.crates.io
+description: "crates.io — public Rust crate sparse index"
+immutable_ttl: 0
+mutable_ttl: 300
+check_mutable: true
+stale_on_error: true

config/remote_docker/dockerhub.yaml

@@ -13,9 +13,11 @@ patterns:
   - "^library/nats"
   - "^library/nginx"
   - "^library/postgres"
+  - "^library/python"
   - "^library/redis"
   - "^beats/filebeat"
   - "^bitnami/"
+  - "^clamav/clamav"
   - "^clickhouse/"
   - "^curlimages/curl"
   - "^emberstack/kubernetes-reflector"
@@ -34,6 +36,7 @@ patterns:
   - "^osixia/"
   - "^rancher/"
   - "^rspamd/rspamd"
+  - "^stalwartlabs/(stalwart|cli)"
   - "^tiredofit/"
   - "^timberio/vector"
   - "^tozd/postfix"

config/remote_docker/ghcr.yaml

@@ -3,6 +3,7 @@ description: GitHub Container Registry
 immutable_ttl: 0
 mutable_ttl: 300
 patterns:
+  - "^arabcoders/watchstate"
   - "^cloudnative-pg/"
   - "^dexidp/"
   - "^emberstack/helm-charts"

config/remote_docker/k8s-registry.yaml

@@ -5,4 +5,6 @@ mutable_ttl: 300
 patterns:
   - "^autoscaling/vpa-"
   - "^external-dns/external-dns"
+  - "^kube-state-metrics/"
+  - "^kubectl"
   - "^sig-storage/"

config/remote_generic/gitea.yaml

@@ -0,0 +1,6 @@
+base_url: https://git.unkin.net
+description: Internal Gitea unkin tag source archives
+immutable_ttl: 0
+mutable_ttl: 7200
+patterns:
+  - "^unkin/[^/]+/archive/refs/tags/[^/]+\\.zip$"

config/remote_generic/github.yaml

@@ -3,24 +3,71 @@ description: GitHub releases and files
 immutable_ttl: 0
 mutable_ttl: 7200
 mutable_patterns:
-  - ".*/archive/refs/heads/.*.tar.gz$"
+  # Branch archives of tagless Neovim plugins; a branch ref moves, so these
+  # revalidate on mutable_ttl instead of caching immutably.
+  - "^HampusHauffman/block\\.nvim/archive/refs/heads/main\\.(zip|tar\\.gz)$"
+  - "^hrsh7th/cmp-buffer/archive/refs/heads/main\\.(zip|tar\\.gz)$"
+  - "^hrsh7th/cmp-nvim-lsp/archive/refs/heads/main\\.(zip|tar\\.gz)$"
+  - "^hrsh7th/cmp-nvim-lsp-signature-help/archive/refs/heads/main\\.(zip|tar\\.gz)$"
+  - "^hrsh7th/cmp-nvim-lua/archive/refs/heads/main\\.(zip|tar\\.gz)$"
+  - "^hrsh7th/cmp-path/archive/refs/heads/main\\.(zip|tar\\.gz)$"
+  - "^hrsh7th/cmp-vsnip/archive/refs/heads/main\\.(zip|tar\\.gz)$"
+  - "^hrsh7th/vim-vsnip/archive/refs/heads/master\\.(zip|tar\\.gz)$"
+  - "^junegunn/gv\\.vim/archive/refs/heads/master\\.(zip|tar\\.gz)$"
+  - "^jvirtanen/vim-hcl/archive/refs/heads/main\\.(zip|tar\\.gz)$"
+  - "^Mofiqul/dracula\\.nvim/archive/refs/heads/main\\.(zip|tar\\.gz)$"
+  - "^numToStr/FTerm\\.nvim/archive/refs/heads/master\\.(zip|tar\\.gz)$"
+  - "^qvalentin/helm-ls\\.nvim/archive/refs/heads/main\\.(zip|tar\\.gz)$"
+  - "^rafamadriz/friendly-snippets/archive/refs/heads/main\\.(zip|tar\\.gz)$"
   - "stalwartlabs/webadmin/releases/latest/download/webadmin.zip$"
   # iplocate IP databases (Git-LFS; the /raw/ path redirects to the LFS media host).
   - "iplocate/ip-address-databases/raw/.*/ip-to-asn/.*"
   - "iplocate/ip-address-databases/raw/.*/ip-to-country/.*"
 patterns:
+  # Branch archives of Neovim plugins that publish no tags. patterns is a
+  # strict allowlist checked before mutable_patterns, so each repo must be
+  # listed in both. Anchored per repo: matching is a substring search, so an
+  # unanchored entry would also admit evil/<owner>/<repo>/....
+  - "^HampusHauffman/block\\.nvim/archive/refs/heads/main\\.(zip|tar\\.gz)$"
+  - "^hrsh7th/cmp-buffer/archive/refs/heads/main\\.(zip|tar\\.gz)$"
+  - "^hrsh7th/cmp-nvim-lsp/archive/refs/heads/main\\.(zip|tar\\.gz)$"
+  - "^hrsh7th/cmp-nvim-lsp-signature-help/archive/refs/heads/main\\.(zip|tar\\.gz)$"
+  - "^hrsh7th/cmp-nvim-lua/archive/refs/heads/main\\.(zip|tar\\.gz)$"
+  - "^hrsh7th/cmp-path/archive/refs/heads/main\\.(zip|tar\\.gz)$"
+  - "^hrsh7th/cmp-vsnip/archive/refs/heads/main\\.(zip|tar\\.gz)$"
+  - "^hrsh7th/vim-vsnip/archive/refs/heads/master\\.(zip|tar\\.gz)$"
+  - "^junegunn/gv\\.vim/archive/refs/heads/master\\.(zip|tar\\.gz)$"
+  - "^jvirtanen/vim-hcl/archive/refs/heads/main\\.(zip|tar\\.gz)$"
+  - "^Mofiqul/dracula\\.nvim/archive/refs/heads/main\\.(zip|tar\\.gz)$"
+  - "^numToStr/FTerm\\.nvim/archive/refs/heads/master\\.(zip|tar\\.gz)$"
+  - "^qvalentin/helm-ls\\.nvim/archive/refs/heads/main\\.(zip|tar\\.gz)$"
+  - "^rafamadriz/friendly-snippets/archive/refs/heads/main\\.(zip|tar\\.gz)$"
   - ".*/archive/refs/tags/.*.tar.gz$"
+  - ".*/archive/refs/tags/.*\\.zip$"
+  - "9p4/jellyfin-plugin-sso/.*/sso-authentication_.*.zip$"
+  - "ahmetb/kubectl-tree/.*/kubectl-tree_.*_checksums.txt$"
+  - "ahmetb/kubectl-tree/.*/kubectl-tree_.*_linux_amd64.tar.gz$"
   - "ahmetb/kubectx/.*/kubectx_.*_linux_x86_64.tar.gz$"
   - "ahmetb/kubectx/.*/kubens_.*_linux_x86_64.tar.gz$"
   - "apple/foundationdb/.*/libfdb_c.x86_64.so$"
+  - "argoproj/argo-cd/.*/argocd-linux-amd64$"
+  - "argoproj/argo-cd/.*/cli_checksums.txt$"
   - "astral-sh/ruff/.*/ruff-x86_64-unknown-linux-gnu.tar.gz$"
   - "astral-sh/uv/.*/uv-x86_64-unknown-linux-gnu.tar.gz$"
   - "camptocamp/prometheus-puppetdb-exporter/.*/prometheus-puppetdb-exporter-.*.linux-amd64.tar.gz$"
+  - "cert-manager/cmctl/.*/checksums.txt$"
+  - "cert-manager/cmctl/.*/cmctl_linux_amd64$"
+  - "cloudnative-pg/cloudnative-pg/.*/cnpg-.*-checksums.txt$"
+  - "cloudnative-pg/cloudnative-pg/.*/kubectl-cnpg_.*_linux_x86_64.tar.gz$"
   - "coder/code-server/.*/code-server-.*-amd64.rpm$"
   - "containernetworking/plugins/.*/cni-plugins-linux-amd64-.*.tgz"
   - "dandavison/delta/.*/delta-.*-x86_64-unknown-linux-musl.tar.gz$"
   - "ducaale/xh/.*/xh-.*-x86_64-unknown-linux-musl.tar.gz$"
+  - "elsesiy/kubectl-view-secret/.*/kubectl-view-secret_.*_checksums.txt$"
+  - "elsesiy/kubectl-view-secret/.*/kubectl-view-secret_.*_linux_amd64.tar.gz$"
   - "etcd-io/etcd/.*/etcd-.*-linux-amd64.tar.gz$"
+  - "envoyproxy/envoy/.*/envoy-.*-linux-x86_64$"
+  - "envoyproxy/envoy/.*/checksums.txt.asc$"
   - "getsops/sops/.*/sops-v.*\\.linux\\.amd64$"
   - "grafana/jsonnet-language-server/.*/jsonnet-language-server_.*_linux_amd64$"
   - "gruntwork-io/boilerplate/.*/boilerplate_linux_amd64$"
@@ -33,6 +80,10 @@ patterns:
   - "iplocate/ip-address-databases/raw/.*/ip-to-asn/.*"
   - "iplocate/ip-address-databases/raw/.*/ip-to-country/.*"
   - "jesseduffield/lazydocker/.*/lazydocker_.*_Linux_x86_64.tar.gz$"
+  - "JohnnyMorganz/StyLua/.*/stylua-linux-x86_64\\.zip$"
+  - "JohnnyMorganz/StyLua/.*/stylua-linux-x86_64-musl\\.zip$"
+  - "k8up-io/k8up/.*/checksums.txt$"
+  - "k8up-io/k8up/.*/k8up_.*_linux_amd64.tar.gz$"
   - "kubecolor/kubecolor/.*/kubecolor_.*_linux_amd64.tar.gz$"
   - "kubernetes-sigs/gateway-api/.*/standard-install.yaml$"
   - "kubernetes-sigs/kustomize/.*/kustomize_.*_linux_amd64.tar.gz$"
@@ -56,6 +107,7 @@ patterns:
   - "stalwartlabs/stalwart/.*/stalwart-x86_64-unknown-linux-gnu.tar.gz$"
   - "starship/starship/.*/starship-x86_64-unknown-linux-musl.tar.gz$"
   - "stern/stern/.*/stern_.*_linux_amd64.tar.gz$"
+  - "^storytold/[a-z]+craft/releases/download/[^/]+/[a-z]+craft-[^/]+-linux-(x86_64|aarch64)\\.(rpm|deb)$"
   - "terraform-linters/tflint/.*/tflint_linux_amd64.zip$"
   - "tynany/frr_exporter/.*/frr_exporter-.*.linux-amd64.tar.gz$"
   - "VictoriaMetrics/VictoriaLogs/.*/victoria-logs-linux-amd64-.*.tar.gz$"

config/remote_generic/github_user.yaml

@@ -2,8 +2,18 @@ base_url: https://raw.githubusercontent.com
 description: GitHub User Content
 immutable_ttl: 0
 mutable_ttl: 7200
+mutable_patterns:
+  # victoria-metrics-k8s-stack dashboard sources; branch refs move, so these
+  # revalidate on mutable_ttl instead of caching immutably.
+  - "^dotdc/grafana-dashboards-kubernetes/master/dashboards/k8s-[a-z-]+\\.json$"
+  - "^monitoring-mixins/website/master/assets/etcd/dashboards/etcd\\.json$"
+  - "^prometheus-operator/kube-prometheus/main/manifests/grafana-dashboardDefinitions\\.yaml$"
 patterns:
   - "argoproj/argo-cd/.*.yaml$"
   - "datreeio/CRDs-catalog/main/.*.json$"
   - "kubernetes/kubernetes/.*.json$"
   - "yannh/kubernetes-json-schema/master/.*.json$"
+  # victoria-metrics-k8s-stack dashboard sources (also in mutable_patterns).
+  - "^dotdc/grafana-dashboards-kubernetes/master/dashboards/k8s-[a-z-]+\\.json$"
+  - "^monitoring-mixins/website/master/assets/etcd/dashboards/etcd\\.json$"
+  - "^prometheus-operator/kube-prometheus/main/manifests/grafana-dashboardDefinitions\\.yaml$"

config/remote_generic/jellyfin.yaml

@@ -0,0 +1,6 @@
+base_url: https://repo.jellyfin.org
+description: Jellyfin official plugin repository
+immutable_ttl: 0
+mutable_ttl: 7200
+patterns:
+  - "files/plugin/ldap-authentication/ldap-authentication_.*.zip$"

config/remote_github_deb/storytold-cadcraft-deb.yaml

@@ -0,0 +1,3 @@
+base_url: https://api.github.com/repos/storytold/cadcraft
+description: storytold/cadcraft GitHub releases as an apt repo
+releases_remote: github

config/remote_github_deb/storytold-deckcraft-deb.yaml

@@ -0,0 +1,3 @@
+base_url: https://api.github.com/repos/storytold/deckcraft
+description: storytold/deckcraft GitHub releases as an apt repo
+releases_remote: github

config/remote_github_deb/storytold-effectcraft-deb.yaml

@@ -0,0 +1,3 @@
+base_url: https://api.github.com/repos/storytold/effectcraft
+description: storytold/effectcraft GitHub releases as an apt repo
+releases_remote: github

config/remote_github_deb/storytold-filmcraft-deb.yaml

@@ -0,0 +1,3 @@
+base_url: https://api.github.com/repos/storytold/filmcraft
+description: storytold/filmcraft GitHub releases as an apt repo
+releases_remote: github

config/remote_github_deb/storytold-gridcraft-deb.yaml

@@ -0,0 +1,3 @@
+base_url: https://api.github.com/repos/storytold/gridcraft
+description: storytold/gridcraft GitHub releases as an apt repo
+releases_remote: github

config/remote_github_deb/storytold-lightcraft-deb.yaml

@@ -0,0 +1,3 @@
+base_url: https://api.github.com/repos/storytold/lightcraft
+description: storytold/lightcraft GitHub releases as an apt repo
+releases_remote: github

config/remote_github_deb/storytold-pdfcraft-deb.yaml

@@ -0,0 +1,3 @@
+base_url: https://api.github.com/repos/storytold/pdfcraft
+description: storytold/pdfcraft GitHub releases as an apt repo
+releases_remote: github

config/remote_github_deb/storytold-photocraft-deb.yaml

@@ -0,0 +1,3 @@
+base_url: https://api.github.com/repos/storytold/photocraft
+description: storytold/photocraft GitHub releases as an apt repo
+releases_remote: github

config/remote_github_deb/storytold-soundcraft-deb.yaml

@@ -0,0 +1,3 @@
+base_url: https://api.github.com/repos/storytold/soundcraft
+description: storytold/soundcraft GitHub releases as an apt repo
+releases_remote: github

config/remote_github_deb/storytold-vectorcraft-deb.yaml

@@ -0,0 +1,3 @@
+base_url: https://api.github.com/repos/storytold/vectorcraft
+description: storytold/vectorcraft GitHub releases as an apt repo
+releases_remote: github

config/remote_github_deb/storytold-wordcraft-deb.yaml

@@ -0,0 +1,3 @@
+base_url: https://api.github.com/repos/storytold/wordcraft
+description: storytold/wordcraft GitHub releases as an apt repo
+releases_remote: github

config/remote_github_rpm/storytold-cadcraft-rpm.yaml

@@ -0,0 +1,3 @@
+base_url: https://api.github.com/repos/storytold/cadcraft
+description: storytold/cadcraft GitHub releases as a yum repo
+releases_remote: github

config/remote_github_rpm/storytold-deckcraft-rpm.yaml

@@ -0,0 +1,3 @@
+base_url: https://api.github.com/repos/storytold/deckcraft
+description: storytold/deckcraft GitHub releases as a yum repo
+releases_remote: github

config/remote_github_rpm/storytold-effectcraft-rpm.yaml

@@ -0,0 +1,3 @@
+base_url: https://api.github.com/repos/storytold/effectcraft
+description: storytold/effectcraft GitHub releases as a yum repo
+releases_remote: github

config/remote_github_rpm/storytold-filmcraft-rpm.yaml

@@ -0,0 +1,3 @@
+base_url: https://api.github.com/repos/storytold/filmcraft
+description: storytold/filmcraft GitHub releases as a yum repo
+releases_remote: github

config/remote_github_rpm/storytold-gridcraft-rpm.yaml

@@ -0,0 +1,3 @@
+base_url: https://api.github.com/repos/storytold/gridcraft
+description: storytold/gridcraft GitHub releases as a yum repo
+releases_remote: github

config/remote_github_rpm/storytold-lightcraft-rpm.yaml

@@ -0,0 +1,3 @@
+base_url: https://api.github.com/repos/storytold/lightcraft
+description: storytold/lightcraft GitHub releases as a yum repo
+releases_remote: github

config/remote_github_rpm/storytold-pdfcraft-rpm.yaml

@@ -0,0 +1,3 @@
+base_url: https://api.github.com/repos/storytold/pdfcraft
+description: storytold/pdfcraft GitHub releases as a yum repo
+releases_remote: github

config/remote_github_rpm/storytold-photocraft-rpm.yaml

@@ -0,0 +1,3 @@
+base_url: https://api.github.com/repos/storytold/photocraft
+description: storytold/photocraft GitHub releases as a yum repo
+releases_remote: github

config/remote_github_rpm/storytold-soundcraft-rpm.yaml

@@ -0,0 +1,3 @@
+base_url: https://api.github.com/repos/storytold/soundcraft
+description: storytold/soundcraft GitHub releases as a yum repo
+releases_remote: github

config/remote_github_rpm/storytold-vectorcraft-rpm.yaml

@@ -0,0 +1,3 @@
+base_url: https://api.github.com/repos/storytold/vectorcraft
+description: storytold/vectorcraft GitHub releases as a yum repo
+releases_remote: github

config/remote_github_rpm/storytold-wordcraft-rpm.yaml

@@ -0,0 +1,3 @@
+base_url: https://api.github.com/repos/storytold/wordcraft
+description: storytold/wordcraft GitHub releases as a yum repo
+releases_remote: github

config/remote_npm/npmjs.yaml

@@ -0,0 +1,5 @@
+base_url: https://registry.npmjs.org
+description: "npm — public npm registry"
+immutable_ttl: 0
+mutable_ttl: 3600
+stale_on_error: true

config/remote_rpm/rspamd.yaml

@@ -0,0 +1,7 @@
+base_url: https://rspamd.com
+description: Rspamd RPM package repository
+immutable_ttl: 0
+mutable_ttl: 7200
+immutable_patterns:
+  - ".*\\.rpm$"
+  - "rpm/rspamd\\.asc$"

config/virtual/rpm-custom-el10.yaml

@@ -0,0 +1,17 @@
+package_type: rpm
+description: "Custom el10 RPMs: internal, vendor and GitHub-release packages. Member order is priority order."
+members:
+  - rpm-internal-el10
+  - rpm-internal
+  - rpm-vendor
+  - storytold-cadcraft-rpm
+  - storytold-deckcraft-rpm
+  - storytold-effectcraft-rpm
+  - storytold-filmcraft-rpm
+  - storytold-gridcraft-rpm
+  - storytold-lightcraft-rpm
+  - storytold-pdfcraft-rpm
+  - storytold-photocraft-rpm
+  - storytold-soundcraft-rpm
+  - storytold-vectorcraft-rpm
+  - storytold-wordcraft-rpm

config/virtual/rpm-custom-el8.yaml

@@ -0,0 +1,18 @@
+package_type: rpm
+description: "Custom el8 RPMs: internal, vendor and GitHub-release packages. Member order is priority order."
+members:
+  - rpm-internal-el8
+  - rpm-vendor-el8
+  - rpm-internal
+  - rpm-vendor
+  - storytold-cadcraft-rpm
+  - storytold-deckcraft-rpm
+  - storytold-effectcraft-rpm
+  - storytold-filmcraft-rpm
+  - storytold-gridcraft-rpm
+  - storytold-lightcraft-rpm
+  - storytold-pdfcraft-rpm
+  - storytold-photocraft-rpm
+  - storytold-soundcraft-rpm
+  - storytold-vectorcraft-rpm
+  - storytold-wordcraft-rpm

config/virtual/rpm-custom-el9.yaml

@@ -0,0 +1,18 @@
+package_type: rpm
+description: "Custom el9 RPMs: internal, vendor and GitHub-release packages. Member order is priority order."
+members:
+  - rpm-internal-el9
+  - rpm-vendor-el9
+  - rpm-internal
+  - rpm-vendor
+  - storytold-cadcraft-rpm
+  - storytold-deckcraft-rpm
+  - storytold-effectcraft-rpm
+  - storytold-filmcraft-rpm
+  - storytold-gridcraft-rpm
+  - storytold-lightcraft-rpm
+  - storytold-pdfcraft-rpm
+  - storytold-photocraft-rpm
+  - storytold-soundcraft-rpm
+  - storytold-vectorcraft-rpm
+  - storytold-wordcraft-rpm

config/virtual/rpm-custom-f42.yaml

@@ -0,0 +1,18 @@
+package_type: rpm
+description: "Custom f42 RPMs: internal, vendor and GitHub-release packages. Member order is priority order."
+members:
+  - rpm-internal-f42
+  - rpm-vendor-f42
+  - rpm-internal
+  - rpm-vendor
+  - storytold-cadcraft-rpm
+  - storytold-deckcraft-rpm
+  - storytold-effectcraft-rpm
+  - storytold-filmcraft-rpm
+  - storytold-gridcraft-rpm
+  - storytold-lightcraft-rpm
+  - storytold-pdfcraft-rpm
+  - storytold-photocraft-rpm
+  - storytold-soundcraft-rpm
+  - storytold-vectorcraft-rpm
+  - storytold-wordcraft-rpm

config/virtual/rpm-custom-f43.yaml

@@ -0,0 +1,18 @@
+package_type: rpm
+description: "Custom f43 RPMs: internal, vendor and GitHub-release packages. Member order is priority order."
+members:
+  - rpm-internal-f43
+  - rpm-vendor-f43
+  - rpm-internal
+  - rpm-vendor
+  - storytold-cadcraft-rpm
+  - storytold-deckcraft-rpm
+  - storytold-effectcraft-rpm
+  - storytold-filmcraft-rpm
+  - storytold-gridcraft-rpm
+  - storytold-lightcraft-rpm
+  - storytold-pdfcraft-rpm
+  - storytold-photocraft-rpm
+  - storytold-soundcraft-rpm
+  - storytold-vectorcraft-rpm
+  - storytold-wordcraft-rpm

config/virtual/rpm-custom-f44.yaml

@@ -0,0 +1,18 @@
+package_type: rpm
+description: "Custom f44 RPMs: internal, vendor and GitHub-release packages. Member order is priority order."
+members:
+  - rpm-internal-f44
+  - rpm-vendor-f44
+  - rpm-internal
+  - rpm-vendor
+  - storytold-cadcraft-rpm
+  - storytold-deckcraft-rpm
+  - storytold-effectcraft-rpm
+  - storytold-filmcraft-rpm
+  - storytold-gridcraft-rpm
+  - storytold-lightcraft-rpm
+  - storytold-pdfcraft-rpm
+  - storytold-photocraft-rpm
+  - storytold-soundcraft-rpm
+  - storytold-vectorcraft-rpm
+  - storytold-wordcraft-rpm

environments/artifactapi.k8s.syd1.au.unkin.net/terragrunt.hcl

@@ -17,17 +17,21 @@ terraform {
 }
 
 inputs = {
-  remote_alpine   = local.config.remote_alpine
+  remote_alpine     = local.config.remote_alpine
-  remote_docker   = local.config.remote_docker
+  remote_cargo      = local.config.remote_cargo
-  remote_generic  = local.config.remote_generic
+  remote_docker     = local.config.remote_docker
-  remote_goproxy  = local.config.remote_goproxy
+  remote_generic    = local.config.remote_generic
-  remote_helm     = local.config.remote_helm
+  remote_github_deb = local.config.remote_github_deb
-  remote_pypi     = local.config.remote_pypi
+  remote_github_rpm = local.config.remote_github_rpm
-  remote_rpm      = local.config.remote_rpm
+  remote_goproxy    = local.config.remote_goproxy
-  local_terraform = local.config.local_terraform
+  remote_helm       = local.config.remote_helm
-  local_pypi      = local.config.local_pypi
+  remote_npm        = local.config.remote_npm
-  local_rpm       = local.config.local_rpm
+  remote_pypi       = local.config.remote_pypi
-  local_docker    = local.config.local_docker
+  remote_rpm        = local.config.remote_rpm
-  local_generic   = local.config.local_generic
+  local_terraform   = local.config.local_terraform
-  virtual         = local.config.virtual
+  local_pypi        = local.config.local_pypi
+  local_rpm         = local.config.local_rpm
+  local_docker      = local.config.local_docker
+  local_generic     = local.config.local_generic
+  virtual           = local.config.virtual
 }

modules/artifactapi/main.tf

@@ -13,6 +13,20 @@ resource "artifactapi_remote_alpine" "this" {
   mirror_strategy    = each.value.mirror_strategy
 }
 
+resource "artifactapi_remote_cargo" "this" {
+  for_each = var.remote_cargo
+
+  name             = each.key
+  base_url         = each.value.base_url
+  description      = each.value.description
+  immutable_ttl    = each.value.immutable_ttl
+  mutable_ttl      = each.value.mutable_ttl
+  check_mutable    = each.value.check_mutable
+  patterns         = each.value.patterns
+  mutable_patterns = each.value.mutable_patterns
+  stale_on_error   = each.value.stale_on_error
+}
+
 resource "artifactapi_remote_docker" "this" {
   for_each = var.remote_docker
 
@@ -80,6 +94,47 @@ resource "artifactapi_remote_rpm" "this" {
   mirror_strategy    = each.value.mirror_strategy
 }
 
+resource "artifactapi_remote_github_rpm" "this" {
+  for_each = var.remote_github_rpm
+
+  name            = each.key
+  base_url        = each.value.base_url
+  description     = each.value.description
+  releases_remote = each.value.releases_remote
+  mutable_ttl     = each.value.mutable_ttl
+  patterns        = each.value.patterns
+  stale_on_error  = each.value.stale_on_error
+
+  depends_on = [artifactapi_remote_generic.this]
+}
+
+resource "artifactapi_remote_github_deb" "this" {
+  for_each = var.remote_github_deb
+
+  name            = each.key
+  base_url        = each.value.base_url
+  description     = each.value.description
+  releases_remote = each.value.releases_remote
+  mutable_ttl     = each.value.mutable_ttl
+  patterns        = each.value.patterns
+  stale_on_error  = each.value.stale_on_error
+
+  depends_on = [artifactapi_remote_generic.this]
+}
+
+resource "artifactapi_remote_npm" "this" {
+  for_each = var.remote_npm
+
+  name             = each.key
+  base_url         = each.value.base_url
+  description      = each.value.description
+  immutable_ttl    = each.value.immutable_ttl
+  mutable_ttl      = each.value.mutable_ttl
+  patterns         = each.value.patterns
+  mutable_patterns = each.value.mutable_patterns
+  stale_on_error   = each.value.stale_on_error
+}
+
 resource "artifactapi_remote_pypi" "this" {
   for_each = var.remote_pypi
 

modules/artifactapi/variables.tf

@@ -14,6 +14,21 @@ variable "remote_alpine" {
   default = {}
 }
 
+variable "remote_cargo" {
+  description = "Map of cargo (crates.io sparse index) remote repositories"
+  type = map(object({
+    base_url         = string
+    description      = optional(string, "")
+    immutable_ttl    = optional(number, 0)
+    mutable_ttl      = optional(number, 3600)
+    check_mutable    = optional(bool, true)
+    patterns         = optional(list(string), [])
+    mutable_patterns = optional(list(string), [])
+    stale_on_error   = optional(bool, true)
+  }))
+  default = {}
+}
+
 variable "remote_docker" {
   description = "Map of Docker remote repositories"
   type = map(object({
@@ -86,6 +101,46 @@ variable "remote_rpm" {
   default = {}
 }
 
+variable "remote_github_rpm" {
+  description = "Map of GitHub-release-backed RPM remote repositories"
+  type = map(object({
+    base_url        = string
+    description     = optional(string, "")
+    releases_remote = string
+    mutable_ttl     = optional(number, 3600)
+    patterns        = optional(list(string), [])
+    stale_on_error  = optional(bool, true)
+  }))
+  default = {}
+}
+
+variable "remote_github_deb" {
+  description = "Map of GitHub-release-backed DEB remote repositories"
+  type = map(object({
+    base_url        = string
+    description     = optional(string, "")
+    releases_remote = string
+    mutable_ttl     = optional(number, 3600)
+    patterns        = optional(list(string), [])
+    stale_on_error  = optional(bool, true)
+  }))
+  default = {}
+}
+
+variable "remote_npm" {
+  description = "Map of npm remote repositories"
+  type = map(object({
+    base_url         = string
+    description      = optional(string, "")
+    immutable_ttl    = optional(number, 0)
+    mutable_ttl      = optional(number, 3600)
+    patterns         = optional(list(string), [])
+    mutable_patterns = optional(list(string), [])
+    stale_on_error   = optional(bool, true)
+  }))
+  default = {}
+}
+
 variable "remote_pypi" {
   description = "Map of PyPI remote repositories"
   type = map(object({