pillar/formulas.yaml

@@ -1,4 +1,3 @@
 - postfix
 - salt
 - users
-- openssh

pillar/global/init.sls

@@ -2,7 +2,6 @@ include:
   - role.salt.common
   - role.salt.minion
   - .mta
-  - .ssh
 
 managed_header_pound: |
   ### This file is managed via https://git.com.de/LibertaCasa/salt

pillar/global/macros.jinja

@@ -1,17 +0,0 @@
-{%- macro listeners() -%}
-{%- set listen_ips = [] -%}
-{%- set legal6s = ('fd29', '2a01:4f8:11e:2200') -%}
-{%- for ip in salt['network.ip_addrs']() -%}
-{%- if salt['network.is_private'](ip) -%}
-{%- do listen_ips.append(ip) -%}
-{%- endif -%}
-{%- endfor -%}
-{%- for ip in salt['network.ip_addrs6']() -%}
-{%- if ip.startswith(legal6s) -%}
-{%- do listen_ips.append(ip) -%}
-{%- endif -%}
-{%- endfor -%}
-{%- for ip in listen_ips %}
-- {{ ip }}
-{%- endfor %}
-{%- endmacro -%}

pillar/global/ssh.sls

@@ -1,31 +0,0 @@
-{%- from slspath ~ '/../global/macros.jinja' import listeners -%}
-{#-
-{%- from '/tmp/salt-libertacasa/pillar/global/macros.jinja' import listeners with context -%}
-#}
-{%- set host = grains['host'] -%}
-
-sshd_config:
-  ConfigBanner: |
-    ### This file is managed via https://git.com.de/LibertaCasa/salt
-    ### Manual changes will be overwritten
-  ListenAddress: {{ listeners() | indent }}
-  Protocol: 2
-  SyslogFacility: AUTH
-  LogLevel: FATAL
-  HostKey:
-    - /etc/ssh/{{ host }}
-  HostKeyAlgorithms: ssh-ed25519-cert-v01@openssh.com
-  HostCertificate: /etc/ssh/{{ host }}-cert.pub
-  TrustedUserCAKeys: /etc/ssh/user_ca
-  PasswordAuthentication: 'no'
-  LoginGraceTime: 1m
-  PermitRootLogin: 'no'
-  StrictModes: 'yes'
-  MaxAuthTries: 1
-  MaxSessions: 3
-  UsePAM: 'yes'
-  X11Forwarding: 'no'
-  PrintMotd: 'yes'
-  PrintLastLog: 'yes'
-  Subsystem: sftp /usr/lib/ssh/sftp-server
-

salt/common/ssh.sls

@@ -1,12 +0,0 @@
-include:
-  - openssh.banner
-  - openssh.config
-
-/etc/ssh/user_ca:
-  file.managed:
-    - contents:
-      {%- for key in salt['pillar.get']('secret_ssh:userca_keys') -%}
-      - {{ key }}
-      {%- endfor -%}
-    - require:
-      - pkg: openssh

salt/common/suse.sls

@@ -3,7 +3,7 @@ include:
   - profile.zypp
   - profile.node_exporter
   - users
-  - .ssh
+  - postfix
   - postfix.config
 
 {#- to-do: move this to some formula or macro -#}