Commit Graph

74 Commits

Author SHA1 Message Date
Travis Burtrum c82f00c288 Add support for uploading/downloading to/from subdirectories 2015-08-27 00:41:31 -04:00
Daniel Gultsch b7f8d3f218 Merge pull request #38 from QuentinC/master
Moved config file to example
2015-08-19 16:45:00 +02:00
Daniel Gultsch f6b3a94652 Merge pull request #40 from deoren/init-script-include-file-order
Reference include file before exporting $USER
2015-08-19 16:44:47 +02:00
Daniel Gultsch 140db849f7 Merge pull request #41 from deoren/patch-1
Fixed typo
2015-08-19 16:44:41 +02:00
Deoren Moor 449671f5d1 Fixed typo
Fixed a minor spelling mistake.
2015-08-19 09:13:15 -05:00
Deoren Moor 89e54ac90a Reference include file before exporting $USER
We should check for and pull in the include file before exporting `$USER` in case the user has opted to override the default setting.
2015-08-19 08:59:11 -05:00
Quentin Canel a662b2fe46 Added config.yml to .gitignore 2015-08-17 16:37:07 +02:00
Quentin Canel c8ed050378 Moved config.yml 2015-08-17 15:50:04 +02:00
Daniel Gultsch 3beabfcc9f Merge pull request #33 from chaotix-/barejidwhitelist
Allow bare jids (users) in whitelist
2015-08-14 12:56:08 +02:00
Daniel Gultsch 5e7a126169 Merge pull request #35 from Scheirle/apache_proxy
Adds example apache proxy configuration
2015-08-14 12:55:55 +02:00
Bernhard Scheirle b29e8daffd Adds example apache proxy configuration 2015-08-07 16:07:50 +02:00
Daniel Gultsch 02e970659f Merge pull request #34 from noonien-d/master
complete identity information for service discovery
2015-08-05 18:46:48 +02:00
Ferdinand Stehle 976f9e429e add identity for service discovery 2015-08-05 18:38:07 +02:00
Lars Bensmann d7badc97fe Allow bare jids (users) in whitelist
Allow more fine-grained control via the whitelist feature.
2015-08-04 14:40:48 +02:00
Daniel Gultsch aeda6ac875 Merge pull request #31 from deoren/init-script-allow-overrides
Fixed placement of inclusion of overrides file
2015-08-03 10:13:03 +02:00
Daniel Gultsch 6eb215731f Merge pull request #30 from djmaze/patch-1
Fix typo in prosody config snippet
2015-08-03 10:12:58 +02:00
Deoren Moor 194fbe3776 Fixed placement of inclusion of overrides file
In the last commit I mistakenly placed the inclusion of the "overrides" file _after_ the $DAEMON variable test instead of before it as I meant to do.
2015-08-03 00:51:21 -05:00
Martin Honermeyer 64e34a76a5 Fix typo in prosody config snippet 2015-08-03 00:26:50 +02:00
Daniel Gultsch 01de7e8e1a Merge pull request #28 from kriztan/patch-2
update readme to match with renamed config variables
2015-08-02 23:18:50 +02:00
Daniel Gultsch e924b94991 Merge pull request #29 from deoren/init-script-allow-overrides
Update init script to reference /etc/default file
2015-08-02 23:18:09 +02:00
Deoren Moor 6f2a9f4a02 Update init script to reference /etc/default file
Instead of requiring the user to modify the /etc/init.d/httpuploadcomponent file, the init.d script should support checking for and including the corresponding /etc/default/httpuploadcomponent conf file (if present). This will allow the user to customize the settings for the daemon to match their specific environment.

References:

- https://www.debian.org/doc/debian-policy/ch-opersys.html
2015-08-02 13:27:37 -05:00
Christian S. c097e378a6 update readme to match with renamed config variables 2015-08-02 11:23:37 +02:00
Daniel Gultsch 8c5cca8a0a bugfix 2015-07-29 01:02:24 +02:00
Daniel Gultsch ceaa132978 fixed typo 2015-07-28 22:17:28 +02:00
Daniel Gultsch 48de2ee744 use new config value names in server 2015-07-28 22:16:32 +02:00
Daniel Gultsch 2065637778 renamed a few config variables 2015-07-28 22:11:49 +02:00
Daniel Gultsch fe8b957f2f Merge pull request #25 from evildad/master
fix missing imports
2015-07-28 21:50:24 +02:00
evildad 62e78d3061 Update server.py 2015-07-28 21:48:00 +02:00
Daniel Gultsch 6ea1a86e24 Merge pull request #23 from chaotix-/remove-old-uploads
Add expiry and user quotas
2015-07-28 19:40:39 +02:00
Lars Bensmann f4b4284536 Add expiry and user quotas
Expiry and user quotas are controlled by four config options:

```expire_interval``` determines how often (in seconds) files should be
deleted. As every expiry run needs to check all uploaded files of all
users this should not be set too small.

Files older than ```expire_maxage``` (in seconds) will be deleted by an
expiry run. Set this to ```0``` to disable deletions based on file age.

After an expiry run at most ```user_quota_soft``` space (in bytes) will be
occupied per user. The oldest files will be deleted first until the occupied
space is less than ```user_quota_soft```. Set this to ```0``` to disable
file deletions based on a users occupied space.

```user_quota_hard``` sets a hard limit how much space (in bytes) a user
may occupy. If an upload would make his files exceed this size it will be
rejected. This setting is not dependend on ```expire_interval```. Set
this to ```0``` to disable upload rejection based on occupied space.

```expire_maxage``` and ```user_quota_soft``` depend on ```expire_interval```.

```user_quota_hard``` is honoured even without expiry runs. But some kind
of expiry is recommended otherwise a user will not be able to upload
anymore files once his hard quota is reached.

The difference between ```user_quota_hard``` and ```user_quota_soft```
determines how much a user may upload per ```expire_interval```.
2015-07-28 00:07:07 +02:00
Daniel Gultsch 50e1afa2ba Merge pull request #20 from SamWhited/crontab
Add a cronjob example to remove old files
2015-07-27 13:17:27 +02:00
Daniel Gultsch 2f0fec6c7f Merge pull request #22 from chaotix-/mime-content-disposition
Just send Content-disposition: attachment-Header if content is no image
2015-07-27 13:16:54 +02:00
Lars Bensmann 5ede0f9a7a Just send Content-disposition: attachment-Header if content is no image
Content-disposition: attachment prevents most code to be executed in the
browser (Java being an exception), but this is not needed for images and
makes viewing images in clients that don't show the pictures inline even
more complicated.

(Also this PR removes unused imports).
2015-07-26 20:51:18 +02:00
Sam Whited 24b6a11970 Add a cronjob example to remove old files 2015-07-26 09:34:55 -05:00
Daniel Gultsch 6d8993145b Merge branch 'master' of github.com:siacs/HttpUploadComponent 2015-07-24 17:48:14 +02:00
Daniel Gultsch 96b39250b2 fixed small files not working 2015-07-24 17:46:32 +02:00
Daniel Gultsch 2678c0d2b8 Merge pull request #16 from SamWhited/head_fix
Don't duplicate HEAD/GET response code
2015-07-23 10:02:20 +02:00
Daniel Gultsch bd4e1e4c5a Merge pull request #15 from SamWhited/mime_types
Set content-type header based on mime-type
2015-07-23 10:01:57 +02:00
Daniel Gultsch db06e3edfc Merge pull request #14 from SamWhited/fix_file_leak
Fix a file handle leak
2015-07-23 10:01:30 +02:00
Daniel Gultsch 958aec3da6 Merge pull request #12 from SamWhited/better_file_not_found_error
Add proper error for FileNotFoundError in Python 2
2015-07-23 10:01:19 +02:00
Daniel Gultsch 16cd830cc5 Merge pull request #13 from SamWhited/readme_cleanup
Cleanup readme
2015-07-23 10:00:59 +02:00
Sam Whited 5a0566688a Don't duplicate HEAD/GET response code 2015-07-23 00:43:36 -05:00
Sam Whited 63124a3026 Set content-type header based on mime-type
Fixes #7
2015-07-22 22:42:28 -05:00
Sam Whited f397219c27 Fix a file handle leak 2015-07-22 22:21:28 -05:00
Sam Whited 50f0a6fec6 Add proper error for FileNotFoundError in Python 2 2015-07-22 22:10:52 -05:00
Sam Whited 2546769fb4 Cleanup readme 2015-07-22 21:30:57 -05:00
Daniel Gultsch 7f6be7e97a mention the contrib directory in the readme 2015-07-22 11:31:09 +02:00
Daniel Gultsch f528a250f1 added prosody example config snippet 2015-07-22 11:28:50 +02:00
Daniel Gultsch ed0f876970 make sure we use same domain across different examples 2015-07-22 10:58:38 +02:00
Daniel Gultsch 4d547d5f20 Merge pull request #11 from SamWhited/patch-2
Create nginx_site_example
2015-07-22 10:51:44 +02:00