feat(TOFS): ssh sshd configs known_host and banner

Author: nb

docs/TOFS_pattern.rst

@@ -1,14 +1,21 @@
-{% from "openssh/map.jinja" import openssh with context %}
+{% set tplroot = tpldir.split('/')[0] %}
+{% from tplroot ~ "/map.jinja" import openssh with context %}
+{% from tplroot ~ "/libtofs.jinja" import files_switch %}
 
 include:
   - openssh
 
 sshd_banner:
   file.managed:
     - name: {{ openssh.banner }}
-    {% if openssh.banner_string is defined %}
+{% if openssh.banner_string is defined %}
     - contents: {{ openssh.banner_string | yaml }}
-    {% else %}
-    - source: {{ openssh.banner_src }}
+{% else %}
+    # Preserve backward compatibility
+    - source: {{ openssh.banner_src
+                 if '://' in openssh.banner_src
+                 else files_switch( [openssh.banner_src],
+                                    'sshd_banner_file_managed'
+              ) }}
     - template: jinja
-    {% endif %}
+{% endif %}

openssh/banner.sls

@@ -1,4 +1,7 @@
-{% from "openssh/map.jinja" import openssh, ssh_config, sshd_config with context %}
+{% set tplroot = tpldir.split('/')[0] %}
+{% from tplroot ~ "/map.jinja" import openssh, ssh_config, sshd_config with context %}
+{% from tplroot ~ "/libtofs.jinja" import files_switch %}
+
 
 include:
   - openssh
@@ -7,7 +10,12 @@ include:
 sshd_config:
   file.managed:
     - name: {{ openssh.sshd_config }}
-    - source: {{ openssh.sshd_config_src }}
+                  # Preserve backward compatibility
+    - source: {{ openssh.sshd_config_src
+                 if '://' in openssh.sshd_config_src
+                 else files_switch( [openssh.sshd_config_src],
+                                    'sshd_config_file_managed'
+              ) }}
     - template: jinja
     - user: {{ openssh.sshd_config_user }}
     - group: {{ openssh.sshd_config_group }}
@@ -24,7 +32,12 @@ sshd_config:
 ssh_config:
   file.managed:
     - name: {{ openssh.ssh_config }}
-    - source: {{ openssh.ssh_config_src }}
+              # Preserve backward compatibility
+    - source: {{ openssh.ssh_config_src
+                 if '://' in openssh.ssh_config_src
+                 else files_switch( [openssh.ssh_config_src],
+                                    'ssh_config_file_managed'
+              ) }}
     - template: jinja
     - user: {{ openssh.ssh_config_user }}
     - group: {{ openssh.ssh_config_group }}

openssh/config.sls

@@ -3,19 +3,19 @@ default:
     sshd_enable: True
     sshd_binary: /usr/sbin/sshd
     sshd_config: /etc/ssh/sshd_config
-    sshd_config_src: salt://openssh/files/sshd_config
+    sshd_config_src: sshd_config # Default TOFS source filename
     sshd_config_user: root
     sshd_config_group: root
     sshd_config_mode: '644'
     sshd_config_backup: True
     ssh_config: /etc/ssh/ssh_config
-    ssh_config_src: salt://openssh/files/ssh_config
+    ssh_config_src: ssh_config # Default TOFS source filename
     ssh_config_user: root
     ssh_config_group: root
     ssh_config_mode: '644'
     ssh_config_backup: True
     banner: /etc/ssh/banner
-    banner_src: salt://openssh/files/banner
+    banner_src: banner # Default TOFS source filename
     ssh_known_hosts: /etc/ssh/ssh_known_hosts
     dig_pkg: dnsutils
     ssh_moduli: /etc/ssh/moduli

openssh/defaults.yaml

@@ -1,4 +1,6 @@
-{% from "openssh/map.jinja" import openssh with context %}
+{% set tplroot = tpldir.split('/')[0] %}
+{% from tplroot ~ "/map.jinja" import openssh with context %}
+{% from tplroot ~ "/libtofs.jinja" import files_switch %}
 
 ensure dig is available:
   pkg.installed:
@@ -8,7 +10,9 @@ ensure dig is available:
 manage ssh_known_hosts file:
   file.managed:
     - name: {{ openssh.ssh_known_hosts }}
-    - source: salt://openssh/files/ssh_known_hosts
+    - source: {{ files_switch( ['ssh_known_hosts'],
+                               'ssh_known_hosts_file_managed'
+              ) }}
     - template: jinja
     - user: root
     - group: {{ openssh.ssh_config_group }}