Commit graph

54 commits

Author SHA1 Message Date
Matthias Strubel 7950472e0e Droopy: Make chmod optional.
Droopy always does the chmod operation, if the option is set.
On partitions with FAT it is not possible to execute this operation.
Droopy may ran into issue in that situation.

With that fix, the option won't be set on droopy start to prevent
any chmod operation on FAT partitions.

Fixes #154
2016-06-14 20:09:28 +02:00
Matthias Strubel 09d04d8ff7 Better handling of content folder and more dependeing changes
-->  Design-Stuff to USB Stick #107
2016-05-10 20:09:49 +02:00
Matthias Strubel d47c7548a2 Reverting php-jquery uploader
Fixes #141
2016-04-14 07:43:59 +02:00
Matthias Strubel 391c137709 Merge branch 'release-1.0.7' into merge-1.0.7 2016-02-07 10:52:13 +01:00
nightshade 001a641309 Add Diskusage to Piratebox 2015-09-14 17:31:00 -06:00
Matthias Strubel 6679b04cdb Merge branch 'hotfix-1.0.5' into development
[New] Improved styling for droopy iframe.  (not applied)
    [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. OpenWrt's date format is now customized during build & piratebox.conf .
2015-09-13 11:34:15 +02:00
Matthias Strubel 66b840714e Improved handling of timesave script on normal Linux system.
* Delivered the systemd file for restoring the file during boot.
  * Moved date format to piratebox.conf
  * Customize the date format for OpenWrt during build of
    piratebox_ws-img.tar.gz file, like other configuration files
2015-08-23 11:07:04 +02:00
Matthias Strubel 4ba0671cd3 Merge branch 'hotfix-1.0.4' into development
Implementing the changes from hotfix to development branch.

Resolved  Conflicts:
	CHANGELOG
	piratebox/piratebox/bin/board-autoconf.sh
	piratebox/piratebox/bin/droopy (now 1.0.4 version)
	piratebox/piratebox/bin/shoutbox_stuff.sh
	piratebox/piratebox/init.d/piratebox
	piratebox/piratebox/init.d/piratebox_alt
	piratebox/piratebox/www/generate_204  (stays PHP)
	piratebox/piratebox/www/index.html
2015-08-18 20:10:15 +02:00
Matthias Strubel 70823c1e4f This commit aligns the Droopy code back to the latest versions.
The PirateBox modifications can be found in:

   https://github.com/PirateBox-Dev/Droopy

It contains the following features from the old PirateBox version
of Droopy:

  - Secured Subdirectory (new directories will fail in styling)
  - Make it possible to launch Droopy on boot time
  - Prevent uploading index.ht* files

New features / bugfixes with the new Droopy version:

  - Multiple upload
  - Fixed language encoding
  - In general user/password setting (non configurable via
    PirateBox)

The following features were not ported to the new version:

  - Include hostname to templates (not needed anymore)
  - Field including iframe for shoutbox (not needed anymore)
  - iOS fake answer code, which was included in lighttpd since
    Piratebox 0.5.x

Known issues:

  - New folders via protected subdirectory feature are not
    created with HEADER.TXT and README.txt (styling will not work).
    That issue is also on 1.0.0-1.0.3 versions
  - HEADER.TXT and README.txt can be uploaded. It will not be
    overwritten, but break styling if the files aren't available.
2015-07-30 21:54:43 +02:00
Matthias Strubel 5d6f724bac Merge branch 'master' of https://github.com/deavmi/PirateBoxScripts_Webserver into deavmi-master 2015-04-07 18:54:23 +02:00
Tristan B. Kildaire 118c0067b3 Improved more stuff 2015-04-07 18:18:49 +02:00
Matthias Strubel 79ec7555c5 Droopy disabled per default, because there is now a new upload method 2015-01-28 12:37:47 +01:00
Matthias Strubel e895986d91 Merge remote-tracking branch 'remotes/origin/irc_server' into development
Conflicts:
	Makefile
	piratebox/piratebox/init.d/piratebox
	piratebox/piratebox/init.d/piratebox_alt
2015-01-28 12:37:02 +01:00
Tobias Trumm 1256c62c38 Try to add a configuration variable
to enable the use of client timestamps in the chat window. Doesn't work
yet.
2014-08-04 21:46:17 +02:00
Matthias Strubel 96a2d010d7 Merge branch 'hotfix-1.0.1' into development
Conflicts:
	CHANGELOG
	piratebox/piratebox/bin/distribute_file_into_directory.sh
	piratebox/piratebox/bin/distribute_files.sh
	piratebox/piratebox/conf/piratebox.conf
	piratebox/piratebox/init.d/piratebox
	piratebox/piratebox/init.d/piratebox_alt
	piratebox/piratebox/src/HEADER.txt
	piratebox/piratebox/src/README.txt
	piratebox/piratebox/www/index.html
2014-06-27 17:50:31 +02:00
Matthias Strubel 1c0973815a Disable Using the Shoutbox
Merge branch 'shoutbox_disable' into development
2014-06-27 16:44:19 +02:00
Matthias Strubel b6dabf9643 Including JSON generation feature.
Merge branch 'json_generation' into development
2014-06-27 16:32:40 +02:00
Matthias Strubel 7d78cc718c Implementing mesh feature from LibraryBox to PirateBox
- still needs some tweaks mapping mDNS to S-DNS  (make unique name available via non avahi clients)
   - refreshing of dnsmasq cache

Merge branch 'mesh_enabling' into development

Conflicts:
	piratebox/piratebox/bin/generate_config_files.sh
	piratebox/piratebox/conf/piratebox.conf
2014-06-27 16:20:20 +02:00
Matthias Strubel c2a6378418 Add License header on several scripts
Merge remote-tracking branch 'remotes/origin/licencse_fixes' into development
2014-06-27 16:14:19 +02:00
Matthias Strubel 31d025de4b toggle shoutbox read-writable 2014-01-17 17:37:57 +01:00
Matthias Strubel 41f9bb4ffd first version of json generation transfered from LibraryBox 2.0 2014-01-17 17:14:45 +01:00
Matthias Strubel 01d10be31e 3rd bunch of license headers 2014-01-17 16:52:26 +01:00
Matthias Strubel f6429cd241 move chat message to extra config file 2014-01-17 16:41:48 +01:00
Matthias Strubel 898e98e55f enable / disable file copy into share folder via config 2014-01-17 16:37:23 +01:00
Matthias Strubel 5300e5c42a Merge branch 'librarybox_dev' into mesh_enabling
Conflicts:
	CHANGELOG
	piratebox/piratebox/conf/piratebox.conf
2013-11-29 18:01:40 +01:00
Matthias Strubel ae0eaeb2ca moved Config entry from timesave to piratebox.conf
emptied out the openwrt section in timesave script, which wasn't called anymore

Conflicts:
	piratebox/piratebox/bin/timesave.sh
2013-11-29 17:44:03 +01:00
Matthias Strubel 7fd7840ff4 Generating lease-file location based on config file. Place it on OpenWRT into /tmp => memory
Conflicts:
	CHANGELOG
2013-11-29 17:42:22 +01:00
Matthias Strubel c1e5a9c351 Changes for enabling working IPv6 configuration and Mesh-Node configs 2013-10-09 12:18:19 +02:00
Matthias Strubel a20db8f526 moved Config entry from timesave to piratebox.conf
emptied out the openwrt section in timesave script, which wasn't called anymore

Conflicts:
	piratebox/piratebox/bin/timesave.sh
2013-08-26 09:30:47 +02:00
Matthias Strubel b3d602af8b Merge commit '93060d55a91aab41448a963e015eb22082c38693' into rpi_support 2013-08-26 08:59:46 +02:00
Matthias Strubel 0d0c37f3d4 Generating lease-file location based on config file. Place it on OpenWRT into /tmp => memory
Conflicts:
	CHANGELOG
2013-08-26 08:13:34 +02:00
Matthias Strubel cafbbb8cea moved Config entry from timesave to piratebox.conf
emptied out the openwrt section in timesave script, which wasn't called anymore
2013-08-16 09:33:26 +02:00
Matthias Strubel 5a5f3acce9 Generating lease-file location based on config file. Place it on OpenWRT into /tmp => memory 2013-08-11 17:09:03 +02:00
dsbrooks b5484ba742 Changes
+ piratebox.conf and psogen.py have been updated to reflect some css
syntax changes
+ index.html has had the 'welcome' section removed in favor of an
'about' link at the top
+ index.html has had some minor restructuring to clean up the code
+ style.css has been cleaned up and reorganized
2013-07-05 17:12:18 +09:00
Matthias Strubel 1aacd6fc2c first implementation of IRC Server miniircd 2013-04-09 08:02:05 +02:00
Cale Black aec8029741 Merge https://github.com/MaStr/PirateBoxScripts_Webserver into No_OpenWRT
Updated to latest before removing all openwrt
2013-04-08 13:11:50 -06:00
Matthias Strubel e4506e7b34 Adding Device-Probe option to scripts to fix #38 issue 2013-02-26 20:35:07 +01:00
Cale Black c3b2dc6e8f Clean out unnecessary OpenWRT things. 2013-02-18 14:25:59 -07:00
Matthias Strubel 3b1e08a7f1 proper generation of environment vars
new  handling of broadcast destinations
workingsimple global chatbox ... init.d integration still missing
2012-12-26 09:51:59 +01:00
Matthias Strubel 38d081d3c3 Severall fixes 2012-11-09 08:01:00 +01:00
Matthias Strubel 1c4e87b1f2 Lib folder
Environment stuff added
more config for global shoutbox
2012-11-01 22:47:36 +01:00
Matthias Strubel a62def008f Use lighttpd-user for droopy on default. Disable this for OpenWRT 2012-10-05 21:55:56 +02:00
Matthias Strubel 506a957299 make upload optional #13 2012-06-15 18:09:03 +02:00
Matthias Strubel 1018467015 Adding Config File for user config #11 2012-06-15 18:03:51 +02:00
Matthias Strubel f67a60b38a changed and added interface binding on dnsmasq 2012-06-09 10:04:42 +02:00
Matthias Strubel 7da964d696 fixes permissions 2012-06-09 09:56:25 +02:00
Matthias Strubel bc2bb41dd6 Added first bunch of modification for generating the config files for dnsmasq
and preparing stuff for  #4
2012-06-08 23:20:51 +02:00
Matthias Strubel 4aa23c3f61 Changed path stuff 2012-05-13 09:55:03 +02:00
Matthias Strubel 15470c4d3e Possibility to run droopy with lighttpd user 2012-04-26 22:26:48 +02:00
Matthias Strubel 0f70c4d85c New droopy Version for #3 2012-04-26 21:46:03 +02:00