Merge remote-tracking branch 'origin/hotfix-1.1.4' into development
This commit is contained in:
Matthias Strubel
commit
b782fd944e
|
|
@ -1,5 +1,13 @@
|
|||
CHANGELOG
|
||||
|
||||
=== 1.1.4 ===
|
||||
* [New] Removed legacy redirect.html, use /index.html only
|
||||
* [New] install_piratebox.sh, avoid distribution of index files, if turned off.
|
||||
* [New] mime.types: Adding gpx mime-type
|
||||
* [Fix] lang-de ; fix grammar
|
||||
* [Fix] [RPi] Fix wrong path in wifi client helper script
|
||||
* [Fix] initd: minircd startup fix setuid
|
||||
|
||||
=== 1.1.3 ===
|
||||
* [New] Translation bt-pr
|
||||
* [New] [RPi] Helper scripts to jump to wifi client mode
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ $HTTP["url"] =~ "^/board/" {
|
|||
|
||||
# 404 Error Page with redirect
|
||||
#
|
||||
#server.error-handler-404 = "/redirect.html"
|
||||
#server.error-handler-404 = "/index.html"
|
||||
|
||||
## for better debugging
|
||||
#server.modules += ( "mod_accesslog" )
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ $HTTP["url"] =~ "^/board/" {
|
|||
|
||||
# 404 Error Page with redirect
|
||||
#
|
||||
#server.error-handler-404 = "/redirect.html"
|
||||
#server.error-handler-404 = "/index.html"
|
||||
|
||||
## for better debugging
|
||||
#server.modules += ( "mod_accesslog" )
|
||||
|
|
|
|||
|
|
@ -67,7 +67,10 @@ if [ "$1" = 'part2' ] ; then
|
|||
mkdir -p "$PIRATEBOX_FOLDER/tmp"
|
||||
|
||||
#Distribute the Directory Listing files
|
||||
"$PIRATEBOX_FOLDER/bin/distribute_files.sh" "$SHARE_FOLDER/Shared" true
|
||||
if [ "$CUSTOM_DIRLIST_COPY" = "yes" ] ; then
|
||||
"$PIRATEBOX_FOLDER/bin/distribute_files.sh" "$SHARE_FOLDER/Shared" true
|
||||
fi
|
||||
|
||||
#Set permissions
|
||||
chown "$LIGHTTPD_USER":"$LIGHTTPD_GROUP" "$PIRATEBOX_FOLDER/share" -R
|
||||
chmod u+rw "$PIRATEBOX_FOLDER/share"
|
||||
|
|
@ -172,9 +175,8 @@ set_hostname() {
|
|||
name=$1 ; shift;
|
||||
|
||||
sed -e "s|#####HOST#####|$name|g" \
|
||||
"$PIRATEBOX_FOLDER"/src/redirect.html.schema > \
|
||||
"$WWW_FOLDER"/redirect.html
|
||||
sed -e "s|HOST=\"$HOST\"|HOST=\"$name\"|" -i "$PIRATEBOX_CONFIG"
|
||||
"$PIRATEBOX_FOLDER"/src/redirect.html.schema > \
|
||||
"$WWW_FOLDER"/index.html
|
||||
}
|
||||
|
||||
if [ "$1" = "hostname" ] ; then
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# 404 Error Page with redirect
|
||||
# only for non piratebox Domains, that makes UI development easier.
|
||||
$HTTP["host"] != var.PIRATEBOX_HOSTNAME {
|
||||
server.error-handler-404 = "/redirect.html"
|
||||
server.error-handler-404 = "/index.html"
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -73,6 +73,7 @@ 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" )
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ mimetype.assign = (
|
|||
".epub" => "application/epub+zip",
|
||||
".fb2" => "text/xml",
|
||||
".svg" => "image/svg+xml",
|
||||
|
||||
".gpx" => "application/gpx+xml",
|
||||
# make the default mime type application/octet-stream.
|
||||
"" => "application/octet-stream",
|
||||
)
|
||||
|
|
|
|||
|
|
@ -200,14 +200,14 @@ case "$1" in
|
|||
|
||||
. $CONF_IRC
|
||||
|
||||
IRC_PARMS="--setuid $IRC_USER --daemon --motd '$IRC_MOTD' "
|
||||
IRC_PARMS="--daemon --motd $IRC_MOTD "
|
||||
|
||||
if [ ! -z "$IRC_STATEDIR" ] ; then
|
||||
IRC_PARMS=" $IRCPARMS --statedir '$IRC_STATEDIR' "
|
||||
IRC_PARMS=" $IRCPARMS --statedir $IRC_STATEDIR "
|
||||
fi
|
||||
|
||||
log_daemon_msg "Starting Miniircd..."
|
||||
start-stop-daemon $DROOPY_USER -m -S -p $PIDFILE_IRC -x $PIRATEBOX/bin/miniircd.py -- $IRC_PARMS
|
||||
start-stop-daemon $IRC_USER -m -S -p $PIDFILE_IRC -x $PIRATEBOX/bin/miniircd.py -- $IRC_PARMS
|
||||
log_end_msg $?
|
||||
fi
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -192,13 +192,13 @@ case "$1" in
|
|||
#Start IRC Server
|
||||
if [ "$ENABLE_IRC_SERVER" = "yes" ] ; then
|
||||
. $CONF_IRC
|
||||
IRC_PARMS="--setuid $IRC_USER --daemon --motd '$IRC_MOTD' "
|
||||
IRC_PARMS="--daemon --motd $IRC_MOTD "
|
||||
|
||||
if [ ! -z "$IRC_STATEDIR" ] ; then
|
||||
IRC_PARMS=" $IRCPARMS --statedir '$IRC_STATEDIR' "
|
||||
IRC_PARMS=" $IRCPARMS --statedir $IRC_STATEDIR "
|
||||
fi
|
||||
echo "Starting Miniircd..."
|
||||
start-stop-daemon $DROOPY_USER -m -S -p $PIDFILE_IRC -x $PIRATEBOX/bin/miniircd.py -- $IRC_PARMS
|
||||
start-stop-daemon $IRC_USER -m -S -p $PIDFILE_IRC -x $PIRATEBOX/bin/miniircd.py -- $IRC_PARMS
|
||||
echo $?
|
||||
fi
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# Wrapper script for the steps to enable wifi client
|
||||
|
||||
systemctl stop piratebox
|
||||
if /opt/piratebox/rpi/run_client.sh ; then
|
||||
if /opt/piratebox/rpi/bin/run_client.sh ; then
|
||||
echo "Started Wifi client sucessfully!"
|
||||
exit 0
|
||||
else
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
<html>
|
||||
<head><title>Redirect...</title>
|
||||
<meta http-equiv="refresh" content="0;url=http://piratebox.lan/content" />
|
||||
<meta http-equiv='cache-control' content='no-cache, no-store, must-revalidate' />
|
||||
<meta http-equiv='pragma' content='no-cache' />
|
||||
<meta http-equiv='expires' content='0' />
|
||||
</head>
|
||||
<body>
|
||||
Redirect
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -68,7 +68,7 @@ $(document).ready(function() {
|
|||
var locationPath = filterPath(location.pathname);
|
||||
var scrollElem = scrollableElement('html', 'body');
|
||||
|
||||
$('a[href*=#]').each(function() {
|
||||
$('a[href*=\\#]').each(function() {
|
||||
var thisPath = filterPath(this.pathname) || locationPath;
|
||||
if ( locationPath == thisPath
|
||||
&& (location.hostname == this.hostname || !this.hostname)
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ logoIMG.alt = PirateBox
|
|||
logoIMG.title = PirateBox - Share Freely
|
||||
|
||||
welcomeWelcome = Willkommen
|
||||
welcomeDescription.innerHTML = Das Wichtigste vorweg: Hier geht nichts Illegales oder Unheimliches vor. Dies ist ein sozialer Platz, wo jeder chatten und Dateien austauschen kann und zwar anonym! Dies ist ein Offline-Netzwerk, speziell zum Filesharing und Chatten entwickelt. Vom Netz getrennt zu sein, ist die Voraussetzung für volle Anonymität. Hab Spaß, chatte mit Menschen und teile Dateien, die du magst.
|
||||
welcomeDescription.innerHTML = Das Wichtigste vorweg: Hier geht nichts Illegales oder Unheimliches vor. Dies ist ein sozialer Platz, wo jeder chatten und Dateien austauschen kann und zwar anonym! Dies ist ein Offline-Netzwerk, speziell zum Filesharing und Chatten entwickelt. Vom Netz getrennt zu sein ist die Voraussetzung für volle Anonymität. Hab Spaß, chatte mit Menschen und teile Dateien, die du magst.
|
||||
welcomeThanksButton.value = Alles klar!
|
||||
sidebarUpload = Upload ->
|
||||
sidebarIframeNotSupported = Dein Browser unterstützt keine Iframes. Wenn du etwas hochladen möchtest, hier entlang:
|
||||
|
|
|
|||
Loading…
Reference in New Issue