diff --git a/salt/sys-net/files/server/rpc/qusal.ConnectTCP b/salt/sys-net/files/server/rpc/qusal.ConnectTCP index 4e97658d..835055c5 100755 --- a/salt/sys-net/files/server/rpc/qusal.ConnectTCP +++ b/salt/sys-net/files/server/rpc/qusal.ConnectTCP @@ -34,4 +34,4 @@ if test "${#port}" -gt 5 || test "${port}" -gt 65535; then exit 1 fi -exec socat - "TCP:${host}:${port}" +exec socat STDIO "TCP:${host}:${port}" diff --git a/salt/sys-print/files/server/rpc/qusal.Print b/salt/sys-print/files/server/rpc/qusal.Print deleted file mode 100644 index 7ffca48a..00000000 --- a/salt/sys-print/files/server/rpc/qusal.Print +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -# SPDX-FileCopyrightText: 2023 unman -# -# SPDX-License-Identifier: AGPL-3.0-or-later - -set -eu -exec socat STDIO TCP:localhost:631 diff --git a/salt/sys-print/install-client.sls b/salt/sys-print/install-client.sls index c3e0ee24..3efc697b 100644 --- a/salt/sys-print/install-client.sls +++ b/salt/sys-print/install-client.sls @@ -5,6 +5,15 @@ SPDX-FileCopyrightText: 2024 Benjamin Grande M. S. SPDX-License-Identifier: AGPL-3.0-or-later #} +"{{ slsdotpath }}-installed-client": + pkg.installed: + - require: + - sls: utils.tools.common.update + - install_recommends: False + - skip_suggestions: True + - pkgs: + - socat + "{{ slsdotpath }}-client-systemd-print-forwarder": file.managed: - name: /usr/lib/systemd/system/qusal-print-forwarder.service diff --git a/salt/sys-print/install.sls b/salt/sys-print/install.sls index efeb6666..0a09f8e3 100644 --- a/salt/sys-print/install.sls +++ b/salt/sys-print/install.sls @@ -43,12 +43,21 @@ include: - user "{{ slsdotpath }}-rpc": - file.managed: + file.symlink: - name: /etc/qubes-rpc/qusal.Print - - source: salt://{{ slsdotpath }}/files/server/rpc/qusal.Print - - mode: '0755' + - target: /dev/tcp/127.0.0.1/631 + - user: root + - group: root + - force: True + - makedirs: True + +"{{ slsdotpath }}-rpc-config": + file.symlink: + - name: /etc/qubes/rpc-config/qusal.Print + - target: /etc/qubes/rpc-config/qubes.ConnectTCP - user: root - group: root + - force: True - makedirs: True "{{ slsdotpath }}-bind-dirs": diff --git a/salt/sys-rsync/files/server/rpc/qusal.Rsync b/salt/sys-rsync/files/server/rpc/qusal.Rsync deleted file mode 100755 index 7b413b28..00000000 --- a/salt/sys-rsync/files/server/rpc/qusal.Rsync +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -# SPDX-FileCopyrightText: 2022 unman -# -# SPDX-License-Identifier: AGPL-3.0-or-later - -set -eu - -exec socat STDIO TCP:localhost:873 diff --git a/salt/sys-rsync/install.sls b/salt/sys-rsync/install.sls index b5927761..69200b38 100644 --- a/salt/sys-rsync/install.sls +++ b/salt/sys-rsync/install.sls @@ -18,7 +18,6 @@ include: - skip_suggestions: True - pkgs: - rsync - - socat - man-db "{{ slsdotpath }}-stop-rsync": @@ -42,14 +41,22 @@ include: - group: root - makedirs: True -"{{ slsdotpath }}-set-rpc-services": - file.recurse: - - name: /etc/qubes-rpc/ - - source: salt://{{ slsdotpath }}/files/server/rpc/ - - dir_mode: '0755' - - file_mode: '0755' +"{{ slsdotpath }}-rpc": + file.symlink: + - name: /etc/qubes-rpc/qusal.Rsync + - target: /dev/tcp/127.0.0.1/873 - user: root - group: root + - force: True + - makedirs: True + +"{{ slsdotpath }}-rpc-config": + file.symlink: + - name: /etc/qubes/rpc-config/qusal.Rsync + - target: /etc/qubes/rpc-config/qubes.ConnectTCP + - user: root + - group: root + - force: True - makedirs: True {% endif -%} diff --git a/salt/sys-ssh/files/server/rpc/qusal.Ssh b/salt/sys-ssh/files/server/rpc/qusal.Ssh deleted file mode 100755 index 78bb259c..00000000 --- a/salt/sys-ssh/files/server/rpc/qusal.Ssh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -# SPDX-FileCopyrightText: 2022 unman -# -# SPDX-License-Identifier: AGPL-3.0-or-later - -set -eu - -exec socat STDIO TCP:localhost:22 diff --git a/salt/sys-ssh/install.sls b/salt/sys-ssh/install.sls index 234f20f0..1d06d713 100644 --- a/salt/sys-ssh/install.sls +++ b/salt/sys-ssh/install.sls @@ -18,7 +18,6 @@ include: - skip_suggestions: True - pkgs: - openssh-server - - socat - man-db "{{ slsdotpath }}-stop-ssh": @@ -33,14 +32,22 @@ include: service.masked: - name: ssh -"{{ slsdotpath }}-set-rpc-services": - file.recurse: - - name: /etc/qubes-rpc/ - - source: salt://{{ slsdotpath }}/files/server/rpc/ - - dir_mode: '0755' - - file_mode: '0755' +"{{ slsdotpath }}-rpc": + file.symlink: + - name: /etc/qubes-rpc/qusal.Ssh + - target: /dev/tcp/127.0.0.1/22 - user: root - group: root + - force: True + - makedirs: True + +"{{ slsdotpath }}-rpc-config": + file.symlink: + - name: /etc/qubes/rpc-config/qusal.Ssh + - target: /etc/qubes/rpc-config/qubes.ConnectTCP + - user: root + - group: root + - force: True - makedirs: True "{{ slsdotpath }}-sshd-config": diff --git a/salt/sys-syncthing/files/server/rpc/qusal.Syncthing b/salt/sys-syncthing/files/server/rpc/qusal.Syncthing deleted file mode 100644 index 605a0f1e..00000000 --- a/salt/sys-syncthing/files/server/rpc/qusal.Syncthing +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -# SPDX-FileCopyrightText: 2022 unman -# -# SPDX-License-Identifier: AGPL-3.0-or-later - -set -eu - -exec socat STDIO TCP:localhost:22000 diff --git a/salt/sys-syncthing/install.sls b/salt/sys-syncthing/install.sls index 366fdff9..5f8d4d28 100644 --- a/salt/sys-syncthing/install.sls +++ b/salt/sys-syncthing/install.sls @@ -26,18 +26,26 @@ include: - qubes-core-agent-networking - syncthing - jq - - socat - qubes-core-agent-thunar - thunar - man-db -"{{ slsdotpath }}-rpc-service": - file.managed: +"{{ slsdotpath }}-rpc": + file.symlink: - name: /etc/qubes-rpc/qusal.Syncthing - - source: salt://{{ slsdotpath }}/files/server/rpc/qusal.Syncthing + - target: /dev/tcp/127.0.0.1/22000 + - user: root + - group: root + - force: True + - makedirs: True + +"{{ slsdotpath }}-rpc-config": + file.symlink: + - name: /etc/qubes/rpc-config/qusal.Syncthing + - target: /etc/qubes/rpc-config/qubes.ConnectTCP - user: root - group: root - - mode: '0755' + - force: True - makedirs: True "{{ slsdotpath }}-mask-syncthing":