Current state after adding lena

diff --git a/basic/chrony.sls b/basic/chrony.sls
index 0aa11a9232c540eb26025b7d32874403ed04eaa4..64a4a147f602536c84060bc796915e1f277a3f5c 100644 (file)
--- a/basic/chrony.sls
+++ b/basic/chrony.sls
@@ -1,3 +1,5 @@
+{%- from "debian/apt/map.jinja" import debian_release with context -%}
+{%- from "debian/apt/map.jinja" import osrelease with context -%}
 
 chrony:
   pkg:
@@ -77,6 +79,8 @@ chrony-logswitch-script-parent:
     - source: salt://basic/files/chrony.logrotate
     - template: jinja
     - backup: minion
+    - defaults:
+      debian_release: {{ debian_release }}
     - onlyif:
       - test -d /etc/logrotate.d
     - require:

diff --git a/basic/editors.sls b/basic/editors.sls
index 8acdecfe4dc7427b201db12c3282d32d24949711..b5940da53752fc9ba2238d36c4ec70d233cf0ed8 100644 (file)
--- a/basic/editors.sls
+++ b/basic/editors.sls
@@ -1,3 +1,6 @@
+{%- from "debian/apt/map.jinja" import debian_release with context -%}
+{%- from "debian/apt/map.jinja" import osrelease with context -%}
+
 vim:
   pkg.installed:
     - name: vim
@@ -9,6 +12,11 @@ vimrc:
     - mode: 644
     - user: root
     - group: root
+    - template: jinja
+    - backup: minion
+    - defaults:
+      debian_release: {{ debian_release }}
+      osrelease: {{ osrelease }}
     - require:
       - pkg: vim
 

diff --git a/basic/files/chrony.logrotate b/basic/files/chrony.logrotate
index 355118eaeadfa53abcc01533b31e31d518db971d..5f0154e2ad67ce90e0737f446829081e9ae52670 100644 (file)
--- a/basic/files/chrony.logrotate
+++ b/basic/files/chrony.logrotate
@@ -10,6 +10,10 @@
        sharedscripts
        create 644
        postrotate
+{%- if debian_release == 'stretch' %}
+               /usr/bin/chronyc cyclelogs > /dev/null 2>&1 || true
+{%- else %}
                /usr/bin/chronyc -a cyclelogs > /dev/null 2>&1 || true
+{%- endif %}
        endscript
 }

diff --git a/basic/files/fbrehm.sh b/basic/files/fbrehm.sh
index e5dc469e2c82489a981fadbfb08c246d00a91470..0ffd1955fabfb267060acf2e217b1538900759bf 100644 (file)
--- a/basic/files/fbrehm.sh
+++ b/basic/files/fbrehm.sh
@@ -12,9 +12,13 @@ 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'
 export GREP_COLOR='1;32'
+{%- endif %}
+
 # hold these special chars when piping to less
 export LESS="--RAW-CONTROL-CHARS"
 
@@ -124,6 +128,33 @@ if [[ -f ~/.bash_aliases ]]; then
     . ~/.bash_aliases
 fi
 
+if [ -d /usr/scripts ] ; then
+    PATH=/usr/scripts:$PATH
+    export PATH
+fi
+
+if [ -d $HOME/bin ] ; then
+    PATH=$PATH:$HOME/bin
+    export PATH
+fi
+
+if [[ -d "$HOME/lib" ]] ; then
+    if [[ -d "$HOME/lib/perl" ]] ; then
+        if [[ -z "${PERL5LIB}" ]] ; then
+            export PERL5LIB="$HOME/lib/perl"
+        else
+            export PERL5LIB="$HOME/lib/perl:${PERL5LIB}"
+        fi
+    fi
+    if [[ -d "$HOME/lib/python" ]] ; then
+        if [[ -z "${PYTHONPATH}" ]] ; then
+            export PYTHONPATH="$HOME/lib/python"
+        else
+            export PYTHONPATH="$HOME/lib/python:${PYTHONPATH}"
+        fi
+    fi
+fi
+
 # enable bash completion in interactive shells
 if ! shopt -oq posix; then
   if [[ -f /usr/share/bash-completion/bash_completion ]]; then

diff --git a/basic/files/logrotate.conf b/basic/files/logrotate.conf
index 7b4922a95581c56d55257af25897ca23b1218f1b..4eb82857866aa7c0310be0b67f5437c8649283cf 100644 (file)
--- a/basic/files/logrotate.conf
+++ b/basic/files/logrotate.conf
@@ -22,7 +22,7 @@ include /etc/logrotate.d
     create 0664 root utmp
     rotate 12
     dateext
-    dateformat -%Y-%m--%d
+    dateformat -%Y-%m-%d
     size 4M
 }
 
@@ -32,7 +32,7 @@ include /etc/logrotate.d
     create 0660 root utmp
     rotate 12
     dateext
-    dateformat -%Y-%m--%d
+    dateformat -%Y-%m-%d
     size 4M
 }
 

diff --git a/basic/files/rsyslog.60-default.conf b/basic/files/rsyslog.60-default.conf
index 84d8d52efee79726e1d6d6aa6ed473b050f5cfa1..fc3858c85a445f18d45c5f8fdb4092ea3a166a93 100644 (file)
--- a/basic/files/rsyslog.60-default.conf
+++ b/basic/files/rsyslog.60-default.conf
@@ -15,12 +15,21 @@
 # Uncomment the following directive to re-enable the
 # deprecated "/var/log/syslog" log file (don't forget to re-enable log
 # rotation in "/etc/logrotate.d/rsyslog" if you do that!)
+{%- if is_postfix_satellite %}
 #*.*;auth,authpriv.none,mail.none action(
 #        type="omfile"
 #        File="/var/log/syslog"
 #        FileOwner="root"
 #        FileGroup="adm"
 #)
+{%- else %}
+*.*;auth,authpriv.none,mail.none action(
+        type="omfile"
+        File="/var/log/syslog"
+        FileOwner="root"
+        FileGroup="adm"
+)
+{%- endif %}
 
 *.emerg action(
         type="omusrmsg"

diff --git a/basic/files/rsyslog.conf b/basic/files/rsyslog.conf
index 79670fa37f2a8826a95f2156f3b3ce0143861c7a..523130150831234e71732e6156d0c50bcbebef9f 100644 (file)
--- a/basic/files/rsyslog.conf
+++ b/basic/files/rsyslog.conf
@@ -9,19 +9,36 @@ $AbortOnUncleanConfig on
 #################
 #### MODULES ####
 #################
+{%- if debian_release == "stretch" %}
+
+module(load="imuxsock") # provides support for local system logging
+module(load="imklog")   # provides kernel logging support
+#module(load="immark")  # provides --MARK-- message capability
+{%- else %}
 
 $ModLoad imuxsock # provides support for local system logging
 $ModLoad imklog   # provides kernel logging support
 #$ModLoad immark  # provides --MARK-- message capability
+{%- endif %}
 module(load="immark" Interval="3600")
 
 # provides UDP syslog reception
+{%- if debian_release == "stretch" %}
+#module(load="imudp")
+#input(type="imudp" port="514")
+{%- else %}
 #$ModLoad imudp
 #$UDPServerRun 514
+{%- endif %}
 
 # provides TCP syslog reception
+{%- if debian_release == "stretch" %}
+#module(load="imtcp")
+#input(type="imtcp" port="514")
+{%- else %}
 #$ModLoad imtcp
 #$InputTCPServerRun 514
+{%- endif %}
 
 
 ###########################
@@ -49,6 +66,7 @@ $FileGroup adm
 $FileCreateMode 0640
 $DirCreateMode 0755
 $Umask 0022
+{%- if debian_release != "stretch" %}
 
 module(
         load="builtin:omfile"
@@ -60,6 +78,7 @@ module(
         dirOwnerNum="0"
         dirGroupNum="0"
 )
+{%- endif %}
 
 #
 # Where to place spool and state files
@@ -118,6 +137,7 @@ $IncludeConfig /etc/rsyslog.d/*.conf
 # Emergencies are sent to everybody logged in.
 #
 *.emerg                                :omusrmsg:*
+{%- if debian_release != "stretch" %}
 
 #
 # I like to have messages displayed on the console, but only on a virtual
@@ -140,3 +160,4 @@ daemon.*;mail.*;\
        news.err;\
        *.=debug;*.=info;\
        *.=notice;*.=warn       |/dev/xconsole
+{%- endif %}

diff --git a/basic/files/vimrc b/basic/files/vimrc
index c37139daf3b09f79a473a0d33a0118fe2448a856..b735804c705c3ba809eadcdaca948c47872e2a4f 100644 (file)
--- a/basic/files/vimrc
+++ b/basic/files/vimrc
@@ -2,8 +2,17 @@ set noai
 set nohlsearch
 set fo="tcq"
 set modeline
-set showmatch
-set ignorecase
+
+set showcmd             " Show (partial) command in status line.
+set showmatch           " Show matching brackets.
+set ignorecase          " Do case insensitive matching
+set smartcase           " Do smart case matching
+set incsearch           " Incremental search
+set autowrite           " Automatically save before commands like :next and :make
+set hidden              " Hide buffers when they are abandoned
+{%- if debian_release == 'stretch' %}
+set mouse=              " Disable mouse usage (all modes)
+{%- endif %}
 
 autocmd FileType sls set tabstop=2 expandtab shiftwidth=2 softtabstop=2
 autocmd FileType python set tabstop=4 expandtab shiftwidth=4 softtabstop=4
@@ -14,10 +23,10 @@ set listchars=tab:»·,trail:·
 " set list
 
 if has("multi_byte")
-       set encoding=utf-8
-       setglobal fileencoding=utf-8
+        set encoding=utf-8
+        setglobal fileencoding=utf-8
 else
-       echoerr "Sorry, this version of (g)vim was not compiled with +multi_byte"
+        echoerr "Sorry, this version of (g)vim was not compiled with +multi_byte"
 endif
 
 if has("autocmd")
@@ -28,6 +37,7 @@ if has("autocmd")
         \         exe "normal g'\"" |
         \     endif |
         \ endif
+        filetype plugin indent off
 endif " has("autocmd")
 
 

diff --git a/basic/rsyslog.sls b/basic/rsyslog.sls
index 5ec5e594bb4507a545a119c0157205be3c964ac0..6db42f9e68fe0ffc2e6b3dc06de6a26d1e80856b 100644 (file)
--- a/basic/rsyslog.sls
+++ b/basic/rsyslog.sls
@@ -1,3 +1,6 @@
+{%- from "debian/apt/map.jinja" import debian_release with context -%}
+{%- from "debian/apt/map.jinja" import osrelease with context -%}
+{%- set is_postfix_satellite = salt['pillar.get']('postfix:is_satellite', True) %}
 
 rsyslog:
   pkg:
@@ -17,7 +20,10 @@ rsyslog:
     - group: root
     - mode: 644
     - source: salt://basic/files/rsyslog.conf
+    - template: jinja
     - backup: minion
+    - defaults:
+      debian_release: {{ debian_release }}
     - require:
       - pkg: rsyslog
 
@@ -39,7 +45,10 @@ rsyslog:
     - group: root
     - mode: 644
     - source: salt://basic/files/rsyslog.60-default.conf
+    - template: jinja
     - backup: minion
+    - defaults:
+      is_postfix_satellite: {{ is_postfix_satellite }}
     - require:
       - pkg: rsyslog
       - file: /etc/rsyslog.d

diff --git a/basic/shells.sls b/basic/shells.sls
index 2b097562e9d40ed6ee5a447785e5c1d63aa321a4..69f4dea76c9e97899f12eebbfcbd3340250e3b47 100644 (file)
--- a/basic/shells.sls
+++ b/basic/shells.sls
@@ -1,3 +1,6 @@
+{%- from "debian/apt/map.jinja" import debian_release with context -%}
+{%- from "debian/apt/map.jinja" import osrelease with context -%}
+
 bash:
     pkg.installed
 
@@ -20,5 +23,9 @@ inputrc-history-search-forward:
     - group: root
     - mode: 644
     - source: salt://basic/files/fbrehm.sh
+    - template: jinja
     - backup: minion
+    - defaults:
+      debian_release: {{ debian_release }}
+      osrelease: {{ osrelease }}
 

diff --git a/debian/apt/files/logrotate-apt.conf b/debian/apt/files/logrotate-apt.conf
index 493f803cd3745f65d6aa2b6af1d5122005ee626d..d22ba7262d9f6b2c81599e3788226817a40f16c3 100644 (file)
--- a/debian/apt/files/logrotate-apt.conf
+++ b/debian/apt/files/logrotate-apt.conf
@@ -7,7 +7,7 @@
     size 1M
     delaycompress
     dateext
-    dateformat -%Y-%m--%d
+    dateformat -%Y-%m-%d
 }
 
 /var/log/apt/history.log {
@@ -19,7 +19,7 @@
     size 1M
     delaycompress
     dateext
-    dateformat -%Y-%m--%d
+    dateformat -%Y-%m-%d
 }
 
 # vim: ts=4 filetype=conf et

diff --git a/debian/apt/files/logrotate-aptitude.conf b/debian/apt/files/logrotate-aptitude.conf
index eca273fe3c8d44a4d98a802904f8b02c80e419a8..369f333470194581e1983b8cab440fa273ff4ea7 100644 (file)
--- a/debian/apt/files/logrotate-aptitude.conf
+++ b/debian/apt/files/logrotate-aptitude.conf
@@ -7,7 +7,7 @@
     size 1M
     delaycompress
     dateext
-    dateformat -%Y-%m--%d
+    dateformat -%Y-%m-%d
     olddir /var/log/.old
 }
 

diff --git a/debian/apt/files/logrotate-dpkg.conf b/debian/apt/files/logrotate-dpkg.conf
index e7adf67c488656d8b9eb31be1e8c34946f6e5b77..ee0d3e41906da354e120d6e153183587aa7ea038 100644 (file)
--- a/debian/apt/files/logrotate-dpkg.conf
+++ b/debian/apt/files/logrotate-dpkg.conf
@@ -8,7 +8,7 @@
     size 1M
     create 644 root root
     dateext
-    dateformat -%Y-%m--%d
+    dateformat -%Y-%m-%d
     olddir /var/log/.old
 }
 
@@ -22,7 +22,7 @@
     size 1M
     create 644 root root
     dateext
-    dateformat -%Y-%m--%d
+    dateformat -%Y-%m-%d
     olddir /var/log/.old
 }
 

diff --git a/debian/apt/files/sources.list b/debian/apt/files/sources.list
index 7eca748b2903e90ecdd2a04326a204496244f3c5..103d3d923aa1ab318bcbbc03571852ae68315dc9 100644 (file)
--- a/debian/apt/files/sources.list
+++ b/debian/apt/files/sources.list
@@ -1,6 +1,10 @@
 {%- if loc_provider == 'hetzner' -%}
 deb    http://mirror.hetzner.de/debian/packages        {{ debian_release }}            main contrib non-free
 deb    http://mirror.hetzner.de/debian/security        {{ debian_release }}/updates    main contrib non-free
+{% elif debian_release == 'stretch' -%}
+#
+
+# deb cdrom:[Debian GNU/Linux stretch-DI-alpha7 _Stretch_ - Official Snapshot amd64 NETINST Binary-1 20160630-14:29]/ stretch main
 
 {% endif -%}
 
@@ -18,8 +22,12 @@ deb-src      http://security.debian.org/     {{ debian_release }}/updates    main contrib no
 deb    http://{{ debian_mirror }}/debian       {{ debian_release }}-updates    main contrib non-free
 deb-src        http://{{ debian_mirror }}/debian       {{ debian_release }}-updates    main contrib non-free
 
+{%- if osrelease != 'testing' %}
+
 # {{ debian_release }}-backports, previously on backports.debian.org
 deb    http://{{ debian_mirror }}/debian/      {{ debian_release }}-backports  main contrib non-free
 deb-src        http://{{ debian_mirror }}/debian/      {{ debian_release }}-backports  main contrib non-free
 
+{%- endif %}
+
 # vim: noet ts=8

diff --git a/debian/apt/init.sls b/debian/apt/init.sls
index 6cdc4c1fb06dd9191f88785b9dc60dc9779ab671..6272a9b9adf1fa5a3bddd32645e5c37b271fec4d 100644 (file)
--- a/debian/apt/init.sls
+++ b/debian/apt/init.sls
@@ -1,4 +1,5 @@
 {%- 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 debian_mirror with context -%}
 {%- from "debian/apt/map.jinja" import loc_country with context -%}
 {%- from "debian/apt/map.jinja" import loc_provider with context -%}
@@ -50,6 +51,7 @@
       loc_country: {{ loc_country }}
       loc_provider: {{ loc_provider }}
       loc_dc: {{ loc_dc }}
+      osrelease: {{ osrelease }}
 
 /etc/apt/sources.list.d:
   file.directory:
@@ -57,6 +59,8 @@
     - group: root
     - dir_mode: 755
 
+{%- if osrelease != 'testing' %}
+
 /etc/apt/sources.list.d/salt.list:
   file.managed:
     - user: root
@@ -71,6 +75,8 @@
       debian_release: {{ debian_release }}
       debian_mirror: {{ debian_mirror }}
 
+{%- endif %}
+
 /etc/apt/sources.list.d/fbrehm.list:
   file.managed:
     - user: root

diff --git a/debian/apt/map.jinja b/debian/apt/map.jinja
index 1945f039ee2a956db48536ad3e4f11fff5598f3f..1a9685812f4420297c9441fa54a609a14ca295c9 100644 (file)
--- a/debian/apt/map.jinja
+++ b/debian/apt/map.jinja
@@ -1,8 +1,5 @@
-{% if salt['grains.get']('osrelease')|int >= 8 %}
-    {% set debian_release = 'jessie' %}
-{% elif salt['grains.get']('osrelease')|int >= 7 %}
-    {% set debian_release = 'wheezy' %}
-{% endif %}
+{% set debian_release = salt['grains.get']('oscodename') %}
+{% set osrelease = salt['grains.get']('osrelease') %}
 
 {% set loc_country = salt['pillar.get']('location:country', 'de') %}
 {% set loc_provider = salt['pillar.get']('location:provider', 'profitbricks') %}

diff --git a/top.sls b/top.sls
index dc1f45369d117f914700b7b70d6d9198fc20112a..9c03a2508d9ca2afc811c0d379d2e95d95f5a30c 100644 (file)
--- a/top.sls
+++ b/top.sls
@@ -16,7 +16,7 @@ base:
     - basic.root
     - utils.root
     - postfix.common
-    - apache
+    - apache2
     - fail2ban
     - bind
 
@@ -53,3 +53,16 @@ base:
     - basic.chrony
     - basic.non_container_pkgs
 
+  '*.home.brehm-online.com':
+    - debian.apt
+    - basic.editors
+    - basic.localization
+    - basic.logrotate
+    - basic.pkgs
+    - basic.non_container_pkgs
+    - basic.chrony
+    - basic.rsyslog
+    - basic.shells
+    - basic.skel
+    - basic.root
+    - utils.root