Merge branch 'umami-software:master' into master

This commit is contained in:
Didier Krux 2023-07-14 17:29:30 +01:00 committed by GitHub
commit 9eacdeda0e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
417 changed files with 14718 additions and 5675 deletions

View file

@ -2,15 +2,13 @@
require('dotenv').config();
const pkg = require('./package.json');
const CLOUD_URL = 'https://cloud.umami.is';
const contentSecurityPolicy = `
default-src 'self';
img-src *;
script-src 'self' 'unsafe-eval';
style-src 'self' 'unsafe-inline';
connect-src 'self' api.umami.is;
frame-ancestors 'self';
frame-ancestors 'self' ${process.env.ALLOWED_FRAME_URLS};
`;
const headers = [
@ -65,7 +63,7 @@ const redirects = [
},
];
if (process.env.CLOUD_MODE && process.env.DISABLE_LOGIN && process.env.CLOUD_URL) {
if (process.env.CLOUD_MODE && process.env.CLOUD_URL && process.env.DISABLE_LOGIN) {
redirects.push({
source: '/login',
destination: process.env.CLOUD_URL,