Modifications for Debian Stretch

diff --git a/basic/files/fbrehm.sh b/basic/files/fbrehm.sh
index 0ffd1955fabfb267060acf2e217b1538900759bf..64aa26d6206159cd60e9d876b92d402965d9e610 100644 (file)
--- a/basic/files/fbrehm.sh
+++ b/basic/files/fbrehm.sh
@@ -12,12 +12,9 @@ HISTCONTROL=ignoredups:ignorespace
 # append to the history file, don't overwrite it
 shopt -s histappend
 
-{%- if debian_release != 'stretch' %}
-
 # coloring grep:
-export GREP_OPTIONS='--color=auto'
+alias grep='grep --color=auto'
 export GREP_COLOR='1;32'
-{%- endif %}
 
 # hold these special chars when piping to less
 export LESS="--RAW-CONTROL-CHARS"

diff --git a/debian/apt/files/salt.list b/debian/apt/files/salt.list
index 7a56378f901848b2b62a9b2610a1bc503a12727f..ba71a02b84d321054c06aad66602efe61b9edef0 100644 (file)
--- a/debian/apt/files/salt.list
+++ b/debian/apt/files/salt.list
@@ -1 +1 @@
-deb    http://repo.saltstack.com/apt/debian/8/amd64/latest     {{ debian_release }} main
+deb    http://repo.saltstack.com/apt/debian/{{ osmajorrelease  }}/amd64/latest {{ debian_release }} main

diff --git a/debian/apt/init.sls b/debian/apt/init.sls
index 5a4b0362fcfdd6a25dbaccd4adbe6b580164f98c..2c7002afea47bc78b052839cb9ca4bceaadbbc33 100644 (file)
--- a/debian/apt/init.sls
+++ b/debian/apt/init.sls
@@ -1,5 +1,6 @@
 {%- from "debian/apt/map.jinja" import debian_release with context -%}
 {%- from "debian/apt/map.jinja" import osrelease with context -%}
+{%- from "debian/apt/map.jinja" import osmajorrelease with context -%}
 {%- from "debian/apt/map.jinja" import debian_mirror with context -%}
 {%- from "debian/apt/map.jinja" import loc_country with context -%}
 {%- from "debian/apt/map.jinja" import loc_provider with context -%}
@@ -74,6 +75,7 @@
     - defaults:
       debian_release: {{ debian_release }}
       debian_mirror: {{ debian_mirror }}
+      osmajorrelease: {{ osmajorrelease }}
 
 {%- endif %}
 

diff --git a/debian/apt/map.jinja b/debian/apt/map.jinja
index cc666c72fac6773c891a763a2904a8dae41f62fd..3bd9f6cf9a9da1df74651e529e5ae54e2f91d487 100644 (file)
--- a/debian/apt/map.jinja
+++ b/debian/apt/map.jinja
@@ -1,5 +1,6 @@
 {% set debian_release = salt['grains.get']('oscodename') %}
 {% set osrelease = salt['grains.get']('osrelease') %}
+{% set osmajorrelease = salt['grains.get']('osmajorrelease') %}
 
 {% set loc_country = salt['pillar.get']('location:country', 'de') %}
 {% set loc_provider = salt['pillar.get']('location:provider', 'profitbricks') %}