Merge pull request #23 from valentin2105/fix/packages-repo

fix packages repo url for Debian & RPM
saltstack-formulas · Dec 1, 2022 · 50bcf10 · 50bcf10
2 parents a39545d + 201c5c7
commit 50bcf10
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/grafana/osfamilymap.yaml b/grafana/osfamilymap.yaml
@@ -15,17 +15,17 @@ Debian:
     use_upstream_repo: true
     repo:
       humanname: grafana_official
-      name: deb https://packages.grafana.com/oss/deb stable main
+      name: deb https://apt.grafana.com stable main
       file: /etc/apt/sources.list.d/grafana.list
-      key_url: https://packages.grafana.com/gpg.key
+      key_url: https://apt.grafana.com/gpg.key
 
 RedHat:
   pkg:
     use_upstream_repo: true
     repo:
-      baseurl: https://packages.grafana.com/oss/rpm-beta
+      baseurl: https://rpm.grafana.com
       repo_gpgcheck: 1
-      gpgkey: https://packages.grafana.com/gpg.key
+      gpgkey: https://rpm.grafana.com/gpg.key
       sslverify: 1
       sslcacert: /etc/pki/tls/certs/ca-bundle.crt
       comments:
@@ -35,9 +35,9 @@ Suse:
   pkg:
     use_upstream_repo: true
     repo:
-      baseurl: https://packages.grafana.com/oss/rpm-beta
+      baseurl: https://rpm.grafana.com
       repo_gpgcheck: 1
-      gpgkey: https://packages.grafana.com/gpg.key
+      gpgkey: https://rpm.grafana.com/gpg.key
       sslverify: 1
       sslcacert: /etc/pki/tls/certs/ca-bundle.crt
       comments:

diff --git a/pillar.example b/pillar.example
@@ -9,9 +9,9 @@ grafana:
       uri: https://dl.grafana.com/oss/release
     repo:
       humanname: grafana_official
-      name: deb https://packages.grafana.com/oss/deb stable main
+      name: deb https://apt.grafana.com/ stable main
       file: /etc/apt/sources.list.d/grafana.list
-      key_url: https://packages.grafana.com/gpg.key
+      key_url: https://apt.grafana.com/gpg.key
 
   config_file: /etc/grafana/grafana.ini
   service: