Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next-suricata

This commit is contained in:
Stefan Schantl
2019-01-26 12:40:04 +01:00
27 changed files with 1275 additions and 3011 deletions

View File

@@ -0,0 +1 @@
../../../common/ca-certificates

View File

@@ -3,3 +3,5 @@ etc/issue
srv/web/ipfire/cgi-bin/credits.cgi
var/ipfire/langs
etc/sysctl.conf
srv/web/ipfire/cgi-bin/proxy.cgi
usr/local/bin/xt_geoip_update

View File

@@ -0,0 +1 @@
../../../common/openssh

View File

@@ -0,0 +1 @@
../../../common/strongswan

View File

@@ -0,0 +1 @@
../../../common/tzdata

View File

@@ -51,6 +51,10 @@ ldconfig
sysctl -p
# Start services
if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
/etc/init.d/ipsec restart
fi
/etc/init.d/sshd restart
# Finish
/etc/init.d/fireinfo start