webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 11:13:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'kernel-4.14' into next

Browse Source
This commit is contained in:
Arne Fitzenreiter
2018-05-05 09:14:42 +02:00
parent 36d9e459c0 c800cec71f
commit 0d2cbbab85
160 changed files with 18541 additions and 44535 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
config/rootfiles/oldcore/120/update.sh
View File

@@ -83,15 +83,15 @@ done
/etc/init.d/apache restart
/etc/init.d/unbound restart
# Regenerate IPsec configuration
sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi
if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
/etc/init.d/ipsec restart
fi
# Remove deprecated SSH configuration option
sed -e "/UsePrivilegeSeparation/d" -i /etc/ssh/sshd_config
# Remove any pakfire keys stored in /
rm -rfv /.gnupg
# Move old pakfire keystore into new place
mv -v /root/.gnupg /opt/pakfire/etc/.gnupg
# Import new Pakfire key
/etc/init.d/pakfire start