Page MenuHomeDevCentral
Files F3817011

D1337.diff
No OneTemporary
Actions

D1337.diff
View Options

diff --git a/roles/bastion/sshd-otp/software.sls b/roles/bastion/sshd-otp/config.sls
rename from roles/bastion/sshd-otp/software.sls
rename to roles/bastion/sshd-otp/config.sls
--- a/roles/bastion/sshd-otp/software.sls
+++ b/roles/bastion/sshd-otp/config.sls
@@ -10,16 +10,6 @@
{% from "map.jinja" import paths, capabilities with context %}
-# -------------------------------------------------------------
-# OpenSSH binary symbolic link
-#
-# Allows to get 'sshd-otp' in the logs, instead of 'sshd
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-{{ paths.sshd }}-otp:
- file.symlink:
- - target: {{ paths.sshd }}
-
# -------------------------------------------------------------
# OpenSSH configuration — OTP
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/roles/bastion/sshd-otp/files/sshd.rc b/roles/bastion/sshd-otp/files/sshd.rc
--- a/roles/bastion/sshd-otp/files/sshd.rc
+++ b/roles/bastion/sshd-otp/files/sshd.rc
@@ -31,7 +31,7 @@
desc="Secure Shell Daemon (OTP)"
required_files="${sshd_config}"
-command="/usr/sbin/sshd-otp"
+command="/usr/sbin/sshd"
command_args="${sshd_otp_flags} -f ${sshd_config}"
pidfile="/var/run/${name}.pid"
diff --git a/roles/bastion/sshd-otp/init.sls b/roles/bastion/sshd-otp/init.sls
--- a/roles/bastion/sshd-otp/init.sls
+++ b/roles/bastion/sshd-otp/init.sls
@@ -9,5 +9,5 @@
# -------------------------------------------------------------
include:
- - .software
+ - .config
- .service
diff --git a/roles/bastion/sshd-otp/service.sls b/roles/bastion/sshd-otp/service.sls
--- a/roles/bastion/sshd-otp/service.sls
+++ b/roles/bastion/sshd-otp/service.sls
@@ -45,7 +45,7 @@
- mode: 755
- template: jinja
- context:
- executable: {{ paths.sshd }}-otp
+ executable: {{ paths.sshd }}
sshd_otp_running:
service.running:

File Metadata

Mime Type
text/plain
Expires
Tue, Dec 3, 09:05 (20 h, 29 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2277369
Default Alt Text
D1337.diff (1 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator