Page Menu
Home
DevCentral
Search
Configure Global Search
Log In
Files
F3942589
D1337.id3431.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
1 KB
Referenced Files
None
Subscribers
None
D1337.id3431.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
Details
Attached
Mime Type
text/plain
Expires
Wed, Dec 25, 16:55 (8 h, 42 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2315278
Default Alt Text
D1337.id3431.diff (1 KB)
Attached To
Mode
D1337: Don't use a symlink for SSH server
Attached
Detach File
Event Timeline
Log In to Comment