From 4a5f881814fe43b2fefd8ed2937e0231531372b3 Mon Sep 17 00:00:00 2001 From: Matthias Strubel Date: Tue, 11 Apr 2017 06:33:04 +0200 Subject: [PATCH 01/40] initd: fix miniircd startup miniircd can not handle quotations correctly --- piratebox/piratebox/init.d/piratebox | 4 ++-- piratebox/piratebox/init.d/piratebox_alt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/piratebox/piratebox/init.d/piratebox b/piratebox/piratebox/init.d/piratebox index b4862dbb..5d0c443c 100755 --- a/piratebox/piratebox/init.d/piratebox +++ b/piratebox/piratebox/init.d/piratebox @@ -200,10 +200,10 @@ case "$1" in . $CONF_IRC - IRC_PARMS="--setuid $IRC_USER --daemon --motd '$IRC_MOTD' " + IRC_PARMS="--setuid $IRC_USER --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..." diff --git a/piratebox/piratebox/init.d/piratebox_alt b/piratebox/piratebox/init.d/piratebox_alt index e2c27b50..f5cb1f56 100755 --- a/piratebox/piratebox/init.d/piratebox_alt +++ b/piratebox/piratebox/init.d/piratebox_alt @@ -192,10 +192,10 @@ 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="--setuid $IRC_USER --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 From 7a667bfe2f6cc4b4a371c83b0c84bee1baf03e1e Mon Sep 17 00:00:00 2001 From: Matthias Strubel Date: Tue, 11 Apr 2017 07:15:14 +0200 Subject: [PATCH 02/40] initd: minircd startup fix setuid remove setuid option, because start-stop-daemon already does --- piratebox/piratebox/init.d/piratebox | 4 ++-- piratebox/piratebox/init.d/piratebox_alt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/piratebox/piratebox/init.d/piratebox b/piratebox/piratebox/init.d/piratebox index 5d0c443c..64ca168d 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 " 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 f5cb1f56..0e6b1c37 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 " 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 From 96c14538496216d548d5d1fdb0b6b3d8dea9b5b8 Mon Sep 17 00:00:00 2001 From: Matthias Strubel Date: Sun, 30 Apr 2017 09:38:09 +0200 Subject: [PATCH 03/40] mime.types: Adding gpx mime-type --- piratebox/piratebox/conf/lighttpd/mime.types | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/piratebox/piratebox/conf/lighttpd/mime.types b/piratebox/piratebox/conf/lighttpd/mime.types index 12187203..b5119590 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", ) From cf0869f2c2eb0bf4badd5c7c5f086798861c271f Mon Sep 17 00:00:00 2001 From: Matthias Strubel Date: Sun, 7 May 2017 20:24:00 +0200 Subject: [PATCH 04/40] RPi, switch client: Fix path --- piratebox/piratebox/rpi/bin/do_switch_client.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/piratebox/piratebox/rpi/bin/do_switch_client.sh b/piratebox/piratebox/rpi/bin/do_switch_client.sh index 92347787..712f7be0 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 From 89165c03a7701af43d4dce8b847079e38780a32c Mon Sep 17 00:00:00 2001 From: Matthias Strubel Date: Sun, 14 May 2017 12:49:55 +0200 Subject: [PATCH 05/40] install_piratebox.sh : fix distribute directory listing files Do not distribute custom directory listing files during init if that was disabled in piratebox.conf. This is needed for customization. --- piratebox/piratebox/bin/install_piratebox.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/piratebox/piratebox/bin/install_piratebox.sh b/piratebox/piratebox/bin/install_piratebox.sh index 7a6e9320..116098c8 100755 --- a/piratebox/piratebox/bin/install_piratebox.sh +++ b/piratebox/piratebox/bin/install_piratebox.sh @@ -66,7 +66,9 @@ if [ $2 = '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 From 9eebea7d6e5ad2db1b6616231e0ee58d79cc9125 Mon Sep 17 00:00:00 2001 From: Matthias Strubel Date: Tue, 16 May 2017 06:59:53 +0200 Subject: [PATCH 06/40] locale, de: Fix grammar --- piratebox/piratebox/www_content/locales/data.de.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/piratebox/piratebox/www_content/locales/data.de.properties b/piratebox/piratebox/www_content/locales/data.de.properties index af08f189..cb5b8d06 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: From 36548a457245e7d0e7537dda7a27ef63d988dcde Mon Sep 17 00:00:00 2001 From: Matthias Strubel Date: Mon, 22 May 2017 07:35:36 +0200 Subject: [PATCH 07/40] Remove redirect.html, now make use of index.html only --- development/lighttpd_extra.conf | 2 +- development/lighttpd_inside.conf | 2 +- piratebox/piratebox/bin/install_piratebox.sh | 2 +- piratebox/piratebox/conf/lighttpd/lighttpd.conf | 2 +- piratebox/piratebox/www/redirect.html | 11 ----------- 5 files changed, 4 insertions(+), 15 deletions(-) delete mode 100755 piratebox/piratebox/www/redirect.html diff --git a/development/lighttpd_extra.conf b/development/lighttpd_extra.conf index 3a0741b1..f1f7aa82 100644 --- a/development/lighttpd_extra.conf +++ b/development/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/lighttpd_inside.conf b/development/lighttpd_inside.conf index 2e0ce8fb..78006745 100644 --- a/development/lighttpd_inside.conf +++ b/development/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 116098c8..fdc08a16 100755 --- a/piratebox/piratebox/bin/install_piratebox.sh +++ b/piratebox/piratebox/bin/install_piratebox.sh @@ -163,7 +163,7 @@ fi set_hostname() { local name=$1 ; shift; - sed "s|#####HOST#####|$name|g" $PIRATEBOX_FOLDER/src/redirect.html.schema > $WWW_FOLDER/redirect.html + sed "s|#####HOST#####|$name|g" $PIRATEBOX_FOLDER/src/redirect.html.schema > $WWW_FOLDER/index.html sed "s|HOST=\"$HOST\"|HOST=\"$name\"|" -i $PIRATEBOX_CONFIG } diff --git a/piratebox/piratebox/conf/lighttpd/lighttpd.conf b/piratebox/piratebox/conf/lighttpd/lighttpd.conf index dfac75bc..7eeda784 100644 --- a/piratebox/piratebox/conf/lighttpd/lighttpd.conf +++ b/piratebox/piratebox/conf/lighttpd/lighttpd.conf @@ -99,7 +99,7 @@ setenv.add-response-header += ( "Cache-Control" => "max-age=60, must-revalidate, # 404 Error Page with redirect # -server.error-handler-404 = "/redirect.html" +server.error-handler-404 = "/indext.html" ## for better debugging #server.modules += ( "mod_accesslog" ) diff --git a/piratebox/piratebox/www/redirect.html b/piratebox/piratebox/www/redirect.html deleted file mode 100755 index 81848ccf..00000000 --- a/piratebox/piratebox/www/redirect.html +++ /dev/null @@ -1,11 +0,0 @@ - -Redirect... - - - - - - -Redirect - - From a881760aba1756496a13e85ce5a60d0622a348ba Mon Sep 17 00:00:00 2001 From: Matthias Strubel Date: Mon, 22 May 2017 07:39:28 +0200 Subject: [PATCH 08/40] CHANGELOG: First change list --- CHANGELOG | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 087b728a..3d83ab93 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 From 79bc6ff972682af43de5ac43f790f212fdf7e8f3 Mon Sep 17 00:00:00 2001 From: Matthias Strubel Date: Mon, 22 May 2017 08:07:11 +0200 Subject: [PATCH 09/40] content scripts.js : Fix syntax error which broke jQuery --- piratebox/piratebox/www_content/js/scripts.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/piratebox/piratebox/www_content/js/scripts.js b/piratebox/piratebox/www_content/js/scripts.js index cf2e8290..f70d67df 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) From 3301185771625946d5410dcda36993506b7c5ff4 Mon Sep 17 00:00:00 2001 From: Matthias Strubel Date: Thu, 25 May 2017 22:47:39 +0200 Subject: [PATCH 10/40] init scripts: Fixing RADVD startup --- piratebox/piratebox/init.d/piratebox | 2 +- piratebox/piratebox/init.d/piratebox_alt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/piratebox/piratebox/init.d/piratebox b/piratebox/piratebox/init.d/piratebox index 64ca168d..f2ebe737 100755 --- a/piratebox/piratebox/init.d/piratebox +++ b/piratebox/piratebox/init.d/piratebox @@ -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 diff --git a/piratebox/piratebox/init.d/piratebox_alt b/piratebox/piratebox/init.d/piratebox_alt index 0e6b1c37..37aa6434 100755 --- a/piratebox/piratebox/init.d/piratebox_alt +++ b/piratebox/piratebox/init.d/piratebox_alt @@ -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 From 5bca0dbb1a497f8fd4dd818c8ee1e6cf322593e2 Mon Sep 17 00:00:00 2001 From: Matthias Strubel Date: Fri, 30 Jun 2017 09:39:11 +0200 Subject: [PATCH 11/40] lighttpd: Fix typo --- piratebox/piratebox/conf/lighttpd/lighttpd.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/piratebox/piratebox/conf/lighttpd/lighttpd.conf b/piratebox/piratebox/conf/lighttpd/lighttpd.conf index 7eeda784..0e23f410 100644 --- a/piratebox/piratebox/conf/lighttpd/lighttpd.conf +++ b/piratebox/piratebox/conf/lighttpd/lighttpd.conf @@ -99,7 +99,7 @@ setenv.add-response-header += ( "Cache-Control" => "max-age=60, must-revalidate, # 404 Error Page with redirect # -server.error-handler-404 = "/indext.html" +server.error-handler-404 = "/index.html" ## for better debugging #server.modules += ( "mod_accesslog" ) From c84a9be03b7c91c75b8b554d86db974c43ae63e1 Mon Sep 17 00:00:00 2001 From: Matthias Strubel Date: Fri, 30 Jun 2017 09:44:52 +0200 Subject: [PATCH 12/40] init: Fix startup of radvd, make it as an absolute path --- piratebox/piratebox/init.d/piratebox | 2 +- piratebox/piratebox/init.d/piratebox_alt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/piratebox/piratebox/init.d/piratebox b/piratebox/piratebox/init.d/piratebox index 64ca168d..f2ebe737 100755 --- a/piratebox/piratebox/init.d/piratebox +++ b/piratebox/piratebox/init.d/piratebox @@ -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 diff --git a/piratebox/piratebox/init.d/piratebox_alt b/piratebox/piratebox/init.d/piratebox_alt index 0e6b1c37..37aa6434 100755 --- a/piratebox/piratebox/init.d/piratebox_alt +++ b/piratebox/piratebox/init.d/piratebox_alt @@ -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 From b79e0870e6e131375596d1984e362d6e9444067a Mon Sep 17 00:00:00 2001 From: Matthias Strubel Date: Fri, 30 Jun 2017 09:46:55 +0200 Subject: [PATCH 13/40] Update Changelog --- CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 3d83ab93..effe7bf2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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 From c7d194aca9f7de0af6906f60692491ff79da98c3 Mon Sep 17 00:00:00 2001 From: Matthias Strubel Date: Sat, 1 Jul 2017 17:06:57 +0200 Subject: [PATCH 14/40] diskusage: fix wrong error message --- piratebox/piratebox/python_lib/diskusage.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/piratebox/piratebox/python_lib/diskusage.py b/piratebox/piratebox/python_lib/diskusage.py index 08625509..ee8cb84a 100644 --- a/piratebox/piratebox/python_lib/diskusage.py +++ b/piratebox/piratebox/python_lib/diskusage.py @@ -56,7 +56,7 @@ def get_usage(drive): #Add delay. if age < max_delay: - print "CRITICAL: {} modified {} minutes ago. Threshold set to {} minutes. Cannot update.".format(drive, age.seconds/60, max_delay.seconds/60) + print "CRITICAL: {} modified {} minutes ago. Threshold set to {} minutes. Cannot update.".format(htmlfilename, age.seconds/60, max_delay.seconds/60) else: print "OK. File last modified {} minutes ago. Updating now...".format(age.seconds/60) content = prepare_line(drive) @@ -103,4 +103,4 @@ def prepare_line (drive): else: get_usage(disk) - print "Generated HTML-DiskUsage File." \ No newline at end of file + print "Generated HTML-DiskUsage File." From 5677481205d1c229ea273e40cb289a37a6e40817 Mon Sep 17 00:00:00 2001 From: Matthias Strubel Date: Sat, 1 Jul 2017 18:23:55 +0200 Subject: [PATCH 15/40] Adding Changelog entries! --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index effe7bf2..bce50a45 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,6 +4,7 @@ CHANGELOG * [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] diskusage: Fix wrong error message * [Fix] lang-de ; fix grammar * [Fix] [RPi] Fix wrong path in wifi client helper script * [Fix] initd: minircd startup fix setuid From 46301946d4be73c5df75c3e640e40eedcb2d48a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20Borbo=C3=ABn?= Date: Mon, 3 Jul 2017 21:55:18 +0200 Subject: [PATCH 16/40] Real Kareha download URL Avoid hitting the 302 redirection when downloading Kareha release --- piratebox/piratebox/bin/install_piratebox.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/piratebox/piratebox/bin/install_piratebox.sh b/piratebox/piratebox/bin/install_piratebox.sh index 7a6e9320..a361cc52 100755 --- a/piratebox/piratebox/bin/install_piratebox.sh +++ b/piratebox/piratebox/bin/install_piratebox.sh @@ -101,7 +101,7 @@ if [ $2 = 'imageboard' ] ; then KAREHA_RELEASE=kareha_3.1.4.zip if [ ! -e $PIRATEBOX_FOLDER/tmp/$KAREHA_RELEASE ] ; then echo " Wgetting kareha-zip file " - wget http://wakaba.c3.cx/releases/$KAREHA_RELEASE + wget http://wakaba.c3.cx/releases/Kareha/$KAREHA_RELEASE if [ "$?" != "0" ] ; then echo "wget kareha failed.. you can place the current file your to $PIRATEBOX_FOLDER/tmp " fi From 13ebcc56aa47fc4985ebb7d0ae0c2d443632ff8f Mon Sep 17 00:00:00 2001 From: Matthias Strubel Date: Tue, 4 Jul 2017 11:27:44 +0200 Subject: [PATCH 17/40] Add contribution of kareha URL fix --- AUTHORS | 1 + CHANGELOG | 1 + 2 files changed, 2 insertions(+) diff --git a/AUTHORS b/AUTHORS index a077c0e9..6c36b8dc 100644 --- a/AUTHORS +++ b/AUTHORS @@ -26,6 +26,7 @@ Contributors for modifications: # casdr # jdieg0 # a-ira + # ponsfrilus # ... and all others I might have forgotten. diff --git a/CHANGELOG b/CHANGELOG index bce50a45..0d728dfd 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -10,6 +10,7 @@ CHANGELOG * [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 +* [Fix] Refresh kareha download URL, which changed in year 2015 === 1.1.3 === * [New] Translation bt-pr From 10b92aae0a928e5e5b895648cf6d062b9b0da977 Mon Sep 17 00:00:00 2001 From: Matthias Strubel Date: Thu, 13 Jul 2017 19:24:32 +0200 Subject: [PATCH 18/40] diskusage: Fixing missing tag --- piratebox/piratebox/python_lib/diskusage.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/piratebox/piratebox/python_lib/diskusage.py b/piratebox/piratebox/python_lib/diskusage.py index ee8cb84a..116c598c 100644 --- a/piratebox/piratebox/python_lib/diskusage.py +++ b/piratebox/piratebox/python_lib/diskusage.py @@ -16,7 +16,7 @@ # content - String containing preformatted data #-------------- def generate_html(content): - htmlstring = "DiskUsage Data" + htmlstring = "DiskUsage Data" htmlstring += content htmlstring += "" return htmlstring From 001eca96260a90bd02a0aa743138480d87ff223e Mon Sep 17 00:00:00 2001 From: Matthias Strubel Date: Thu, 13 Jul 2017 19:25:38 +0200 Subject: [PATCH 19/40] Adding latest changes --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 0d728dfd..7d73ec2a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -11,6 +11,7 @@ CHANGELOG * [Fix] initd: Fix radvd path to an absolute path * [Fix] WWW-Content, fix a syntax error which broke jQuery * [Fix] Refresh kareha download URL, which changed in year 2015 +* [Fix] diskusage: Adding missing tag === 1.1.3 === * [New] Translation bt-pr From 615af92fc0224894beb3644490c1e2a1273d650b Mon Sep 17 00:00:00 2001 From: Matthias Strubel Date: Sat, 29 Jul 2017 10:36:07 +0200 Subject: [PATCH 20/40] RPi - USB Share - fix following up issue with diskusage generation --- piratebox/piratebox/rpi/bin/usb_share.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/piratebox/piratebox/rpi/bin/usb_share.sh b/piratebox/piratebox/rpi/bin/usb_share.sh index bdcf5244..7911a486 100755 --- a/piratebox/piratebox/rpi/bin/usb_share.sh +++ b/piratebox/piratebox/rpi/bin/usb_share.sh @@ -40,7 +40,7 @@ else fi # Force update diskwirte -touch -t 197001010101 /opt/piratebox/www/diskusage.html +touch -t 201701010101 /opt/piratebox/www/diskusage.html wget http://127.0.0.1/cgi-bin/diskwrite.py -q -O - exit 0 From 23171a5410c80e711307cc3878918033e6ee6239 Mon Sep 17 00:00:00 2001 From: Matthias Strubel Date: Sat, 29 Jul 2017 10:37:48 +0200 Subject: [PATCH 21/40] Note latest changes --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 7d73ec2a..b05a0475 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -7,6 +7,7 @@ CHANGELOG * [Fix] diskusage: Fix wrong error message * [Fix] lang-de ; fix grammar * [Fix] [RPi] Fix wrong path in wifi client helper script +* [Fix] [RPi] Fix issue with diskusage generation & usb share * [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 From 9f53b73b840d62864dc87ffbb884f45de14fa982 Mon Sep 17 00:00:00 2001 From: yosug Date: Fri, 2 Feb 2018 23:47:28 +0100 Subject: [PATCH 22/40] Add files via upload Translation to Spanish and Basque --- .../www_content/locales/data.es.properties | 39 ++++++++++++++++++ .../www_content/locales/data.eu.properties | 40 +++++++++++++++++++ .../piratebox/www_content/locales/locales.ini | 6 +++ 3 files changed, 85 insertions(+) create mode 100644 piratebox/piratebox/www_content/locales/data.es.properties create mode 100644 piratebox/piratebox/www_content/locales/data.eu.properties diff --git a/piratebox/piratebox/www_content/locales/data.es.properties b/piratebox/piratebox/www_content/locales/data.es.properties new file mode 100644 index 00000000..b2203544 --- /dev/null +++ b/piratebox/piratebox/www_content/locales/data.es.properties @@ -0,0 +1,39 @@ +# English strings +# vim: ft=jproperties + +link = enlace +navbarHome = Inicio +navbarForum = Foro +navbarFiles = Ficheros +navbarAbout = Acerca de +logoIMG.alt = PirateBox +logoIMG.title = PirateBox - Compartir Libremente + +welcomeWelcome = Bienvenida +welcomeDescription.innerHTML = Ahora, lo primero de todo, no hay nada ilegal o raro entrando aqui. Este es un sitio social donde puedes charlar y compartir ficheros con gente de alrededor tuyo, anonimamente! Esta es una red desconectada, especialmente diseñada y desarrollada para servicios de comparticion de ficheros y charlas. Estar desconectado es una precaucion para mantener un completo anonimato. Por favor, pasalo bien, charla con gente, y siente libre de compartir los ficheros que tu quieras. +welcomeThanksButton.value = Gracias +sidebarUpload = Subir ficheros -> +sidebarIframeNotSupported = Tu navegador no soporta iframes.. Si quieres subir algo, sigue esto +sidebarBrowseFiles = Ver Ficheros -> + +diskUsage = Uso de disco +refreshButton.value = Actualizar +refreshButton.title = El uso de disco solo puede ser actualizado cada 5 minutos + +mainChatChat = Charlar +mainChatSend.value = Enviar +mainChatName.placeholder = Alias +mainChatName.value = Anonimo +mainChatMessage.placeholder = Mensaje... +mainChatTextColor = Color de texto: +mainShoutboxDefault = Por defecto +mainShoutboxBlue = Azul +mainShoutboxGreen = Verde +mainShoutboxOrange = Naranja +mainShoutboxRed = Rojo + +footerBackToTop = Ir a arriba +footerAbout = Acerca de +footerInspired = Inspirada en las radios piratas y en el movimiento de cultura libre, PirateBox es un dispositivo movil auto-contenido para la colaboracion y comparticion de ficheros. PirateBox utiliza software libre, gratuito y de codigo abierto (FLOSS) para redes wireless moviles de comparticion de ficheros donde los usuarios pueden compartir anonimamente imagenes, videos, audio, documentos, y otros contenidos digitales. +footerFilesTopSafety = PirateBox esta diseñado para ser estable y seguro. No se requiere registro y ningun dato de usuario es registrado. El sistema no esta conectado a internet a proposito para prevenir el seguimiento y preservar la privacidad del usuario. +footerLicenceMain = PirateBox esta licenciado bajo GPLv3. diff --git a/piratebox/piratebox/www_content/locales/data.eu.properties b/piratebox/piratebox/www_content/locales/data.eu.properties new file mode 100644 index 00000000..335c2327 --- /dev/null +++ b/piratebox/piratebox/www_content/locales/data.eu.properties @@ -0,0 +1,40 @@ +# Euskara strings +# by Astur +# vim: ft=jproperties + +link = lotura +navbarHome = Hasiera +navbarForum = Foroa +navbarFiles = Fitxategiak +navbarAbout = Honi buruz +logoIMG.alt = PirateBox +logoIMG.title = PirateBox - Aske Partekatu + +welcomeWelcome = Ongi Etorri +welcomeDescription.innerHTML = Orain, lehenik etra behin, ez dago ezer arrarorik edo legez kanpo hona sartuz. Hau zure inguruko jendearekin hitz egiteko eta fitxategiak partekatzeko gune sozial bat da. Hau konexiorik gabeko sarea da, bereziki fitxategiak partekatzeko eta hitz egiteko diseinaturik. Konexiorik gabe egotea erabateko anonimotasunari eusteko segurtasun neurria da. Mesedez, ondo pasa, jendearekin hitz egin eta aske sentitu nahi dituzun fitxategiak partekatzeko. +welcomeThanksButton.value = Eskerrik asko +sidebarUpload = Fitxategiak igo -> +sidebarIframeNotSupported = Zure nabigatzaileak ez du iframerik onartzen.. Zerbait igotzeko, jarraitu honi +sidebarBrowseFiles = Fitxategiak ikusi -> + +diskUsage = Diskoaren erabilera +refreshButton.value = Eguneratu +refreshButton.title = Diskoaren erabilera 5 minutuan behin baino ezin da eguneratu + +mainChatChat = Hitz egin +mainChatSend.value = Bidali +mainChatName.placeholder = Ezizena +mainChatName.value = Anonimoa +mainChatMessage.placeholder = Mezua.. +mainChatTextColor = Testuaren kolorea: +mainShoutboxDefault = Lehenetsita +mainShoutboxBlue = Urdina +mainShoutboxGreen = Berdea +mainShoutboxOrange = Laranja +mainShoutboxRed = Gorria + +footerBackToTop = Gora itzuli +footerAbout = Honi buruz +footerInspired = Irrati piratetan eta kultura askearen mugimenduan inspiraturik, PirateBox fitxategiak partekatzeko eta auzolanerako tresna bateratu eta eramangarria da. PirateBox-ek fitxategiak partekatzeko wireless sare eramangarrietarako software askea, doakoa eta kode irekikoa (FLOSS) erabiltzen du, non erabiltzaileek anononimoki irudiak, bideoak, audioa, dokumentuak eta bestelako eduki digitalak parteka ditzaketen. +footerFilesTopSafety = PirateBox egonkorra eta segurua izateko diseinaturik dago. Ez da erregistrorik behar, eta ez da erabiltzaileen daturik gordetzen. Sistema nahita deskonektaturik dago internetetik jazarpena saihesteko eta erabiltzailearen pribatutasuna babesteko. +footerLicenceMain = PirateBox GPLv3 lizentziapean dago diff --git a/piratebox/piratebox/www_content/locales/locales.ini b/piratebox/piratebox/www_content/locales/locales.ini index c1366d5f..f7095022 100644 --- a/piratebox/piratebox/www_content/locales/locales.ini +++ b/piratebox/piratebox/www_content/locales/locales.ini @@ -9,3 +9,9 @@ [pt-br] @import url(data.pt-br.properties) + +[es] +@import url(data.es.properties) + +[eu] +@import url(data.eu.properties) From d6a2088d60f6c6ed5b8e22caff61271b2a5b09fe Mon Sep 17 00:00:00 2001 From: Matthias Strubel Date: Thu, 8 Feb 2018 05:40:12 +0100 Subject: [PATCH 23/40] Notice language files --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index b05a0475..bc238fdf 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,6 +4,7 @@ CHANGELOG * [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 +* [New] Language files for Spanish and Basque * [Fix] diskusage: Fix wrong error message * [Fix] lang-de ; fix grammar * [Fix] [RPi] Fix wrong path in wifi client helper script From 6d2d640f64ab2386b11e0eb5400216aeb3125213 Mon Sep 17 00:00:00 2001 From: Matthias Strubel Date: Fri, 28 Jul 2017 21:25:24 +0200 Subject: [PATCH 24/40] RPi: Move toward generated MotD Fixes arch_rpi_image_prepare#14 --- .gitignore | 1 + Makefile | 15 +++++++++------ .../rpi/motd.txt => rpi.motd-template.txt | 4 ++-- 3 files changed, 12 insertions(+), 8 deletions(-) rename piratebox/piratebox/rpi/motd.txt => rpi.motd-template.txt (94%) diff --git a/.gitignore b/.gitignore index 57eb33e0..6b14e74c 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ tmp/* piratebox/piratebox/bin/miniircd.py piratebox/piratebox/www/Shared piratebox/piratebox/www/cgi-bin/data.pso +piratebox/piratebox/rpi/motd.txt diff --git a/Makefile b/Makefile index 6282dcb3..a73ba746 100644 --- a/Makefile +++ b/Makefile @@ -7,6 +7,7 @@ PB_SRC_FOLDER=$(PB_FOLDER)/$(PB_FOLDER) PACKAGE_NAME=$(NAME)_$(VERSION) PACKAGE=$(PACKAGE_NAME).tar.gz VERSION_FILE=$(PB_FOLDER)/$(PB_FOLDER)/version +MOTD=$(PB_FOLDER)/$(PB_FOLDER)/rpi/motd.txt IMAGE_FILE=piratebox_ws_1.1_img.gz TGZ_IMAGE_FILE=piratebox_ws_1.1_img.tar.gz @@ -32,16 +33,18 @@ $(IRC_TARGET_SERVER): git clone $(IRC_GITHUB_ULR) $(IRC_WORK_FOLDER) cp $(IRC_SRC_SERVER) $(IRC_TARGET_SERVER) -$(VERSION): +$(MOTD): + sed -e 's|##version##|$(VERSION)|' rpi.motd-template.txt > $@ + +$(VERSION): echo "$(PACKAGE_NAME)" > $(VERSION_FILE) echo `git status -sb --porcelain` >> $(VERSION_FILE) echo ` git log -1 --oneline` >> $(VERSION_FILE) -$(PACKAGE): $(IRC_TARGET_SERVER) $(VERSION) - tar czf $@ $(PB_FOLDER) - +$(PACKAGE): $(IRC_TARGET_SERVER) $(VERSION) $(MOTD) + tar czf $@ $(PB_FOLDER) -$(IMAGE_FILE): $(IRC_TARGET_SERVER) $(VERSION) $(SRC_IMAGE_UNPACKED) $(OPENWRT_CONFIG_FOLDER) $(OPENWRT_BIN_FOLDER) +$(IMAGE_FILE): $(IRC_TARGET_SERVER) $(VERSION) $(SRC_IMAGE_UNPACKED) $(OPENWRT_CONFIG_FOLDER) $(OPENWRT_BIN_FOLDER) $(MOTD) mkdir -p $(MOUNT_POINT) echo "#### Mounting image-file" sudo mount -o loop,rw,sync $(SRC_IMAGE_UNPACKED) $(MOUNT_POINT) @@ -93,7 +96,7 @@ clean: cleanimage rm -fr $(IRC_WORK_FOLDER) rm -f $(IRC_TARGET_SERVER) rm -f $(PACKAGE) - rm -f $(VERSION_FILE) + rm -f $(VERSION_FILE) $(MOTD) cleanimage: - rm -f $(TGZ_IMAGE_FILE) diff --git a/piratebox/piratebox/rpi/motd.txt b/rpi.motd-template.txt similarity index 94% rename from piratebox/piratebox/rpi/motd.txt rename to rpi.motd-template.txt index 626df556..08a72d0c 100644 --- a/piratebox/piratebox/rpi/motd.txt +++ b/rpi.motd-template.txt @@ -5,8 +5,8 @@ ____________________.__ __ __________ |____|_ /|____| |__||__| (____ /__| \___ >______ /\____/__/\_ \ \/ \/ \/ \/ \/ -Website: http://piratebox.cc PirateBox Version: 1.1.3 -Forum: http://forum.piratebox.cc RPi Image Version: 1.1.3-1 +Website: http://piratebox.cc PirateBox Version: ##version## +Forum: http://forum.piratebox.cc Build date: 00-00-0000 IRC: #piratebox irc.freenode.net Be open -- Share freely! First Steps After Flashing From 0635fa703dd30ec31973ca03b4afd6192f42842a Mon Sep 17 00:00:00 2001 From: Matthias Strubel Date: Sun, 24 Dec 2017 08:14:14 +0100 Subject: [PATCH 25/40] Add note to change root password --- rpi.motd-template.txt | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/rpi.motd-template.txt b/rpi.motd-template.txt index 08a72d0c..fb7893fb 100644 --- a/rpi.motd-template.txt +++ b/rpi.motd-template.txt @@ -12,24 +12,26 @@ IRC: #piratebox irc.freenode.net Be open -- Share freely! First Steps After Flashing 1. Change password of alarm user > passwd -2. Enable Fake-Timeservice - 2.1 Set date and time +2. Change password of root user + > sudo passwd root +3. Enable Fake-Timeservice + 3.1 Set date and time # Disable network time sync > sudo timedatectl set-ntp false # Set time to "Mon May 23 17:42:00" (Format: CCYYMMDD hhmm) > sudo date -s "20170523 1742" > cd /opt/piratebox && sudo ./bin/timesave.sh ./conf/piratebox.conf install - 2.2 Enable on startup + 3.2 Enable on startup > sudo systemctl enable timesave -3. Enable the Kareha Image and Discussion Board +4. Enable the Kareha Image and Discussion Board > sudo /opt/piratebox/bin/board-autoconf.sh -4. Enable USB thumb drive share OR extend SDCard +5. Enable USB thumb drive share OR extend SDCard USB: > sudo /opt/piratebox/rpi/bin/usb_share.sh SDCard: > sudo /opt/piratebox/rpi/bin/sdcard_share.sh -5. Enable UPnP Media Server +6. Enable UPnP Media Server > sudo cp /etc/minidlna.conf /etc/minidlna.conf.bkp > sudo cp /opt/piratebox/src/linux.example.minidlna.conf /etc/minidlna.conf > sudo systemctl start minidlna > sudo systemctl enable minidlna -6. Enable RealTimeClock timekeeping (needs DS3231 or 1307 RTC module!) +7. Enable RealTimeClock timekeeping (needs DS3231 or 1307 RTC module!) > sudo systemctl enable rpi_hwclock From ac61d0af39181bf96a8856e45ce2bb84006e2931 Mon Sep 17 00:00:00 2001 From: Jeremy O'Brien Date: Thu, 30 Nov 2017 15:43:22 -0500 Subject: [PATCH 26/40] Run timesave systemd unit on shutdown --- piratebox/piratebox/rpi/services/timesave.service | 2 ++ 1 file changed, 2 insertions(+) diff --git a/piratebox/piratebox/rpi/services/timesave.service b/piratebox/piratebox/rpi/services/timesave.service index 26a4c134..925dc3ae 100644 --- a/piratebox/piratebox/rpi/services/timesave.service +++ b/piratebox/piratebox/rpi/services/timesave.service @@ -3,7 +3,9 @@ Description=PirateBox timesave service [Service] Type=oneshot +RemainAfterExit=true ExecStart=/opt/piratebox/bin/timesave.sh /opt/piratebox/conf/piratebox.conf recover +ExecStop=/opt/piratebox/bin/timesave.sh /opt/piratebox/conf/piratebox.conf save TimeoutSec=20 [Install] From c8842fc82c7c2d878f94c1399fac356a5fdcdc80 Mon Sep 17 00:00:00 2001 From: l-n-s Date: Mon, 28 Aug 2017 19:25:52 -0400 Subject: [PATCH 27/40] Add russian locale --- CHANGELOG | 8 +++- .../www_content/locales/data.ru.properties | 39 +++++++++++++++++++ .../piratebox/www_content/locales/locales.ini | 3 ++ 3 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 piratebox/piratebox/www_content/locales/data.ru.properties diff --git a/CHANGELOG b/CHANGELOG index bc238fdf..d8ba3300 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,17 +4,23 @@ CHANGELOG * [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 -* [New] Language files for Spanish and Basque +* [New] [i8n] Spanish and Basque +* [New] [i8n] Russian translation +* [New] [RPi] Add all needed things to create a simple on/off button +* [Changed] [RPi] MotD generation reworked and more dynamically +* [Changed] [RPi] Run timesave-save function during shutdown * [Fix] diskusage: Fix wrong error message * [Fix] lang-de ; fix grammar * [Fix] [RPi] Fix wrong path in wifi client helper script * [Fix] [RPi] Fix issue with diskusage generation & usb share +* [Fix] [RPi] Enable cronie for startup, which was missing * [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 * [Fix] Refresh kareha download URL, which changed in year 2015 * [Fix] diskusage: Adding missing tag + === 1.1.3 === * [New] Translation bt-pr * [New] [RPi] Helper scripts to jump to wifi client mode diff --git a/piratebox/piratebox/www_content/locales/data.ru.properties b/piratebox/piratebox/www_content/locales/data.ru.properties new file mode 100644 index 00000000..9ca646b3 --- /dev/null +++ b/piratebox/piratebox/www_content/locales/data.ru.properties @@ -0,0 +1,39 @@ +# English strings +# vim: ft=jproperties + +link = ссылка +navbarHome = Главная +navbarForum = Форум +navbarFiles = Файлы +navbarAbout = О Проекте +logoIMG.alt = PirateBox +logoIMG.title = PirateBox - Распространяй Свободно + +welcomeWelcome = Добро Пожаловать +welcomeDescription.innerHTML = Во-первых, здесь не происходит ничего незаконного или страшного. Это общественная площадка, где вы можете болтать и делиться файлами с людьми вокруг вас анонимно! Это оффлайн сеть, специально спроектированная и разработанная для обмена файлами и сервисов для общения. Отсутствие подключения к Интернету обеспечивает вашу полную анонимность. Наслаждайтесь, общайтесь с другими пользователями и свободно делитесь своими файлами. +welcomeThanksButton.value = Спасибо +sidebarUpload = Перейти К Загрузке -> +sidebarIframeNotSupported = Ваш браузер не поддерживает IFrame.. Если вы хотите загрузить что-нибудь, пройдите сюда +sidebarBrowseFiles = Просмотр Файлов -> + +diskUsage = Использование Диска +refreshButton.value = Обновить +refreshButton.title = Обновлять данные об использовании диска можно только раз в 5 минут + +mainChatChat = Чат +mainChatSend.value = Отправить +mainChatName.placeholder = Псевдоним +mainChatName.value = Аноним +mainChatMessage.placeholder = Сообщение... +mainChatTextColor = Цвет Текста: +mainShoutboxDefault = По-умолчанию +mainShoutboxBlue = Синий +mainShoutboxGreen = Зелёный +mainShoutboxOrange = Оранжевый +mainShoutboxRed = Красный + +footerBackToTop = Вверх +footerAbout = О проекте +footerInspired = PirateBox это самодостаточное мобильное устройство для общения и файлообмена, созданное под вдохновлением от пиратских радиостанций и движения за свободную культуру. В PirateBox используется свободное программное обеспечение с открытым исходным кодом для создания мобильных беспроводных сетей обмена файлами, в которых пользователи могут анонимно обмениваться картинками, видео, музыкой, документами и другим цифровым контентом. +footerFilesTopSafety = PirateBox спроектирован для полной безопасности. Тут не требуют регистрироваться и не сохраняются никакие данные о пользователях. Система специально отключена от Интернета, чтобы предотвратить слежку и сохранить приватность пользователя. +footerLicenceMain = PirateBox распространяется под лицензией GPLv3. diff --git a/piratebox/piratebox/www_content/locales/locales.ini b/piratebox/piratebox/www_content/locales/locales.ini index f7095022..526526c6 100644 --- a/piratebox/piratebox/www_content/locales/locales.ini +++ b/piratebox/piratebox/www_content/locales/locales.ini @@ -15,3 +15,6 @@ [eu] @import url(data.eu.properties) + +[ru] +@import url(data.ru.properties) From 7f313367881ec2326ca4f3208b2ab2d74ddcc37c Mon Sep 17 00:00:00 2001 From: Matthias Strubel Date: Fri, 30 Jun 2017 09:10:00 +0200 Subject: [PATCH 28/40] Rename to avoid confusion of git checkout development --- {development => development_helper}/lighttpd_extra.conf | 0 {development => development_helper}/lighttpd_inside.conf | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename {development => development_helper}/lighttpd_extra.conf (100%) rename {development => development_helper}/lighttpd_inside.conf (100%) diff --git a/development/lighttpd_extra.conf b/development_helper/lighttpd_extra.conf similarity index 100% rename from development/lighttpd_extra.conf rename to development_helper/lighttpd_extra.conf diff --git a/development/lighttpd_inside.conf b/development_helper/lighttpd_inside.conf similarity index 100% rename from development/lighttpd_inside.conf rename to development_helper/lighttpd_inside.conf From b4e441e9537f8ebfa221dfd9899be40c37a013b5 Mon Sep 17 00:00:00 2001 From: Matthias Strubel Date: Tue, 20 Feb 2018 11:14:11 +0100 Subject: [PATCH 29/40] Fixes IRC startup issues Error message: iniircd.py: error: Running this service as root is not recommended. Use the --setuid option to switch to an unprivileged account after startup. If you really intend to run as root, use "--setuid root". --- piratebox/piratebox/init.d/piratebox | 4 ++-- piratebox/piratebox/init.d/piratebox_alt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/piratebox/piratebox/init.d/piratebox b/piratebox/piratebox/init.d/piratebox index f2ebe737..cbeef977 100755 --- a/piratebox/piratebox/init.d/piratebox +++ b/piratebox/piratebox/init.d/piratebox @@ -200,14 +200,14 @@ case "$1" in . $CONF_IRC - IRC_PARMS="--daemon --motd $IRC_MOTD " + IRC_PARMS="--setuid $IRC_USER --daemon --motd $IRC_MOTD " if [ ! -z "$IRC_STATEDIR" ] ; then IRC_PARMS=" $IRCPARMS --statedir $IRC_STATEDIR " fi log_daemon_msg "Starting Miniircd..." - start-stop-daemon $IRC_USER -m -S -p $PIDFILE_IRC -x $PIRATEBOX/bin/miniircd.py -- $IRC_PARMS + start-stop-daemon -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 37aa6434..a9e79300 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="--daemon --motd $IRC_MOTD " + IRC_PARMS="--setuid $IRC_USER --daemon --motd $IRC_MOTD " if [ ! -z "$IRC_STATEDIR" ] ; then IRC_PARMS=" $IRCPARMS --statedir $IRC_STATEDIR " fi echo "Starting Miniircd..." - start-stop-daemon $IRC_USER -m -S -p $PIDFILE_IRC -x $PIRATEBOX/bin/miniircd.py -- $IRC_PARMS + start-stop-daemon -m -S -p $PIDFILE_IRC -x $PIRATEBOX/bin/miniircd.py -- $IRC_PARMS echo $? fi fi From 5ff9ba704c4abb4a00292e23acb4ec0f9e844e28 Mon Sep 17 00:00:00 2001 From: Matthias Strubel Date: Tue, 20 Feb 2018 15:00:11 +0100 Subject: [PATCH 30/40] CHANGELOG: add latest stuff --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index d8ba3300..4a4609b6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -9,6 +9,7 @@ CHANGELOG * [New] [RPi] Add all needed things to create a simple on/off button * [Changed] [RPi] MotD generation reworked and more dynamically * [Changed] [RPi] Run timesave-save function during shutdown +* [Changed] [RPi] Work with en_US.UTF-8 per default * [Fix] diskusage: Fix wrong error message * [Fix] lang-de ; fix grammar * [Fix] [RPi] Fix wrong path in wifi client helper script From 51471ad452728ecf6e7c9ae66e04bf912dafbbe3 Mon Sep 17 00:00:00 2001 From: Matthias Strubel Date: Tue, 20 Feb 2018 15:29:39 +0100 Subject: [PATCH 31/40] Adjust version to 1.1.4 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a73ba746..33f492be 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ NAME = piratebox-ws -VERSION = 1.1.3 +VERSION = 1.1.4 ARCH = all PB_FOLDER=piratebox PB_SRC_FOLDER=$(PB_FOLDER)/$(PB_FOLDER) From 732fbb868c389fa8653ac466db55d00a8ed66b1e Mon Sep 17 00:00:00 2001 From: Matthias Strubel Date: Fri, 23 Feb 2018 10:21:17 +0100 Subject: [PATCH 32/40] Adding latest RPi image generation changelog --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 4a4609b6..fe0410af 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -15,6 +15,7 @@ CHANGELOG * [Fix] [RPi] Fix wrong path in wifi client helper script * [Fix] [RPi] Fix issue with diskusage generation & usb share * [Fix] [RPi] Enable cronie for startup, which was missing +* [Fix] [RPi] Fixed resolv.conf. A default entry is now available * [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 From bbc0b074a634a7554a894c14390737b28dbccfec Mon Sep 17 00:00:00 2001 From: Matthias Strubel Date: Fri, 23 Feb 2018 11:41:38 +0100 Subject: [PATCH 33/40] IRC: cleaning up stop issues let miniircd write PID, because of persmission drop fork. --- piratebox/piratebox/init.d/piratebox | 6 +++--- piratebox/piratebox/init.d/piratebox_alt | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/piratebox/piratebox/init.d/piratebox b/piratebox/piratebox/init.d/piratebox index cbeef977..c3a75e15 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="--setuid $IRC_USER --daemon --motd $IRC_MOTD --pid-file $PIDFILE_IRC " if [ ! -z "$IRC_STATEDIR" ] ; then IRC_PARMS=" $IRCPARMS --statedir $IRC_STATEDIR " fi log_daemon_msg "Starting Miniircd..." - start-stop-daemon -m -S -p $PIDFILE_IRC -x $PIRATEBOX/bin/miniircd.py -- $IRC_PARMS + start-stop-daemon -S -x $PIRATEBOX/bin/miniircd.py -- $IRC_PARMS log_end_msg $? fi fi @@ -223,7 +223,7 @@ case "$1" in if [ "$ENABLE_IRC_SERVER" = "yes" ] ; then log_daemon_msg "Stopping IRC..." - start-stop-daemon -K -q -p $PIDFILE_IRC + start-stop-daemon -s 9 -K -q -p $PIDFILE_IRC log_end_msg $? fi diff --git a/piratebox/piratebox/init.d/piratebox_alt b/piratebox/piratebox/init.d/piratebox_alt index a9e79300..c74a6701 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="--setuid $IRC_USER --daemon --motd $IRC_MOTD --pid-file $PIDFILE_IRC " if [ ! -z "$IRC_STATEDIR" ] ; then IRC_PARMS=" $IRCPARMS --statedir $IRC_STATEDIR " fi echo "Starting Miniircd..." - start-stop-daemon -m -S -p $PIDFILE_IRC -x $PIRATEBOX/bin/miniircd.py -- $IRC_PARMS + start-stop-daemon -S -x $PIRATEBOX/bin/miniircd.py -- $IRC_PARMS echo $? fi fi @@ -250,7 +250,7 @@ case "$1" in if [ "$ENABLE_IRC_SERVER" = "yes" ] ; then echo "Stopping IRC..." - start-stop-daemon -K -q -p $PIDFILE_IRC + start-stop-daemon -s 9 -K -q -p $PIDFILE_IRC echo $? fi From 0cc292dddd6f0590d0d4a45f0d35d645a670a48e Mon Sep 17 00:00:00 2001 From: Matthias Strubel Date: Fri, 23 Feb 2018 11:46:23 +0100 Subject: [PATCH 34/40] Fix for radvd startup on OpenWrt We are adding a ugly hack for OpenWrt based Piratebox. The clean solution is to add another extendRoot package (extendRoot-radvd), but after 1.1 the major OpenWrt release will change and this new package is obsolete. We only add this ugly hack, which will be removed on development tree later again. --- piratebox/piratebox/init.d/piratebox_alt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/piratebox/piratebox/init.d/piratebox_alt b/piratebox/piratebox/init.d/piratebox_alt index c74a6701..ab368317 100755 --- a/piratebox/piratebox/init.d/piratebox_alt +++ b/piratebox/piratebox/init.d/piratebox_alt @@ -149,6 +149,11 @@ case "$1" in echo $? if [ "$IPV6_ENABLE" = "yes" ] && [ "$IPV6_ADVERT" = "radvd" ] ; then + # Ugly hack on PirateBox 1.1.x only + if test -e "/usr/local/usr/sbin/radvd" && test ! -e "/usr/bin/radvd" ; then + echo "Deploy ugly hack for radvd on PirateBox 1.1" + ln -sf /usr/local/usr/sbin/radvd /usr/bin/radvd + fi echo "Starting radvd..." start-stop-daemon -S -q -x /usr/bin/radvd -- -p $PIDFILE_RADVD -C $CONF_RADVD echo $? From a0bdadcfd46c7444c84ec19f67b39e427ae0857e Mon Sep 17 00:00:00 2001 From: Matthias Strubel Date: Fri, 23 Feb 2018 11:51:06 +0100 Subject: [PATCH 35/40] Changelog Add latest fixes --- CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index fe0410af..db7b07aa 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -17,7 +17,9 @@ CHANGELOG * [Fix] [RPi] Enable cronie for startup, which was missing * [Fix] [RPi] Fixed resolv.conf. A default entry is now available * [Fix] initd: minircd startup fix setuid +* [Fix] initd: minircd fixing start-stop issues * [Fix] initd: Fix radvd path to an absolute path +* [Fix] initd: Ugly hack for absolute path of radvd on OpenWrt * [Fix] WWW-Content, fix a syntax error which broke jQuery * [Fix] Refresh kareha download URL, which changed in year 2015 * [Fix] diskusage: Adding missing tag From 0bf3e93321d71d33b4abf0375f9ce8e2909c7ac0 Mon Sep 17 00:00:00 2001 From: Matthias Strubel Date: Sat, 24 Feb 2018 16:45:14 +0100 Subject: [PATCH 36/40] Remove whitespace --- piratebox/piratebox/rpi/bin/wifi_detect.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/piratebox/piratebox/rpi/bin/wifi_detect.sh b/piratebox/piratebox/rpi/bin/wifi_detect.sh index 68e3c5a2..0be0da28 100755 --- a/piratebox/piratebox/rpi/bin/wifi_detect.sh +++ b/piratebox/piratebox/rpi/bin/wifi_detect.sh @@ -3,8 +3,8 @@ # Install the proper hostapd package and adjust the hostapd configuration # accordingly. -## Default -WIFI_DEVICE="wlan0" +## Default +WIFI_DEVICE="wlan0" WIFI_CONFIG_PATH="/boot/wifi_card.conf" @@ -29,7 +29,7 @@ sed -i -e "s|interface=$hostap_interface|interface=$WIFI_DEVICE|" "${CONFIG_PATH #Only change piratebox interface if it is a wifi interface if echo "$piratebox_interface" | grep -q "wlan" ; then sed -i -e "s|INTERFACE=\"$piratebox_interface\"|INTERFACE=\"$WIFI_DEVICE\"|" \ - "${PIRATEBOX_CONFIG_PATH}" + "${PIRATEBOX_CONFIG_PATH}" fi if echo "$dnsmasq_interface" | grep -q "wlan" ; then sed -i -e "s|DNSMASQ_INTERFACE=\"$dnsmasq_interface\"|DNSMASQ_INTERFACE=\"$WIFI_DEVICE\"|" \ From db3285262766b913402778266dcfc4278a73e745 Mon Sep 17 00:00:00 2001 From: Matthias Strubel Date: Sat, 24 Feb 2018 16:46:14 +0100 Subject: [PATCH 37/40] RPi: Fix r8188eu wifi detection problem --- piratebox/piratebox/rpi/bin/wifi_detect.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/piratebox/piratebox/rpi/bin/wifi_detect.sh b/piratebox/piratebox/rpi/bin/wifi_detect.sh index 0be0da28..7c600607 100755 --- a/piratebox/piratebox/rpi/bin/wifi_detect.sh +++ b/piratebox/piratebox/rpi/bin/wifi_detect.sh @@ -54,7 +54,7 @@ fi DRIVER_NAME=$( ls -1 /sys/class/net/"${WIFI_DEVICE}"/device/driver/module/drivers/ ) # Check for r8188eu enabled device -if echo "$DRIVER_NAME" | grep -q "r8188eu:"; then +if echo "$DRIVER_NAME" | grep -q "r8188eu"; then echo "Found r8188eu enabled device..." pacman --noconfirm -U --needed "${PACKAGE_PATH}/hostapd-8188eu-"* > /dev/null sed -i 's/^driver=nl80211/#driver=nl80211/' "${CONFIG_PATH}" From 5f0d027c26d5217baa78aabfa7cba4c7579b0c7d Mon Sep 17 00:00:00 2001 From: Matthias Strubel Date: Mon, 26 Feb 2018 13:08:13 +0100 Subject: [PATCH 38/40] CHANGELOG: Add latest RPi fixes --- CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index db7b07aa..b732c097 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -16,6 +16,8 @@ CHANGELOG * [Fix] [RPi] Fix issue with diskusage generation & usb share * [Fix] [RPi] Enable cronie for startup, which was missing * [Fix] [RPi] Fixed resolv.conf. A default entry is now available +* [Fix] [RPi] Fixed detection of 8188eu +* [Fix] [RPi] Store the installed hostap package in /prebuild/hostapd * [Fix] initd: minircd startup fix setuid * [Fix] initd: minircd fixing start-stop issues * [Fix] initd: Fix radvd path to an absolute path From 5be7bcc147d26aab40763a4d43b9e2bd8cfc68cf Mon Sep 17 00:00:00 2001 From: Matthias Strubel Date: Tue, 27 Feb 2018 21:38:43 +0100 Subject: [PATCH 39/40] A bunch of fixes for timesave. - Apply shellcheck issues - Make timesave working properly on RPi images --- Makefile | 2 +- piratebox/piratebox/bin/timesave.sh | 16 ++++++++-------- piratebox/piratebox/conf/piratebox.conf | 6 ++---- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 33f492be..45bd9775 100644 --- a/Makefile +++ b/Makefile @@ -69,7 +69,7 @@ $(OPENWRT_CONFIG_FOLDER): sed 's:DROOPY_USE_USER="yes":DROOPY_USE_USER="no":' -i $@/piratebox.conf sed 's:DROOPY_CHMOD:#DROOPY_CHMOD:' -i $@/piratebox.conf sed 's:LEASE_FILE_LOCATION=$$PIRATEBOX_FOLDER/tmp/lease.file:LEASE_FILE_LOCATION=/tmp/lease.file:' -i $@/piratebox.conf - sed 's:TIMESAVE_FORMAT="":TIMESAVE_FORMAT="+%C%g%m%d%H%M":' -i $@/piratebox.conf + sed 's:TIMESAVE_FORMAT="+%C%g%m%d %H%M":TIMESAVE_FORMAT="+%C%g%m%d%H%M":' -i $@/piratebox.conf sed 's:FIREWALL_FETCH_DNS="yes":FIREWALL_FETCH_DNS="no":' -i $@/firewall.conf sed 's:FIREWALL_FETCH_HTTP="yes":FIREWALL_FETCH_HTTP="no":' -i $@/firewall.conf diff --git a/piratebox/piratebox/bin/timesave.sh b/piratebox/piratebox/bin/timesave.sh index a5e691e3..28134baa 100755 --- a/piratebox/piratebox/bin/timesave.sh +++ b/piratebox/piratebox/bin/timesave.sh @@ -19,11 +19,11 @@ get_datetime() { # Strip spaces from datetime sanitize_datetime() { - echo $1 | sed s/" "/""/g + echo "$1" | sed s/" "/""/g } # Print usage if parameters are not provided -if [ -z $1 ] || [ -z $2 ] ; then +if [ -z "$1" ] || [ -z "$2" ] ; then echo "Set up a crontab entry for regulary saving the time" echo "Usage $0 " echo " Valid steps are:" @@ -35,7 +35,7 @@ if [ -z $1 ] || [ -z $2 ] ; then fi # Load configfile -. $1 +. "$1" if [ "$2" = "install" ] ; then crontab -l > $PIRATEBOX_FOLDER/tmp/crontab 2> /dev/null @@ -44,9 +44,9 @@ if [ "$2" = "install" ] ; then crontab $PIRATEBOX_FOLDER/tmp/crontab echo "initialize timesave file" - touch $TIMESAVE - chmod a+rw $TIMESAVE - get_datetime > $TIMESAVE + touch "$TIMESAVE" + chmod a+rw "$TIMESAVE" + get_datetime > "$TIMESAVE" echo "Remember MAY have to cron active..." echo " on OpenWrt run: /etc/init.d/piratebox enable" @@ -56,14 +56,14 @@ fi # Save current date-time in a recoverable format if [ "$2" = "save" ] ; then - if [ -e $TIMESAVE ] ; then + if [ -e "$TIMESAVE" ] ; then if [ $(sanitize_datetime "$(get_datetime)") -lt $(sanitize_datetime "$(cat $TIMESAVE)") ] ; then logger -s "$0: Current date-time is lower then saved one. Not saving!" exit 1 fi fi - get_datetime > $TIMESAVE + get_datetime > "$TIMESAVE" exit 0 fi diff --git a/piratebox/piratebox/conf/piratebox.conf b/piratebox/piratebox/conf/piratebox.conf index aa61cc41..47cdc122 100644 --- a/piratebox/piratebox/conf/piratebox.conf +++ b/piratebox/piratebox/conf/piratebox.conf @@ -116,10 +116,8 @@ NODE_CONFIG="$PIRATEBOX_FOLDER/conf/node.conf" ## Timesave file for non-RTC devices TIMESAVE="$PIRATEBOX_FOLDER/share/timesave_file" -#On non OpenWRT you can use the default output format -# as an input format. For OpenWrt you need to specify +%C%g%m%d%H%M -# The content is exchanged during makefile processing and image build -TIMESAVE_FORMAT="" +## Format for storing & recovering the date&time +TIMESAVE_FORMAT="+%C%g%m%d %H%M" #Start droopy? - Enable upload? DROOPY_ENABLED="yes" From 759f6cdb3f6cbed9cf31267fc72a7fc3cd0a916f Mon Sep 17 00:00:00 2001 From: Matthias Strubel Date: Tue, 27 Feb 2018 21:46:37 +0100 Subject: [PATCH 40/40] CHANGELOG: Update latest changes --- CHANGELOG | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index b732c097..7b3c07d7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -17,7 +17,7 @@ CHANGELOG * [Fix] [RPi] Enable cronie for startup, which was missing * [Fix] [RPi] Fixed resolv.conf. A default entry is now available * [Fix] [RPi] Fixed detection of 8188eu -* [Fix] [RPi] Store the installed hostap package in /prebuild/hostapd +* [Fix] [RPi] Store the installed hostap package in /prebuild/hostapd * [Fix] initd: minircd startup fix setuid * [Fix] initd: minircd fixing start-stop issues * [Fix] initd: Fix radvd path to an absolute path @@ -25,6 +25,8 @@ CHANGELOG * [Fix] WWW-Content, fix a syntax error which broke jQuery * [Fix] Refresh kareha download URL, which changed in year 2015 * [Fix] diskusage: Adding missing tag +* [Fix] timesave: Shellcheck issues fixed +* [Fix] timesave: Problems with date & time format at RPi fixed === 1.1.3 === @@ -48,11 +50,11 @@ CHANGELOG * [Fix] Translation en,fr LibraryBox -> PirateBox * [Fix] Spellings in translation * [Fix] IRC startup command failed. -* [Removed] exchange_www.sh +* [Removed] exchange_www.sh === 1.1.0 === * [New] Enable / Disable file provisioning for custom lighttpd directory listing -* [New] ChatBox message is now in conf/chat_init.txt +* [New] ChatBox message is now in conf/chat_init.txt * [New] Disable the Shoutbox to prevent writing into it * [New] PHP configuration shipped, to enable easily for modifications * [New] Mesh implementation, technical preview @@ -68,7 +70,7 @@ CHANGELOG * [New] [OpenWrt] Enable all wifi devices with the PirateBox SSID * [New] [OpenWrt] AP Client isolation activated per default * [Changed] Send HTTP-Code 204 via PHP, much cleaner -* [Changed] Update jQuery to 2.2.3, removes IE <=8 support +* [Changed] Update jQuery to 2.2.3, removes IE <=8 support * [Changed] Redirect happens now always to wished domain name * [Changed] Droopy, make chmod operation optional (prevent errors on OpenWRT) * [Fix] License Adjustments @@ -102,15 +104,15 @@ CHANGELOG * [New] Improved styling for droopy iframe. * [New] Timesave script service file to run set the time during startup. * [Fix] Droopy call in init.d/piratebox failed to use the correct port. -* [Fix] Timesave script behaviour fixed on full Linux systems. +* [Fix] Timesave script behaviour fixed on full Linux systems. * OpenWrt's date format is now customized during build & piratebox.conf . -=== 1.0.4 === +=== 1.0.4 === * [New] New feature: /opt/piratebox/bin/board-autoconf.sh for setting up the imageboard * [New] Droopy update: Multiple upload * [New] Droopy update: In general user/password setting (non configurable via PirateBox) -* [New] imageboard: inital dummy page for a not installed board. +* [New] imageboard: inital dummy page for a not installed board. * [New] Send HTTP-Code 204 for Android devices, avoids captive Portal and leaving devices. * [Fix] Some script cleanups @@ -147,11 +149,11 @@ CHANGELOG * [New] Service File for RPi image * [Fix] Several typos in scripts * [Fix] Typo in front page and directory listing -* [Fix] in timsave.sh while restoring date&time -* [Fix] [OpenWRT] Timesave create bootup restore -* [Fix] [OpenWRT] Fix for not working "already installed" recognition to skip parts +* [Fix] in timsave.sh while restoring date&time +* [Fix] [OpenWRT] Timesave create bootup restore +* [Fix] [OpenWRT] Fix for not working "already installed" recognition to skip parts * [Fix] [OpenWRT] Fix for errors during installing piratebox-mod-imageboard because of duplicate links -* [Fix] [OpenWRT] Fix for LED flashing during auto install (box-installer on image) +* [Fix] [OpenWRT] Fix for LED flashing during auto install (box-installer on image) * [Fix] [OpenWRT] Fix error messages on package reinstall. (extendRoot) * [Fix] No dublicates symlink after double "part2" via install_piratebox.sh * [New] Remove # in front of secret & password to force user to change it before using the board @@ -181,9 +183,9 @@ NOTE: This may only be a partial changelog, check github / your package manager * [Removed] [Testing] Executable, we will stick to service based * [Fixed] Overwritten saved timestamp with 1970 one * [New] possibility in install_piratebox.sh to exchange the hostname easily -* [New] Moved DHCP leasefile into memory on OpenWRT system (/tmp is memory) +* [New] Moved DHCP leasefile into memory on OpenWRT system (/tmp is memory) * [Fix] Timesave script does not contain parts for OpenWRT anymore -* [Fix] Timesave-file location is now configured in piratebox.conf +* [Fix] Timesave-file location is now configured in piratebox.conf * [Fix] Fix in Changing hostname functionality * [New] Hostname changing generates the redirect.html now based on a Schema file * [New] Added JSON Mime-Type