diff --git a/CHANGELOG b/CHANGELOG index 087b728..3d83ab9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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 diff --git a/development_helper/lighttpd_extra.conf b/development_helper/lighttpd_extra.conf index 3a0741b..f1f7aa8 100644 --- a/development_helper/lighttpd_extra.conf +++ b/development_helper/lighttpd_extra.conf @@ -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" ) diff --git a/development_helper/lighttpd_inside.conf b/development_helper/lighttpd_inside.conf index 2e0ce8f..7800674 100644 --- a/development_helper/lighttpd_inside.conf +++ b/development_helper/lighttpd_inside.conf @@ -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" ) diff --git a/piratebox/piratebox/bin/install_piratebox.sh b/piratebox/piratebox/bin/install_piratebox.sh index 0ca8353..2a97edc 100755 --- a/piratebox/piratebox/bin/install_piratebox.sh +++ b/piratebox/piratebox/bin/install_piratebox.sh @@ -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 diff --git a/piratebox/piratebox/conf/lighttpd/all-redirect.conf b/piratebox/piratebox/conf/lighttpd/all-redirect.conf index b78ec06..dd1c0b3 100644 --- a/piratebox/piratebox/conf/lighttpd/all-redirect.conf +++ b/piratebox/piratebox/conf/lighttpd/all-redirect.conf @@ -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" } diff --git a/piratebox/piratebox/conf/lighttpd/lighttpd.conf b/piratebox/piratebox/conf/lighttpd/lighttpd.conf index 28f9663..acf4b88 100644 --- a/piratebox/piratebox/conf/lighttpd/lighttpd.conf +++ b/piratebox/piratebox/conf/lighttpd/lighttpd.conf @@ -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" ) diff --git a/piratebox/piratebox/conf/lighttpd/mime.types b/piratebox/piratebox/conf/lighttpd/mime.types index 1218720..b511959 100644 --- a/piratebox/piratebox/conf/lighttpd/mime.types +++ b/piratebox/piratebox/conf/lighttpd/mime.types @@ -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", ) diff --git a/piratebox/piratebox/init.d/piratebox b/piratebox/piratebox/init.d/piratebox index b343364..b8d75c5 100755 --- a/piratebox/piratebox/init.d/piratebox +++ b/piratebox/piratebox/init.d/piratebox @@ -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 diff --git a/piratebox/piratebox/init.d/piratebox_alt b/piratebox/piratebox/init.d/piratebox_alt index f6d21bf..82a1de7 100755 --- a/piratebox/piratebox/init.d/piratebox_alt +++ b/piratebox/piratebox/init.d/piratebox_alt @@ -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 diff --git a/piratebox/piratebox/rpi/bin/do_switch_client.sh b/piratebox/piratebox/rpi/bin/do_switch_client.sh index 9234778..712f7be 100755 --- a/piratebox/piratebox/rpi/bin/do_switch_client.sh +++ b/piratebox/piratebox/rpi/bin/do_switch_client.sh @@ -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 diff --git a/piratebox/piratebox/www/redirect.html b/piratebox/piratebox/www/redirect.html deleted file mode 100755 index 81848cc..0000000 --- a/piratebox/piratebox/www/redirect.html +++ /dev/null @@ -1,11 +0,0 @@ - -Redirect... - - - - - - -Redirect - - diff --git a/piratebox/piratebox/www_content/js/scripts.js b/piratebox/piratebox/www_content/js/scripts.js index cf2e829..f70d67d 100755 --- a/piratebox/piratebox/www_content/js/scripts.js +++ b/piratebox/piratebox/www_content/js/scripts.js @@ -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) diff --git a/piratebox/piratebox/www_content/locales/data.de.properties b/piratebox/piratebox/www_content/locales/data.de.properties index af08f18..cb5b8d0 100644 --- a/piratebox/piratebox/www_content/locales/data.de.properties +++ b/piratebox/piratebox/www_content/locales/data.de.properties @@ -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: