Merge remote-tracking branch 'origin/master' into next

This commit is contained in:
Arne Fitzenreiter
2015-10-25 09:21:12 +01:00
3 changed files with 9 additions and 6 deletions

View File

@@ -91,9 +91,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-e 's/^#\?LogLevel INFO .*$$/LogLevel INFO/' \
-e 's/^#\?AllowTcpForwarding .*$$/AllowTcpForwarding no/' \
-e 's/^#\?PermitRootLogin .*$$/PermitRootLogin yes/' \
-e 's|^#\?HostKey /etc/ssh/ssh_host_rsa_key$$|HostKey /etc/ssh/ssh_host_rsa_key|' \
-e 's|^#\?HostKey /etc/ssh/ssh_host_ecdsa_key$$|HostKey /etc/ssh/ssh_host_ecdsa_key|' \
-e 's|^#\?HostKey /etc/ssh/ssh_host_ed25519_key$$|HostKey /etc/ssh/ssh_host_ed25519_key|' \
-e 's|^#\?HostKey /etc/ssh/ssh_host_dsa_key$$||' \
-e 's|^#\?HostKey /etc/ssh/ssh_host_ecdsa_key$$||' \
-e 's|^#\?HostKey /etc/ssh/ssh_host_ed25519_key$$||' \
-e 's|^#\?HostKey /etc/ssh/ssh_host_rsa_key$$|HostKey /etc/ssh/ssh_host_ecdsa_key\nHostKey /etc/ssh/ssh_host_ed25519_key\nHostKey /etc/ssh/ssh_host_rsa_key|' \
/etc/ssh/sshd_config
@rm -rf $(DIR_APP)
@$(POSTBUILD)