projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove from-letsencrypt symlink from fileserver path
[mirror/dsa-puppet.git]
/
modules
/
ssh
/
templates
/
sshd_config.erb
diff --git
a/modules/ssh/templates/sshd_config.erb
b/modules/ssh/templates/sshd_config.erb
index
947a254
..
9b49f2f
100644
(file)
--- a/
modules/ssh/templates/sshd_config.erb
+++ b/
modules/ssh/templates/sshd_config.erb
@@
-8,7
+8,7
@@
# What ports, IPs and protocols we listen for
Port 22
# What ports, IPs and protocols we listen for
Port 22
-<%= extraports = case fqdn
+<%= extraports = case
@
fqdn
when "paradis.debian.org" then "
ListenAddress 0.0.0.0:22
ListenAddress [::]:22
when "paradis.debian.org" then "
ListenAddress 0.0.0.0:22
ListenAddress [::]:22
@@
-24,16
+24,12
@@
extraports
Protocol 2
# HostKeys for protocol version 2
HostKey /etc/ssh/ssh_host_rsa_key
Protocol 2
# HostKeys for protocol version 2
HostKey /etc/ssh/ssh_host_rsa_key
-<%- if has_variable?("has_etc_ssh_ssh_host_ed25519_key") &&
has_etc_ssh_ssh_host_ed25519_key == "true"
-%>
+<%- if has_variable?("has_etc_ssh_ssh_host_ed25519_key") &&
@has_etc_ssh_ssh_host_ed25519_key
-%>
HostKey /etc/ssh/ssh_host_ed25519_key
<% end %>
#Privilege Separation is turned on for security
UsePrivilegeSeparation yes
HostKey /etc/ssh/ssh_host_ed25519_key
<% end %>
#Privilege Separation is turned on for security
UsePrivilegeSeparation yes
-# Lifetime and size of ephemeral version 1 server key
-KeyRegenerationInterval 3600
-ServerKeyBits 1024
-
# Logging
SyslogFacility AUTH
LogLevel INFO
# Logging
SyslogFacility AUTH
LogLevel INFO
@@
-43,14
+39,11
@@
LoginGraceTime 120
PermitRootLogin without-password
StrictModes yes
PermitRootLogin without-password
StrictModes yes
-RSAAuthentication yes
PubkeyAuthentication yes
# Don't read the user's ~/.rhosts and ~/.shosts files
IgnoreRhosts yes
# For this to work you will also need host keys in /etc/ssh_known_hosts
PubkeyAuthentication yes
# Don't read the user's ~/.rhosts and ~/.shosts files
IgnoreRhosts yes
# For this to work you will also need host keys in /etc/ssh_known_hosts
-RhostsRSAAuthentication no
-# similar for protocol version 2
HostbasedAuthentication no
# Uncomment if you don't trust ~/.ssh/known_hosts for RhostsRSAAuthentication
#IgnoreUserKnownHosts yes
HostbasedAuthentication no
# Uncomment if you don't trust ~/.ssh/known_hosts for RhostsRSAAuthentication
#IgnoreUserKnownHosts yes
@@
-88,10
+81,13
@@
AcceptEnv LANG LC_*
Subsystem sftp /usr/lib/openssh/sftp-server
UsePAM yes
Subsystem sftp /usr/lib/openssh/sftp-server
UsePAM yes
-<% if %w{squeeze}.include?(scope.lookupvar('::lsbdistcodename')) %>
-AuthorizedKeysFile /etc/ssh/userkeys/%u
-AuthorizedKeysFile2 /var/lib/misc/userkeys/%u
-<% else %>
+
AuthorizedKeysFile /etc/ssh/userkeys/%u /var/lib/misc/userkeys/%u /etc/ssh/userkeys/%u.more
AuthorizedKeysFile /etc/ssh/userkeys/%u /var/lib/misc/userkeys/%u /etc/ssh/userkeys/%u.more
-<% end %>
+
PasswordAuthentication no
PasswordAuthentication no
+
+Match Group sftponly
+ AllowStreamLocalForwarding no
+ AllowTCPForwarding no
+ X11Forwarding no
+ ForceCommand internal-sftp