Upgrade to Debian Buster; Removed SSMTP (due to Buster); Upgrade to salt-master 3001; New tree layout

data_example/salt/roots/base/file_roots/_modules/utils.py

@@ -0,0 +1,30 @@
+import ipaddress
+
+import typing
+
+
+def make_subnet(subnet):
+    network = ipaddress.IPv4Network(subnet)
+    return {
+        "address": str(network.network_address),
+        "with_prefix": network.with_prefixlen,
+        "prefix": network.prefixlen,
+        "with_netmask": network.with_netmask,
+        "netmask": str(network.netmask)
+    }
+
+
+def polyfill_field(data, field, value):
+    if isinstance(data, list):
+        for item in data:
+            if not field in item:
+                item[field] = value
+    elif isinstance(data, dict):
+        for item_name in data:
+            item = data[item_name]
+            if not field in item:
+                item[field] = value
+
+
+def polyfill_deleted(data):
+    polyfill_field(data, "deleted", False)

data_example/salt/roots/extmods/modules/utils.py

@@ -0,0 +1 @@
+../../base/file_roots/_modules/utils.py

docker-compose.yml

@@ -15,8 +15,6 @@ services:
         volumes:
             - ./data/salt/roots/:/data/salt/
             - ./data/salt/pki/:/etc/salt/pki/
-        env_file:
-            - env
 
 networks:
     salt.internal.docker:

env

@@ -1,4 +0,0 @@
-SSMTP_ROOT=root@rthoni.com
-SSMTP_MAILHUB=172.17.0.1:10025
-SSMTP_MAILDOMAIN=rthoni.com
-

salt/Dockerfile

@@ -1,25 +1,15 @@
-FROM debian:stretch
+FROM debian:buster
 
-ARG CONFIG_DIR=/etc/default/config-files/
+ARG SALT_VERSION=3001
 
 RUN apt-get update &&\
     apt-get install -y wget gnupg2 &&\
-    wget -O - https://repo.saltstack.com/py3/debian/9/amd64/latest/SALTSTACK-GPG-KEY.pub | apt-key add - &&\
-    echo 'deb http://repo.saltstack.com/py3/debian/9/amd64/latest stretch main' > /etc/apt/sources.list.d/saltstack.list &&\
+    wget -O - https://repo.saltstack.com/py3/debian/10/amd64/${SALT_VERSION}/SALTSTACK-GPG-KEY.pub | apt-key add - &&\
+    echo "deb http://repo.saltstack.com/py3/debian/10/amd64/${SALT_VERSION} buster main" > /etc/apt/sources.list.d/saltstack.list &&\
     apt-get update &&\
-    apt-get install -y ssmtp salt-master &&\
+    apt-get install -y salt-master &&\
     apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-COPY ./vars-vars /etc/vars-vars
+COPY ./config/master /etc/salt/master
 
-COPY ./vars-files /etc/vars-files
-
-COPY ./common.sh /common.sh
-
-COPY run.sh /run.sh
-
-RUN mkdir "${CONFIG_DIR}"
-
-COPY ./config "${CONFIG_DIR}"
-
-CMD ["/run.sh"]
+CMD ["salt-master"]

salt/common.sh

@@ -1,41 +0,0 @@
-export CONFIG_DIR="/etc/default/config-files/"
-
-resolv_host()
-{
-  hostname="${1}"
-  ip=$(getent hosts "${hostname}" | cut -d' ' -f1)
-  echo "${ip}"
-}
-
-replace_var()
-{
-  file="${1}"
-  var="${2}"
-  sed -e "s?${var}?${!var}?g" -i "${file}"
-}
-
-replace_vars()
-{
-  file="${1}"
-  for var in $(cat /etc/vars-vars)
-  do
-    replace_var "${file}" "${var}"
-  done
-}
-
-replace_files()
-{
-  cat /etc/vars-files | while read line
-  do
-    filesrc="${CONFIG_DIR}$(echo "${line}" | awk '{print $1}')"
-    filedst=$(echo "${line}" | awk '{print $2}')
-    if [ -f "${filesrc}" ]
-    then
-      echo "Expanding file ${filesrc} to ${filedst}"
-      cp "${filesrc}" "${filedst}"
-      replace_vars "${filedst}"
-    else
-      echo "File ${filesrc} does not exist. Skipping."
-    fi
-  done
-}

salt/config/master

@@ -61,7 +61,7 @@ interface: 0.0.0.0
 # each of Salt's module types such as "runners", "output", "wheel", "modules",
 # "states", "returners", "engines", "utils", etc.
 #extension_modules: /var/cache/salt/master/extmods
-extension_modules: /data/salt/modules
+extension_modules: /data/salt/extmods
 
 # Directory for custom modules. This directory can contain subdirectories for
 # each of Salt's module types such as "runners", "output", "wheel", "modules",
@@ -592,8 +592,8 @@ extension_modules: /data/salt/modules
 #  variable_end_string: '}}'
 #  comment_start_string: '{#'
 #  comment_end_string: '#}'
-#  line_statement_prefix: 
-#  line_comment_prefix: 
+#  line_statement_prefix:
+#  line_comment_prefix:
 #  trim_blocks: False
 #  lstrip_blocks: False
 #  newline_sequence: '\n'
@@ -607,8 +607,8 @@ extension_modules: /data/salt/modules
 #  variable_end_string: '}}'
 #  comment_start_string: '{#'
 #  comment_end_string: '#}'
-#  line_statement_prefix: 
-#  line_comment_prefix: 
+#  line_statement_prefix:
+#  line_comment_prefix:
 #  trim_blocks: False
 #  lstrip_blocks: False
 #  newline_sequence: '\n'
@@ -678,7 +678,7 @@ state_output: changes
 #
 file_roots:
   base:
-    - /data/salt/states/
+    - /data/salt/base/file_roots/
 
 # The master_roots setting configures a master-only copy of the file_roots dictionary,
 # used by the state compiler.
@@ -854,7 +854,7 @@ file_roots:
 #  - cmd_yaml: cat /etc/salt/yaml
 pillar_roots:
   base:
-    - /data/salt/pillar/
+    - /data/salt/base/pillar_roots/
 
 
 # A list of paths to be recursively decrypted during pillar compilation.

salt/config/ssmtp.conf

@@ -1,19 +0,0 @@
-# Configuartion file for sSMTP sendmail
-
-# The person who gets all mail for userids < 1000
-# Make this empty to disable rewriting.
-root=SSMTP_ROOT
-
-# We want to use this with an exim container. Link these
-# so that that container will be reachable as 'exim' in
-# this container.
-mailhub=SSMTP_MAILHUB
-
-# Where will the mail seem to come from?
-rewriteDomain=SSMTP_MAILDOMAIN
-
-# The full hostname
-#hostname=
-
-# Are users allowed to set their own From: address? (YES/NO)
-FromLineOverride=YES

salt/run.sh

@@ -1,7 +0,0 @@
-#! /usr/bin/env bash
-
-. /common.sh
-
-replace_files
-
-salt-master

salt/vars-files

@@ -1,2 +0,0 @@
-ssmtp.conf /etc/ssmtp/ssmtp.conf
-master /etc/salt/master

salt/vars-vars

@@ -1,5 +0,0 @@
-SSMTP_ROOT
-SSMTP_MAILHUB
-SSMTP_MAILDOMAIN
-
-NUT_ROOT_PASSWD

update_vars.sh

@@ -1,7 +0,0 @@
-#! /usr/bin/env sh
-
-vars=$(cat env | cut -d= -f1)
-for docker in salt
-do
-  echo "${vars}" > "./${docker}/vars-vars"
-done