Merge branch 'develop'
This commit is contained in:
commit
004e797f72
@ -1,60 +1,66 @@
|
||||
{
|
||||
app: {
|
||||
name: 'ily.li',
|
||||
contact_email: 'contact@ily.li',
|
||||
},
|
||||
log_level: "DEV",
|
||||
db_log_level: "ERROR",
|
||||
public_url: "http://localhost:4899",
|
||||
public_websocket_url: "ws://localhost:4899",
|
||||
port: 4899,
|
||||
mysql: {
|
||||
connectionLimit: 10,
|
||||
host: "localhost",
|
||||
user: "root",
|
||||
password: "",
|
||||
database: "ilyli",
|
||||
create_database_automatically: false,
|
||||
},
|
||||
redis: {
|
||||
host: "127.0.0.1",
|
||||
port: 6379,
|
||||
prefix: 'ilyli',
|
||||
},
|
||||
session: {
|
||||
cookie: {
|
||||
secure: false,
|
||||
},
|
||||
},
|
||||
mail: {
|
||||
host: "127.0.0.1",
|
||||
port: "1025",
|
||||
secure: false,
|
||||
username: "",
|
||||
password: "",
|
||||
allow_invalid_tls: true,
|
||||
from: 'contact@ily.li',
|
||||
from_name: 'ily.li',
|
||||
},
|
||||
view: {
|
||||
cache: false,
|
||||
},
|
||||
magic_link: {
|
||||
validity_period: 20,
|
||||
},
|
||||
newlyGeneratedSlugSize: 3,
|
||||
default_file_ttl: 30, // 30 seconds
|
||||
max_upload_size: 16, // MB
|
||||
max_hotlink_size: 1, // MB
|
||||
approval_mode: false,
|
||||
domain: 'localhost',
|
||||
allowed_url_domains: [
|
||||
'localhost:4899',
|
||||
'127.0.0.1:4899',
|
||||
],
|
||||
default_url_domain_for_files: 0,
|
||||
default_url_domain_for_urls: 1,
|
||||
|
||||
// 1 hour in ms
|
||||
delete_old_files_interval: 3600000,
|
||||
app: {
|
||||
name: 'ily.li',
|
||||
contact_email: 'contact@ily.li',
|
||||
},
|
||||
log_level: "DEV",
|
||||
db_log_level: "ERROR",
|
||||
public_url: "http://localhost:4899",
|
||||
public_websocket_url: "ws://localhost:4899",
|
||||
port: 4899,
|
||||
mysql: {
|
||||
connectionLimit: 10,
|
||||
host: "localhost",
|
||||
user: "root",
|
||||
password: "",
|
||||
database: "ilyli",
|
||||
create_database_automatically: false,
|
||||
},
|
||||
redis: {
|
||||
host: "127.0.0.1",
|
||||
port: 6379,
|
||||
prefix: 'ilyli',
|
||||
},
|
||||
session: {
|
||||
cookie: {
|
||||
secure: false,
|
||||
},
|
||||
},
|
||||
mail: {
|
||||
host: "127.0.0.1",
|
||||
port: "1025",
|
||||
secure: false,
|
||||
username: "",
|
||||
password: "",
|
||||
allow_invalid_tls: true,
|
||||
from: 'contact@ily.li',
|
||||
from_name: 'ily.li',
|
||||
},
|
||||
view: {
|
||||
cache: false,
|
||||
},
|
||||
magic_link: {
|
||||
validity_period: 20,
|
||||
},
|
||||
auth: {
|
||||
approval_mode: false,
|
||||
// 30 days
|
||||
name_change_wait_period: 2592000000,
|
||||
},
|
||||
newlyGeneratedSlugSize: 3,
|
||||
// 30 seconds
|
||||
default_file_ttl: 30,
|
||||
// MB
|
||||
max_upload_size: 16,
|
||||
// MB
|
||||
max_hotlink_size: 1,
|
||||
domain: 'localhost',
|
||||
allowed_url_domains: [
|
||||
'localhost:4899',
|
||||
'127.0.0.1:4899',
|
||||
],
|
||||
default_url_domain_for_files: 0,
|
||||
default_url_domain_for_urls: 1,
|
||||
// 1 hour in ms
|
||||
delete_old_files_interval: 3600000,
|
||||
}
|
||||
|
@ -1,32 +1,36 @@
|
||||
{
|
||||
log_level: "DEBUG",
|
||||
db_log_level: "ERROR",
|
||||
public_url: 'https://ily.li',
|
||||
public_websocket_url: 'wss://ily.li',
|
||||
session: {
|
||||
cookie: {
|
||||
secure: true
|
||||
},
|
||||
},
|
||||
mail: {
|
||||
secure: true,
|
||||
allow_invalid_tls: false
|
||||
},
|
||||
magic_link: {
|
||||
validity_period: 900,
|
||||
},
|
||||
newlyGeneratedSlugSize: 5,
|
||||
default_file_ttl: 2592000, // 30 days
|
||||
max_upload_size: 8192, // MB
|
||||
max_hotlink_size: 128, // MB
|
||||
approval_mode: true,
|
||||
domain: 'ily.li',
|
||||
allowed_url_domains: [
|
||||
'ily.li',
|
||||
],
|
||||
default_url_domain_for_files: 0,
|
||||
default_url_domain_for_urls: 0,
|
||||
|
||||
// 1 day in ms
|
||||
delete_old_files_interval: 86400000
|
||||
log_level: "DEBUG",
|
||||
db_log_level: "ERROR",
|
||||
public_url: 'https://ily.li',
|
||||
public_websocket_url: 'wss://ily.li',
|
||||
session: {
|
||||
cookie: {
|
||||
secure: true
|
||||
},
|
||||
},
|
||||
mail: {
|
||||
secure: true,
|
||||
allow_invalid_tls: false
|
||||
},
|
||||
magic_link: {
|
||||
validity_period: 900,
|
||||
},
|
||||
newlyGeneratedSlugSize: 5,
|
||||
// 30 days
|
||||
default_file_ttl: 2592000,
|
||||
// MB
|
||||
max_upload_size: 8192,
|
||||
// MB
|
||||
max_hotlink_size: 128,
|
||||
auth: {
|
||||
approval_mode: true,
|
||||
},
|
||||
domain: 'ily.li',
|
||||
allowed_url_domains: [
|
||||
'ily.li',
|
||||
],
|
||||
default_url_domain_for_files: 0,
|
||||
default_url_domain_for_urls: 0,
|
||||
// 1 day in ms
|
||||
delete_old_files_interval: 86400000
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "ily.li",
|
||||
"version": "1.0.0",
|
||||
"version": "1.0.1",
|
||||
"description": "Self-hosted file pusher",
|
||||
"repository": "https://eternae.ink/arisu/ily.li",
|
||||
"author": "Alice Gaudon <alice@gaudon.pro>",
|
||||
|
@ -1,6 +1,5 @@
|
||||
import Migration from "swaf/db/Migration";
|
||||
import FileModel from "../models/FileModel";
|
||||
import {logger} from "swaf/Logger";
|
||||
|
||||
export default class ReplaceTtlWithExpiresAtFilesTable extends Migration {
|
||||
public async install(): Promise<void> {
|
||||
@ -9,7 +8,6 @@ export default class ReplaceTtlWithExpiresAtFilesTable extends Migration {
|
||||
|
||||
const files = await FileModel.select().get();
|
||||
for (const file of files) {
|
||||
logger.debug(file);
|
||||
if (file.created_at && typeof file.ttl === 'number' && file.ttl > 0) {
|
||||
file.expires_at = new Date(file.created_at.getTime() + file.ttl * 1000);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user