drop httpscert and merge to apache initskript

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
This commit is contained in:
Arne Fitzenreiter
2017-10-22 15:50:38 +02:00
parent 0d6b6a219f
commit 9064ba72fe
6 changed files with 53 additions and 78 deletions

View File

@@ -3,6 +3,7 @@ etc/issue
etc/httpd/conf/vhosts.d/captive.conf
etc/httpd/conf/vhosts.d/ipfire-interface.conf
etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf
etc/rc.d/init.d/apache
etc/rc.d/init.d/firewall
srv/web/ipfire/cgi-bin/captive/index.cgi
srv/web/ipfire/cgi-bin/captive/logo.cgi
@@ -16,7 +17,6 @@ srv/web/ipfire/html/captive
usr/bin/captive-cleanup
usr/local/bin/backupiso
usr/local/bin/captivectrl
usr/local/bin/httpscert
usr/local/bin/wirelessctrl
var/ipfire/backup/include
var/ipfire/captive

View File

@@ -34,13 +34,14 @@ done
# Stop services
openvpnctrl -k
openvpnctrl -kn2n
/etc/rc.d/init.d/apache stop
# Extract files
extract_files
# Remove files
rm -vf \
/usr/local/bin/httpscert \
/srv/web/ipfire/html/dial.cgi
# update linker config
@@ -49,11 +50,8 @@ ldconfig
# Update Language cache
/usr/local/bin/update-lang-cache
# generate ECDSA key on existing installations to prevent Apache from crashing
/usr/local/bin/httpscert new
# Start services
/etc/rc.d/init.d/apache2 restart
/etc/rc.d/init.d/apache2 start
openvpnctrl -s
openvpnctrl -sn2n