repos galore!

base/packages/openhab2.sls

@@ -1,12 +1,6 @@
 # -*- coding: utf-8 -*-
 # vim: ft=yaml
 ---
-{%-
- set cache_url = salt['pillar.get'](
-      'services:apt-cache',
-      default=''
-      )
-%}
 
 include:
   - haproxy
@@ -27,7 +21,7 @@ openhab2-pkgs:
 
 repo_openhab2:
   pkgrepo.managed:
-    - name: deb http://{{ cache_url }}dl.bintray.com/openhab/apt-repo2 stable main 
+    - name: deb https://dl.bintray.com/openhab/apt-repo2 stable main 
     - file: /etc/apt/sources.list.d/openhab2.list
     - key_url: 'https://bintray.com/user/downloadSubjectPublicKey?username=openhab'
     - clean_file: True

base/packages/repo/debian.sls

@@ -9,29 +9,23 @@
 
 repo_debian:
   pkgrepo.managed:
-    - name: deb http://{{ cache_url }}deb.debian.org/debian {{ grains['oscodename'] }} main contrib non-free
+    - name: 'deb http://{{ cache_url }}deb.debian.org/debian {{ grains['oscodename'] }} main contrib non-free'
     - dist: {{ grains['oscodename'] }}
     - file: /etc/apt/sources.list.d/debian.list
     - clean_file: True
 
 repo_debian-backports:
   pkgrepo.managed:
-    - name: deb http://{{ cache_url}}deb.debian.org/debian {{ grains['oscodename'] }}-backports main contrib non-free
-    - dist: {{ grains['oscodename'] }}
+    - name: 'deb http://{{ cache_url}}deb.debian.org/debian {{ grains['oscodename'] }}-backports main contrib non-free'
     - file: /etc/apt/sources.list.d/debian-backports.list
     - clean_file: True
 
 repo_debian-security:
   pkgrepo.managed:
-    - name: deb http://{{ cache_url}}deb.debian.org/debian {{ grains['oscodename'] }}/updates main contrib non-free
-    - dist: {{ grains['oscodename'] }}
+    - name: 'deb http://{{ cache_url}}security.debian.org/debian-security {{ grains['oscodename'] }}/updates main contrib non-free'
     - file: /etc/apt/sources.list.d/debian-security.list
     - clean_file: True
 
-
-
-
-
 #apt-update:
 #  cmd.run:
 #    - name: apt update -y