From ee06702fca5ce6bdb198b7ceb898397584048b3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= <hertzog@debian.org>
Date: Mon, 20 Jun 2016 21:30:45 +0200
Subject: [PATCH] Use repo.saltstack.com in salt.pkgrepo for Debian-based
 distributions

repo.saltstack.com handles all currently supported Debian releases as well
as all supported Ubuntu releases so this change should be fine.

Part of #180.
---
 salt/map.jinja | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/salt/map.jinja b/salt/map.jinja
index ac2a106..dadf7c2 100644
--- a/salt/map.jinja
+++ b/salt/map.jinja
@@ -8,10 +8,12 @@
 Setup variable using grains['os_family'] based logic, only add key:values here
 that differ from whats in defaults.yaml
 ##}
+{% set osrelease = salt['grains.get']('osrelease') %}
 {% set os_family_map = salt['grains.filter_by']({
     'Debian':  {
-      'pkgrepo': 'deb http://debian.saltstack.com/debian ' + salt['grains.get']('oscodename') + '-saltstack main',
-      'key_url': 'salt://salt/pkgrepo/debian/saltstack.gpg',
+      'pkgrepo': 'deb http://repo.saltstack.com/apt/' +
+      salt['grains.get']('os')|lower + '/' + salt['grains.get']('osmajorrelease', osrelease) + '/amd64/latest ' + salt['grains.get']('oscodename') + ' main',
+      'key_url': 'https://repo.saltstack.com/apt/' + salt['grains.get']('os')|lower + '/' + salt['grains.get']('osmajorrelease', osrelease) + '/amd64/latest/SALTSTACK-GPG-KEY.pub',
       'libgit2': 'libgit2-22',
       'gitfs': {
         'pygit2': {