Commit Graph

614 Commits

Author SHA1 Message Date
Holger Weiss 73e945fd1d mod_http_upload_quota: Omit info message
The mod_http_upload_quota module attempts to delete a directory whenever
it removes a file from that directory.  However, if thumbnail creation
is enabled, directories will often contain two files.  Therefore, don't
log an info (but only a debug) message if directory removal fails.
2016-01-11 23:50:14 +01:00
Holger Weiss 1ee63657ac mod_http_upload: Don't complain during shutdown
Ignore the case where, for some reason, no process is found to be
stopped.

Closes #810.
2016-01-11 23:50:14 +01:00
Holger Weiss 9cd4e405c8 mod_http_upload: Use binary strings in most places
Switch to binary strings to fix a type issue, and for consistency.
2016-01-11 23:50:12 +01:00
Holger Weiss 5359525d3c mod_http_upload: Check availability of ImageMagick
Log an error message during startup if the thumbnail option is enabled
but ImageMagick is not installed.
2016-01-11 23:50:12 +01:00
Holger Weiss d46ee127e7 mod_http_upload: Suppress error on non-image files
Don't log an error (but only a debug) message if ImageMagick fails to
indentify the file type for thumbnail creation.  The image might be
encrypted, or it could be a non-image file.
2016-01-11 23:50:12 +01:00
Holger Weiss 0b4e0e720e mod_http_upload: Fix string()/binary() type issue 2016-01-11 23:50:12 +01:00
Holger Weiss 08f7291a24 mod_http_upload: Add/fix function specifications 2016-01-11 23:50:12 +01:00
Holger Weiss d29795fb24 mod_http_upload: Strip newline from command output
The list_to_integer/1 function doesn't cope with trailing newline
characters.
2016-01-11 23:50:12 +01:00
Holger Weiss f6b66cd130 mod_http_upload: Support thumbnail generation
Import thumbnail support from the mod_http_upload version shipped with
ejabberd.
2016-01-11 23:50:03 +01:00
Badlop 0d2fa84c8a Update mod_rest as xml_stream:parse_element requires binary (#138) 2015-12-29 13:25:04 +01:00
Paweł Chmielowski ecf8db140d Merge pull request #141 from dunglas/patch-1
[doc] Mention to run modules_update_specs first
2015-12-23 13:33:58 +01:00
Kévin Dunglas 5ccefb0e9e [doc] Mention to run modules_update_specs first 2015-12-23 13:32:09 +01:00
Leon-SFS 55f08f9b43 change refer url for MOD_ARCHIVE_ODBC
change refer url for MOD_ARCHIVE_ODBC , the old url is not found.
2015-12-13 13:07:26 +03:30
Holger Weiss 195daf9fa1 Note that ejabberd 15.10 includes mod_http_upload
Closes #137.
2015-11-13 17:51:11 +01:00
Holger Weiss 567e19728c mod_http_upload: Remove outdated note from README
There's now a default value for the "docroot" option.
2015-11-04 00:54:59 +01:00
Holger Weiss 1ee52e2e42 mod_http_upload: Fix function specification 2015-10-26 22:39:58 +01:00
Holger Weiss c173ae9f36 mod_http_upload.yml: Enable mod_http_upload_quota
Enable the mod_http_upload_quota module in the default configuration
snippet for mod_http_upload.  The module won't actually delete any files
without additional configuration entries, though.
2015-10-25 01:32:41 +02:00
Holger Weiss 4b0b66cfbf mod_http_upload: Apply minor cosmetic changes 2015-10-25 01:25:30 +02:00
Holger Weiss 9337b3ea39 mod_http_upload: Add Nginx configuration snippet
Include an example configuration snippet that shows how to tell Nginx to

1) proxy the HTTP PUT requests to mod_http_upload, and to
2) serve the HTTP GET requests directly.
2015-10-25 01:18:20 +02:00
Holger Weiss dd34fc63c8 mod_http_upload_quota: Log unexpected 'sweep'
Log an error message if the mod_http_upload_quota process receives a
'sweep' message despite the "max_days" option not being specified.
2015-10-25 00:56:05 +02:00
Holger Weiss 1ff5cbc467 mod_http_upload: Log descriptive error messages
Let file:format_error/1 translate error reasons into descriptive
strings.
2015-10-25 00:21:31 +02:00
Holger Weiss 4936e82bd1 mod_http_upload: Fix error message format string
The store_file/4 function might return non-string error information.
2015-10-25 00:18:11 +02:00
Holger Weiss eeba72cd4c mod_http_upload_quota: Fix "max_days" expiry run
Use the path names of old files to delete them (instead of the tuples
returned by the gather_file_info/1 function).
2015-10-24 23:49:02 +02:00
Holger Weiss 655f195e9d mod_http_upload_quota: Use timer for "max_days"
Simplify the code by using the timer module instead of the gen_server
timeout to trigger the "max_days" expiry run.
2015-10-24 23:23:26 +02:00
Holger Weiss 3652dd1796 mod_http_upload_quota: Mark unused variables 2015-10-24 18:31:16 +02:00
Holger Weiss b88e766571 mod_http_upload_quota: Don't forget to set timeout 2015-10-24 18:26:32 +02:00
Holger Weiss d4d5200c5b mod_http_upload_quota: Apply minor improvement 2015-10-24 16:35:04 +02:00
Holger Weiss e5eef02b25 mod_http_upload: Improve description of quotas 2015-10-24 16:33:26 +02:00
Holger Weiss c37387984a mod_http_upload: Apply minor cosmetic changes 2015-10-22 22:50:39 +02:00
Holger Weiss 511f0fa03d README.txt: Don't mention ejabberd.yml file
Modules are usually configured in separate configuration files, these
days.
2015-10-22 22:42:20 +02:00
Holger Weiss 157fd94c32 README.txt: Remove link to alternative protocol
Some users incorrectly assumed that mod_http_upload implements the
referenced protocol.
2015-10-22 22:24:34 +02:00
Holger Weiss 7c61eef522 mod_http_upload: Add support for user quotas
The new mod_http_upload_quota module implements two features:

- When a "hard quota" is exceeded during a file upload, old files are
  removed until the disk usage equals or falls below the "soft quota".

- Once a day, all uploaded files (and directories) older than a
  configurable number of days are deleted.
2015-10-22 21:52:13 +02:00
Holger Weiss 8a849069ec mod_http_upload: Add slot request hook
Let mod_http_upload run an 'http_upload_slot_request' hook.  If 'deny'
or an error element is returned, the request is rejected; if 'allow' is
returned, it is accepted.
2015-10-22 18:29:19 +02:00
Holger Weiss 14c3b13a11 mod_http_upload: Increase the upload slot timeout
If a large file was uploaded over a slow connection, the slot might've
timed out before the upload was completed.
2015-10-21 23:25:30 +02:00
Badlop 5964ad412e Use homogeneous s2s connections stats (processone/ejabberd#761) 2015-10-21 12:51:52 +02:00
Holger Weiss 6dc35e8fcb mod_http_upload: Fix function specification
The mod_opt_type/1 function can return the list of option names.
2015-10-13 22:49:46 +02:00
badlop 9aa4cd41fe Merge pull request #125 from michaelansel/fix-ircd
Fix IRCd module to work on modern ejabberd
2015-10-05 11:22:01 +02:00
Badlop 0451576fcb Add policy to commands definitions (#123) 2015-10-02 13:52:27 +02:00
Badlop 0cade69713 Define accepted module options 2015-10-02 13:51:23 +02:00
Holger Weiss a1fe316565 mod_http_upload: Update function specification
The handle_call/3 function now responds to some requests.
2015-10-01 00:57:41 +02:00
Holger Weiss f58db83523 mod_http_upload: Update required ejabberd version
The mod_http_upload module calls ejabberd_config:may_hide_data/1 which
was introduced in ejabberd 15.06.
2015-09-28 19:29:39 +02:00
Holger Weiss a36515d74d mod_http_upload: Also start 'asn1' application
If an HTTPS service_url is specified, start the 'asn1' application as
well, as 'public_key' depends on it.

Once mod_http_upload requires Erlang/OTP R16B02 or newer, we can use the
following calls instead:

	{ok, _} = application:ensure_all_started(inets),
	{ok, _} = application:ensure_all_started(ssl).
2015-09-25 17:05:18 +02:00
Holger Weiss de035cefff mod_http_upload: Correct error message 2015-09-25 13:29:07 +02:00
Michael Ansel e2a85ef9ad Fixed enough to join/send/receive/topic in groupchats 2015-09-23 21:21:26 -07:00
Badlop ce4c11f5fe Add mod_opt_type function (#121) 2015-09-16 10:32:42 +02:00
Badlop 2cfe253b9b In yml config, use # as comment instead of ; (#121) 2015-09-16 10:23:24 +02:00
Badlop e5d66210f0 Fix comment character encoding (thanks to Evgeniy)(#121) 2015-09-15 16:53:19 +02:00
Holger Weiss 6ca6f021cc mod_http_upload: Handle HEAD and OPTIONS requests 2015-09-14 21:58:38 +02:00
Holger Weiss 645d29a264 mod_http_upload: Suggest cron jobs in README.txt
Admins might want to set up cron jobs to remove old uploaded files.
2015-09-14 01:47:14 +02:00
Holger Weiss 5142174b98 mod_http_upload: Mention Django app in README.txt
Mention the Django app written by Mathias Ertl as an example of a
service that can be used together with mod_http_upload.
2015-09-14 01:13:07 +02:00