Skip to content

Commit 077924c

Browse files
overheadhunteroverheadhunter
committed
Merge branch 'feature/paddle-migration' into feature/api-migration
# Conflicts: # config/development/params.toml # config/production/params.toml # config/staging/params.toml
2 parents 3418283 + fe807cd commit 077924c

File tree

10 files changed

+225
-205
lines changed

10 files changed

+225
-205
lines changed

‎config/_default/hugo.toml

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

‎config/_default/hugo.yaml

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

‎config/_default/params.toml

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

‎config/_default/params.yaml

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

‎config/development/params.toml

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

‎config/development/params.yaml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# API
2+
apiBaseURL: http://localhost:3300
3+
legacyApiUrl: http://localhost
4+
legacyStoreUrl: http://localhost:8787/api
5+
6+
# UMAMI
7+
umamiWebsiteId: 57a36f3a-bd97-4d8a-9563-0e8d39ddb20c
8+
9+
# PADDLE
10+
paddleEnableSandbox: true
11+
paddleToken: test_693d7082cf217f0c0d3cc21f888
12+
paddleDesktopPriceIds:
13+
- pri_01jb24dee06jaxrsz6xhfakkvy
14+
- pri_01jb24dvt2cj55r7p8agebef65
15+
- pri_01jb24e3z1zkzsq5yrhm5252bd
16+
paddleAndroidPriceId: pri_01jb24ewyc6fbhnzt26jdj9qp1
17+
paddleVendorId: 1385
18+
paddleHubSelfHostedSubscriptionPlanId: 23141
19+
paddleHubManagedSubscriptionPlanId: 42235
20+
paddlePricesUrl: https://sandbox-checkout.paddle.com/api/2.0/prices
21+
22+
# STRIPE
23+
stripePk: pk_test_JhF3MoFQGw2Is0DB3BSv345P
24+
stripePlans:
25+
EUR: plan_GgVY2JfD49bc02
26+
USD: plan_GgVZwj545E0uH3

‎config/production/params.toml

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

‎config/production/params.yaml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# API
2+
apiBaseURL: https://api.cryptomator.org
3+
legacyApiUrl: http://api.cryptomator.org
4+
legacyStoreUrl: https://store.cryptomator.org/api
5+
6+
# UMAMI
7+
umamiWebsiteId: 8d451e39-ffb2-4697-82c9-9f69eff497f1
8+
9+
# PADDLE
10+
paddleEnableSandbox: false
11+
paddleToken: live_0af4126c5788dcda805e8389b96
12+
paddleDesktopPriceIds:
13+
- pri_01jb23tj1jxp88jt6yphast6th
14+
- pri_01jb23w0s2c2j3jebwtr5htwzj
15+
- pri_01jb23wh9vjqdskxyz96zhc4yk
16+
paddleAndroidPriceId: pri_01jb2432chrz583xtxb029g40m
17+
paddleVendorId: 39223
18+
paddleHubSelfHostedSubscriptionPlanId: 770132
19+
paddleHubManagedSubscriptionPlanId: 807339
20+
paddlePricesUrl: https://checkout.paddle.com/api/2.0/prices
21+
22+
# STRIPE
23+
stripePk: pk_live_eSasX216vGvC26GdbVwA011V
24+
stripePlans:
25+
EUR: plan_GgW4ovr7c6upzx
26+
USD: plan_GejOEdJtfL3kdH

0 commit comments

Comments
 (0)