summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Spek <p.spek@tyil.nl>2023-04-04 00:52:57 +0200
committerPatrick Spek <p.spek@tyil.nl>2023-04-04 00:53:05 +0200
commitfb7cad99b08d76ffb942075b95fb31ee76492383 (patch)
treea7288c080e17f0265898b591450c230186eb426d
parentaf9e4273fa91a96b3031dfa0d31e3b3bb023adfe (diff)
Update ssh playbook
-rw-r--r--playbooks.d/ssh/playbook.bash6
-rw-r--r--playbooks.d/ssh/share/notify.sh8
-rw-r--r--playbooks.d/ssh/share/sshd_config.bpt (renamed from playbooks.d/ssh/share/sshd_config)2
3 files changed, 2 insertions, 14 deletions
diff --git a/playbooks.d/ssh/playbook.bash b/playbooks.d/ssh/playbook.bash
index 0d70699..066d099 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" \
+ file_template "sshd_config.bpt" \
"sftp=$(config "ssh.sftp")" \
> /etc/ssh/sshd_config
@@ -31,10 +31,6 @@ playbook_sync() {
"time=$(date -u "+%FT%T")" \
> /etc/motd
- info "$BASHTARD_PLAYBOOK" "Installing notification script"
- file_template "notify.sh" \
- > /etc/ssh/notify.sh
-
[[ $BASHTARD_COMMAND == "add" ]] && return
svc reload "sshd"
diff --git a/playbooks.d/ssh/share/notify.sh b/playbooks.d/ssh/share/notify.sh
deleted file mode 100644
index 00e0b9f..0000000
--- a/playbooks.d/ssh/share/notify.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-if [ "$PAM_TYPE" != "open_session" ]
-then
- exit 0
-fi
-
-ntfy send "$PAM_USER@$(hostname -f)" "Login Succesful"
diff --git a/playbooks.d/ssh/share/sshd_config b/playbooks.d/ssh/share/sshd_config.bpt
index 900ed34..f1976a5 100644
--- a/playbooks.d/ssh/share/sshd_config
+++ b/playbooks.d/ssh/share/sshd_config.bpt
@@ -8,7 +8,7 @@ ListenAddress ::
PrintMotd yes
# SFTP
-Subsystem sftp ${sftp}
+Subsystem sftp {{sftp}}
# Authentication
AuthorizedKeysFile /etc/ssh/authorized_keys .ssh/authorized_keys