Skip to content

Commit 1cf0a5e

Browse files
overheadhunteroverheadhunter
committed
Merge branch 'develop' into feature/paddle-migration
# Conflicts: # assets/js/const.dev.js # assets/js/const.prod.js # hugo.toml
2 parents e99aa15 + 0871c5f commit 1cf0a5e

File tree

13 files changed

+230
-199
lines changed

13 files changed

+230
-199
lines changed

‎assets/js/const.dev.js

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎assets/js/const.prod.js

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎assets/js/const.template.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
"use strict";
2+
3+
const BASE_API_URL = '{{ .Site.Params.baseApiUrl }}';
4+
const PADDLE_ENABLE_SANDBOX = {{ .Site.Params.paddleEnableSandbox }};
5+
const PADDLE_TOKEN = {{ .Site.Params.paddleToken }};
6+
const PADDLE_VENDOR_ID = {{ .Site.Params.paddleVendorId }};
7+
const PADDLE_DESKTOP_PRICE_IDS = {{ .Site.Params.paddleDesktopPriceIds | jsonify }};
8+
const PADDLE_ANDROID_PRICE_ID = {{ .Site.Params.paddleAndroidPriceId }};
9+
const PADDLE_HUB_SELF_HOSTED_SUBSCRIPTION_PLAN_ID = {{ .Site.Params.paddleHubSelfHostedSubscriptionPlanId }};
10+
const PADDLE_HUB_MANAGED_SUBSCRIPTION_PLAN_ID = {{ .Site.Params.paddleHubManagedSubscriptionPlanId }};
11+
const PADDLE_PRICES_URL = '{{ .Site.Params.paddlePricesUrl }}';
12+
const STORE_API_URL = '{{ .Site.Params.storeApiUrl }}';
13+
const STRIPE_PK = '{{ .Site.Params.stripePk }}';
14+
const STRIPE_PLANS = {{ .Site.Params.stripePlans | jsonify }};

‎assets/js/hubsetup.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ EOF`;
428428
'init-config': {condition: 'service_completed_successfully'},
429429
'postgres': {condition: 'service_healthy'}
430430
},
431-
image: 'ghcr.io/cryptomator/keycloak:26.3.2.1',
431+
image: 'ghcr.io/cryptomator/keycloak:26.3.3',
432432
command: startCmd,
433433
volumes: ['kc-config:/opt/keycloak/data/import'],
434434
deploy: {
@@ -799,7 +799,7 @@ class KubernetesConfigBuilder extends ConfigBuilder {
799799
}],
800800
containers: [{
801801
name: 'keycloak',
802-
image: 'ghcr.io/cryptomator/keycloak:26.3.2.1',
802+
image: 'ghcr.io/cryptomator/keycloak:26.3.3',
803803
command: startCmd,
804804
ports: [{containerPort: 8080}],
805805
resources: {

‎config/_default/hugo.toml

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
baseURL = "https://cryptomator.org/"
2+
title = "Cryptomator"
3+
defaultContentLanguage = "en"
4+
enableemoji = true
5+
theme = ["hugo-admonitions"]
6+
7+
[languages]
8+
[languages.en]
9+
weight = 1
10+
languageName = "English"
11+
languageCode = "en-US"
12+
[languages.de]
13+
weight = 2
14+
languageName = "Deutsch"
15+
languageCode = "de-DE"
16+
17+
[build]
18+
[[build.cachebusters]]
19+
source = 'layouts/.*'
20+
target = 'css'
21+
22+
[outputs]
23+
home = ["HTML", "RSS"]
24+
section = ["HTML"]
25+
26+
[outputFormats]
27+
[outputFormats.RSS]
28+
mediatype = "application/rss"
29+
baseName = "feed"
30+
31+
[module]
32+
[[module.mounts]]
33+
source = "static"
34+
target = "static"
35+
36+
[[module.mounts]]
37+
source = "assets"
38+
target = "assets"
39+
40+
[[module.mounts]]
41+
source = "node_modules/@awesome.me/kit-628503cc21/icons/webfonts"
42+
target = "static/webfonts"
43+
44+
[[module.mounts]]
45+
source = "node_modules/jquery/dist"
46+
target = "assets/js/jquery"
47+
48+
[[module.mounts]]
49+
source = "node_modules/alpinejs/dist"
50+
target = "assets/js/alpinejs"
51+
52+
[[module.mounts]]
53+
source = "node_modules/lazysizes"
54+
target = "assets/js/lazysizes"
55+
56+
[[module.mounts]]
57+
source = "node_modules/js-yaml/dist"
58+
target = "assets/js/js-yaml"
59+
60+
[[module.mounts]]
61+
source = "node_modules/altcha/dist_external"
62+
target = "assets/js/altcha"
63+
64+
[[module.mounts]]
65+
source = "node_modules/mathjax/es5"
66+
target = "assets/js/mathjax"
67+
68+
[[module.mounts]]
69+
source = "node_modules/mathjax/es5/output/chtml/fonts/woff-v2"
70+
target = "static/webfonts/mathjax"
71+
72+
[markup]
73+
[markup.goldmark]
74+
[markup.goldmark.extensions]
75+
[markup.goldmark.extensions.passthrough]
76+
enable = true
77+
[markup.goldmark.extensions.passthrough.delimiters]
78+
block = [['\[', '\]'], ['$$', '$$']]
79+
inline = [['\(', '\)']]
80+
[markup.goldmark.renderer]
81+
unsafe = true
82+
[markup.goldmark.parser.attribute]
83+
block = true
84+
85+
[permalinks]
86+
blog = "/blog/:year/:month/:day/:slug/"
87+
88+
[server]
89+
[[server.headers]]
90+
for = '/**'
91+
[server.headers.values]
92+
Content-Security-Policy = "default-src 'none'; script-src 'self' 'unsafe-eval' https://umami.skymatic.de/ https://community.cryptomator.org/ https://js.stripe.com/ https://*.paddle.com/; style-src 'self' 'unsafe-inline' https://*.paddle.com/; img-src 'self' data: https://static.cryptomator.org/ https://*.paddle.com/ https://paddle.s3.amazonaws.com/ https://avatars.githubusercontent.com/; connect-src 'self' https://api.cryptomator.org/ https://store.cryptomator.org/ https://umami.skymatic.de/ https://*.paddle.com/ http://localhost/ http://localhost:8787/; font-src 'self'; media-src https://static.cryptomator.org/; frame-src https://community.cryptomator.org/ https://js.stripe.com/ https://*.paddle.com/; base-uri 'self'; form-action 'self' https://www.paypal.com/ https://www.coinpayments.net/; frame-ancestors 'none';"
93+
Strict-Transport-Security = "max-age=31536000; includeSubDomains"
94+
X-Content-Type-Options = "nosniff"

‎config/_default/params.toml

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
math = false # set to true in frontmatter if required
2+
3+
[releases]
4+
[releases.exe]
5+
version = "1.17.1"
6+
filename = "Cryptomator-1.17.1-x64.exe"
7+
downloadUrl = "https://github.com/cryptomator/cryptomator/releases/download/1.17.1/Cryptomator-1.17.1-x64.exe"
8+
signatureUrl = "https://github.com/cryptomator/cryptomator/releases/download/1.17.1/Cryptomator-1.17.1-x64.exe.asc"
9+
checksum = "a11dfcfc5bb9b032448292755a2229bb6cc181f4978864f8f4f0df626c4e6e69"
10+
requiredOS = 'Windows 10, Version 1803'
11+
[releases.msi]
12+
version = "1.17.1"
13+
filename = "Cryptomator-1.17.1-x64.msi"
14+
downloadUrl = "https://github.com/cryptomator/cryptomator/releases/download/1.17.1/Cryptomator-1.17.1-x64.msi"
15+
signatureUrl = "https://github.com/cryptomator/cryptomator/releases/download/1.17.1/Cryptomator-1.17.1-x64.msi.asc"
16+
checksum = "794435f090232a8af2d0e9fb770e02ce2d99326323433a46f4125cefb3e6713b"
17+
requiredOS = 'Windows 10, Version 1803'
18+
[releases.dmg]
19+
version = "1.17.1"
20+
filename = "Cryptomator-1.17.1.dmg"
21+
downloadUrl = "https://github.com/cryptomator/cryptomator/releases/download/1.17.1/Cryptomator-1.17.1-x64.dmg"
22+
signatureUrl = "https://github.com/cryptomator/cryptomator/releases/download/1.17.1/Cryptomator-1.17.1-x64.dmg.asc"
23+
checksum = "0111ad60e0a9749a63f11eb4eae183aaf05ceb6dde67b8c28bcc8b2447b86850"
24+
requiredOS = 'macOS 11'
25+
[releases.dmg-arm64]
26+
version = "1.17.1"
27+
filename = "Cryptomator-1.17.1-arm64.dmg"
28+
downloadUrl = "https://github.com/cryptomator/cryptomator/releases/download/1.17.1/Cryptomator-1.17.1-arm64.dmg"
29+
signatureUrl = "https://github.com/cryptomator/cryptomator/releases/download/1.17.1/Cryptomator-1.17.1-arm64.dmg.asc"
30+
checksum = "34c75e5f744bcedb96cf900a7e73ae96a5b39568a2e0994a1239fc59b31bc0d5"
31+
requiredOS = 'macOS 11'
32+
[releases.appimage]
33+
version = "1.17.1"
34+
filename = "cryptomator-1.17.1-x86_64.AppImage"
35+
downloadUrl = "https://github.com/cryptomator/cryptomator/releases/download/1.17.1/cryptomator-1.17.1-x86_64.AppImage"
36+
signatureUrl = "https://github.com/cryptomator/cryptomator/releases/download/1.17.1/cryptomator-1.17.1-x86_64.AppImage.asc"
37+
checksum = "290d30f81535483d01f1a799d380c90c2a194a0b6151418ac636f0f015d0372a"
38+
requiredOS = ''
39+
[releases.appimage-aarch64]
40+
version = "1.17.1"
41+
filename = "cryptomator-1.17.1-aarch64.AppImage"
42+
downloadUrl = "https://github.com/cryptomator/cryptomator/releases/download/1.17.1/cryptomator-1.17.1-aarch64.AppImage"
43+
signatureUrl = "https://github.com/cryptomator/cryptomator/releases/download/1.17.1/cryptomator-1.17.1-aarch64.AppImage.asc"
44+
checksum = "5bb552c3f801c0007c5dc5c2a7e9e29eaf2ec0c28e5dca1d5e52c473905fba2f"
45+
requiredOS = ''
46+
[releases.android]
47+
version = "1.11.1"
48+
filename = "Cryptomator-1.11.1.apk"
49+
downloadUrl = "https://static.cryptomator.org/android/1.11.1/Cryptomator-1.11.1.apk"
50+
checksum = "cd779e929277920e65b282f166e9c693fe560927215428796e100bcc7427132a"
51+
requiredOS = 'Android 8.0'

‎config/development/params.toml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
baseApiUrl = "http://localhost"
2+
storeApiUrl = "http://localhost:8787/api"
3+
4+
umamiWebsiteId = "57a36f3a-bd97-4d8a-9563-0e8d39ddb20c"
5+
6+
paddleEnableSandbox = true
7+
paddleToken = "test_693d7082cf217f0c0d3cc21f888"
8+
paddleDesktopPriceIds = ["pri_01jb24dee06jaxrsz6xhfakkvy", "pri_01jb24dvt2cj55r7p8agebef65", "pri_01jb24e3z1zkzsq5yrhm5252bd"]
9+
paddleAndroidPriceId = "pri_01jb2432chrz583xtxb029g40m"
10+
paddleVendorId = 1385
11+
paddleHubSelfHostedSubscriptionPlanId = 23141
12+
paddleHubManagedSubscriptionPlanId = 42235
13+
paddlePricesUrl = "https://sandbox-checkout.paddle.com/api/2.0/prices"
14+
15+
stripePk = "pk_test_JhF3MoFQGw2Is0DB3BSv345P"
16+
17+
[stripePlans]
18+
EUR = "plan_GgVY2JfD49bc02"
19+
USD = "plan_GgVZwj545E0uH3"

‎config/production/params.toml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
baseApiUrl = "http://api.cryptomator.org"
2+
storeApiUrl = "https://store.cryptomator.org/api"
3+
4+
umamiWebsiteId = "8d451e39-ffb2-4697-82c9-9f69eff497f1"
5+
6+
paddleEnableSandbox = false
7+
paddleToken = "live_0af4126c5788dcda805e8389b96"
8+
paddleDesktopPriceIds = ["pri_01jb23tj1jxp88jt6yphast6th", "pri_01jb23w0s2c2j3jebwtr5htwzj", "pri_01jb23wh9vjqdskxyz96zhc4yk"]
9+
paddleAndroidPriceId = "pri_01jb2432chrz583xtxb029g40m"
10+
paddleVendorId = 39223
11+
paddleHubSelfHostedSubscriptionPlanId = 770132
12+
paddleHubManagedSubscriptionPlanId = 807339
13+
paddlePricesUrl = "https://checkout.paddle.com/api/2.0/prices"
14+
15+
stripePk = "pk_live_eSasX216vGvC26GdbVwA011V"
16+
17+
[stripePlans]
18+
EUR = "plan_GgW4ovr7c6upzx"
19+
USD = "plan_GejOEdJtfL3kdH"

‎config/staging/params.toml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
baseApiUrl = "http://localhost"
2+
storeApiUrl = "http://localhost:8787/api"
3+
4+
umamiWebsiteId = "57a36f3a-bd97-4d8a-9563-0e8d39ddb20c"
5+
6+
paddleEnableSandbox = true
7+
paddleToken = "test_693d7082cf217f0c0d3cc21f888"
8+
paddleDesktopPriceIds = ["pri_01jb24dee06jaxrsz6xhfakkvy", "pri_01jb24dvt2cj55r7p8agebef65", "pri_01jb24e3z1zkzsq5yrhm5252bd"]
9+
paddleAndroidPriceId = "pri_01jb2432chrz583xtxb029g40m"
10+
paddleVendorId = 1385
11+
paddleHubSelfHostedSubscriptionPlanId = 23141
12+
paddleHubManagedSubscriptionPlanId = 42235
13+
paddlePricesUrl = "https://sandbox-checkout.paddle.com/api/2.0/prices"
14+
15+
stripePk = "pk_test_JhF3MoFQGw2Is0DB3BSv345P"
16+
17+
[stripePlans]
18+
EUR = "plan_GgVY2JfD49bc02"
19+
USD = "plan_GgVZwj545E0uH3"

0 commit comments

Comments
 (0)