summaryrefslogtreecommitdiff
path: root/playbooks.d
diff options
context:
space:
mode:
authorPatrick Spek <p.spek@tyil.nl>2023-06-28 23:38:09 +0200
committerPatrick Spek <p.spek@tyil.nl>2023-06-28 23:38:09 +0200
commit302f35b3b75b793d7a37cc30b5ca1364595d6fb8 (patch)
tree1257d36585301661d861fb8963558a5da6273e81 /playbooks.d
parent8289cfefb4d4cc1d14deb44d0ab9df77003baee3 (diff)
Fix ssh playbook for use with satpl
Diffstat (limited to 'playbooks.d')
-rw-r--r--playbooks.d/ssh/playbook.bash4
-rw-r--r--playbooks.d/ssh/share/motd.satpl (renamed from playbooks.d/ssh/share/motd)0
-rw-r--r--playbooks.d/ssh/share/sshd_config.satpl (renamed from playbooks.d/ssh/share/sshd_config.bpt)2
3 files changed, 3 insertions, 3 deletions
diff --git a/playbooks.d/ssh/playbook.bash b/playbooks.d/ssh/playbook.bash
index 066d099..66d5963 100644
--- a/playbooks.d/ssh/playbook.bash
+++ b/playbooks.d/ssh/playbook.bash
@@ -13,7 +13,7 @@ playbook_add() {
playbook_sync() {
info "$BASHTARD_PLAYBOOK" "Templating sshd_config"
- file_template "sshd_config.bpt" \
+ file_template "sshd_config.satpl" \
"sftp=$(config "ssh.sftp")" \
> /etc/ssh/sshd_config
@@ -26,7 +26,7 @@ playbook_sync() {
fi
info "$BASHTARD_PLAYBOOK" "Generating MotD"
- file_template "motd" \
+ file_template "motd.satpl" \
"fqdn=${BASHTARD_PLATFORM[fqdn]}" \
"time=$(date -u "+%FT%T")" \
> /etc/motd
diff --git a/playbooks.d/ssh/share/motd b/playbooks.d/ssh/share/motd.satpl
index 7fc4e34..7fc4e34 100644
--- a/playbooks.d/ssh/share/motd
+++ b/playbooks.d/ssh/share/motd.satpl
diff --git a/playbooks.d/ssh/share/sshd_config.bpt b/playbooks.d/ssh/share/sshd_config.satpl
index f1976a5..900ed34 100644
--- a/playbooks.d/ssh/share/sshd_config.bpt
+++ b/playbooks.d/ssh/share/sshd_config.satpl
@@ -8,7 +8,7 @@ ListenAddress ::
PrintMotd yes
# SFTP
-Subsystem sftp {{sftp}}
+Subsystem sftp ${sftp}
# Authentication
AuthorizedKeysFile /etc/ssh/authorized_keys .ssh/authorized_keys