webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Arne Fitzenreiter
2015-10-25 09:21:12 +01:00
parent 038169b894 3a6784c065
commit a14e8d0256
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/oldcore/94/filelists/files
View File

@@ -22,5 +22,6 @@ srv/web/ipfire/cgi-bin/vpnmain.cgi
srv/web/ipfire/cgi-bin/wakeonlan.cgi
srv/web/ipfire/cgi-bin/wireless.cgi
var/ipfire/langs
var/ipfire/menu.d/10-system.menu
var/ipfire/menu.d/40-services.menu
var/ipfire/network-functions.pl

7
config/rootfiles/oldcore/94/update.sh
View File

@@ -48,9 +48,10 @@ telinit u
# Update SSH configuration
sed -i /etc/ssh/sshd_config \
-e 's/^#PermitRootLogin yes$/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|' \
# Move away old and unsupported keys
mv -f /etc/ssh/ssh_host_dsa_key{,.old}

7
lfs/openssh
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)