mirror of
https://git.asonix.dog/asonix/pict-rs
synced 2024-12-22 19:31:35 +00:00
Support latest ffmpeg, imagemagick releases
This commit is contained in:
parent
32045d2bef
commit
2e851575d8
4 changed files with 11 additions and 7 deletions
|
@ -5,5 +5,5 @@ addr = '0.0.0.0:8080'
|
||||||
type = 's3_store'
|
type = 's3_store'
|
||||||
bucket_name = 'pict-rs'
|
bucket_name = 'pict-rs'
|
||||||
region = 'http://minio:9000'
|
region = 'http://minio:9000'
|
||||||
access_key = '09ODZ3BGBISV4U92JLIM'
|
access_key = 'XZEZ5B8Y3UCINU1KCVF6'
|
||||||
secret_key = 'j35YE9RrxhBP0dpiD5mmdXRXvPkEJR4k6zK12q3o'
|
secret_key = 'cWbE5LcCK9YH8j1NvhOZocl+vH+b6T5Zvy3z+BZu'
|
||||||
|
|
|
@ -8,12 +8,14 @@
|
||||||
<policy domain="resource" name="disk" value="1GiB" />
|
<policy domain="resource" name="disk" value="1GiB" />
|
||||||
<policy domain="resource" name="file" value="768" />
|
<policy domain="resource" name="file" value="768" />
|
||||||
<policy domain="resource" name="thread" value="2" />
|
<policy domain="resource" name="thread" value="2" />
|
||||||
|
<policy domain="path" rights="none" pattern="@*" />
|
||||||
<policy domain="coder" rights="none" pattern="*" />
|
<policy domain="coder" rights="none" pattern="*" />
|
||||||
<policy domain="coder" rights="read | write" pattern="{GIF,JPEG,PNG,WEBP,MP4,TMP,PAM}" />
|
<policy domain="coder" rights="read | write" pattern="{GIF,JPEG,PNG,WEBP,MP4,TMP,PAM}" />
|
||||||
|
<policy domain="delegate" rights="none" pattern="*" />
|
||||||
|
<policy domain="delegate" rights="execute" pattern="ffmpeg" />
|
||||||
<policy domain="filter" rights="none" pattern="*" />
|
<policy domain="filter" rights="none" pattern="*" />
|
||||||
<policy domain="path" rights="none" pattern="@*" />
|
|
||||||
<policy domain="module" rights="none" pattern="*" />
|
<policy domain="module" rights="none" pattern="*" />
|
||||||
<policy domain="module" rights="read | write" pattern="{GIF,JPEG,PNG,WEBP,MP4,TMP,PAM}" />
|
<policy domain="module" rights="read | write" pattern="{GIF,JPEG,PNG,WEBP,TMP,PAM,VIDEO}" />
|
||||||
<!-- indirect reads not permitted -->
|
<!-- indirect reads not permitted -->
|
||||||
<policy domain="system" name="precision" value="6" />
|
<policy domain="system" name="precision" value="6" />
|
||||||
</policymap>
|
</policymap>
|
||||||
|
|
|
@ -8,12 +8,14 @@
|
||||||
<policy domain="resource" name="disk" value="1GiB" />
|
<policy domain="resource" name="disk" value="1GiB" />
|
||||||
<policy domain="resource" name="file" value="768" />
|
<policy domain="resource" name="file" value="768" />
|
||||||
<policy domain="resource" name="thread" value="2" />
|
<policy domain="resource" name="thread" value="2" />
|
||||||
|
<policy domain="path" rights="none" pattern="@*" />
|
||||||
<policy domain="coder" rights="none" pattern="*" />
|
<policy domain="coder" rights="none" pattern="*" />
|
||||||
<policy domain="coder" rights="read | write" pattern="{GIF,JPEG,PNG,WEBP,MP4,TMP,PAM}" />
|
<policy domain="coder" rights="read | write" pattern="{GIF,JPEG,PNG,WEBP,MP4,TMP,PAM}" />
|
||||||
|
<policy domain="delegate" rights="none" pattern="*" />
|
||||||
|
<policy domain="delegate" rights="execute" pattern="ffmpeg" />
|
||||||
<policy domain="filter" rights="none" pattern="*" />
|
<policy domain="filter" rights="none" pattern="*" />
|
||||||
<policy domain="path" rights="none" pattern="@*" />
|
|
||||||
<policy domain="module" rights="none" pattern="*" />
|
<policy domain="module" rights="none" pattern="*" />
|
||||||
<policy domain="module" rights="read | write" pattern="{GIF,JPEG,PNG,WEBP,MP4,TMP,PAM}" />
|
<policy domain="module" rights="read | write" pattern="{GIF,JPEG,PNG,WEBP,TMP,PAM,VIDEO}" />
|
||||||
<!-- indirect reads not permitted -->
|
<!-- indirect reads not permitted -->
|
||||||
<policy domain="system" name="precision" value="6" />
|
<policy domain="system" name="precision" value="6" />
|
||||||
</policymap>
|
</policymap>
|
||||||
|
|
|
@ -44,7 +44,7 @@ impl ThumbnailFormat {
|
||||||
|
|
||||||
fn as_format(&self) -> &'static str {
|
fn as_format(&self) -> &'static str {
|
||||||
match self {
|
match self {
|
||||||
ThumbnailFormat::Jpeg => "singlejpeg",
|
ThumbnailFormat::Jpeg => "image2",
|
||||||
// ThumbnailFormat::Webp => "webp",
|
// ThumbnailFormat::Webp => "webp",
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue