fix: client install the ssh-agent client packages

The client should install the agent client packages and not the
opposite. The way it was, it would not be possible to include the agent
client packages to the ssh client, as it would create a recursive loop.

salt/ssh/install.sls

@@ -7,6 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}
 
 include:
+  - sys-ssh-agent.install-client
   - dotfiles.copy-x11
   - dotfiles.copy-ssh
 

salt/sys-ssh-agent/install-client.sls

@@ -7,7 +7,6 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}
 
 include:
-  - ssh.install
   - dev.home-cleanup
   - dotfiles.copy-sh
   - dotfiles.copy-ssh
@@ -23,14 +22,16 @@ include:
     - install_recommends: False
     - skip_suggestions: True
     - pkgs:
+      - qubes-core-agent-networking
+      - ca-certificates
       - socat
 
 {% set pkg = {
     'Debian': {
-      'pkg': ['procps'],
+      'pkg': ['procps', 'openssh-client'],
     },
     'RedHat': {
-      'pkg': ['procps-ng'],
+      'pkg': ['procps-ng', 'openssh-clients'],
     },
 }.get(grains.os_family) -%}
 

salt/sys-ssh-agent/install.sls

@@ -7,7 +7,6 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% if grains['nodename'] != 'dom0' -%}
 
 include:
-  - ssh.install
   - dev.home-cleanup
   - dotfiles.copy-sh
   - dotfiles.copy-ssh
@@ -23,8 +22,26 @@ include:
     - install_recommends: False
     - skip_suggestions: True
     - pkgs:
+      - qubes-core-agent-networking
+      - ca-certificates
       - socat
 
+{% set pkg = {
+    'Debian': {
+      'pkg': ['openssh-client'],
+    },
+    'RedHat': {
+      'pkg': ['openssh-clients'],
+    },
+}.get(grains.os_family) -%}
+
+"{{ slsdotpath }}-installed-os-specific":
+  pkg.installed:
+    - refresh: True
+    - install_recommends: False
+    - skip_suggestions: True
+    - pkgs: {{ pkg.pkg|sequence|yaml }}
+
 "{{ slsdotpath }}-agent-bin-dir":
   file.recurse:
     - source: salt://{{ slsdotpath }}/files/server/bin