piratebox-mirror
/
PirateBoxScripts_Webserver
mirror of https://github.com/PirateBox-Dev/PirateBoxScripts_Webserver.git
2
1
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/hotfix-1.1.4' into development

This commit is contained in:
Matthias Strubel 2017-06-30 09:48:03 +02:00
parent b782fd944e b79e0870e6
commit 795a7e0142
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -7,6 +7,8 @@ CHANGELOG
* [Fix] lang-de ; fix grammar
* [Fix] [RPi] Fix wrong path in wifi client helper script
* [Fix] initd: minircd startup fix setuid
* [Fix] initd: Fix radvd path to an absolute path
* [Fix] WWW-Content, fix a syntax error which broke jQuery
=== 1.1.3 ===
* [New] Translation bt-pr

1
piratebox/piratebox/conf/lighttpd/lighttpd.conf
View File

@ -73,7 +73,6 @@ setenv.add-response-header += ( "Cache-Control" => "max-age=60, must-revalidate,
# 404 Error Page with redirect
include "/opt/piratebox/conf/lighttpd/all-redirect.conf"
=======
## for better debugging
#server.modules += ( "mod_accesslog" )

2
piratebox/piratebox/init.d/piratebox
View File

@ -157,7 +157,7 @@ case "$1" in
if [ "$IPV6_ENABLE" = "yes" ] && [ "$IPV6_ADVERT" = "radvd" ] ; then
log_daemon_msg "Starting radvd..."
start-stop-daemon --start --quiet --exec radvd -- -p $PIDFILE_RADVD -C $CONF_RADVD
start-stop-daemon --start --quiet --exec /usr/bin/radvd -- -p $PIDFILE_RADVD -C $CONF_RADVD
log_end_msg $?
fi

2
piratebox/piratebox/init.d/piratebox_alt
View File

@ -150,7 +150,7 @@ case "$1" in
if [ "$IPV6_ENABLE" = "yes" ] && [ "$IPV6_ADVERT" = "radvd" ] ; then
echo "Starting radvd..."
start-stop-daemon -S -q -x radvd -- -p $PIDFILE_RADVD -C $CONF_RADVD
start-stop-daemon -S -q -x /usr/bin/radvd -- -p $PIDFILE_RADVD -C $CONF_RADVD
echo $?
fi