Skip to content

Commit b4aa90e

Browse files
committed
social: move to calckey
1 parent 5023295 commit b4aa90e

File tree

9 files changed

+93
-40
lines changed

9 files changed

+93
-40
lines changed

social/misskey/misskey-configuration.enc.yaml renamed to social/calckey/calckey-db.enc.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v1
22
kind: Secret
33
metadata:
4-
name: misskey-configuration
4+
name: calckey-db
55
annotations:
66
kustomize.config.k8s.io/needs-hash: true
77
type: Opaque
@@ -13,8 +13,8 @@ sops:
1313
azure_kv: []
1414
hc_vault: []
1515
age: []
16-
lastmodified: "2023-02-08T14:20:24Z"
17-
mac: ENC[AES256_GCM,data:EI5uz9DFTfrqGfzb+UAnxacu9blmpOAM684InDjNHTp2A/W4AYMAPG/rfVqzn1BOC5GCtNXrKRQvhy1PYtnh5rLtV0qbfHv8uvc4iyc+JK7EVcVibv6zMLm2Dm/a408vhHDGMFpo1sZBjFEcKWfzZXcG2cELKpzm7OtjFByCqX4=,iv:tixU1u5gfPXRL3j0/xZhdLtpywc0B5l/Ml8nC/bqjM8=,tag:dEmeIipYR3pMjxUed03XiQ==,type:str]
16+
lastmodified: "2023-05-12T13:16:40Z"
17+
mac: ENC[AES256_GCM,data:OL7O0OjS9M4ctfEmeZr3waQVpp96aatVy50wULFpFdsmoCH9txgvz7POrVl7PZUOC95XrknedXLXshbHRGm6DUCARPIcGxiHj9aAiVjFnFnZQsl8VGVfaREuiYB09uIrRHDHpm7z7myNJtKHxjoM2bwHW5NtddG23jLyGWWyXY0=,iv:4MAtReNn6N1dBHvt209r80k91H8McQtP8WKYy6X5bvg=,tag:lXnmpCCgAao9wyMarj9HcA==,type:str]
1818
pgp:
1919
- created_at: "2023-02-08T13:39:37Z"
2020
enc: |-
Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,53 @@
11
apiVersion: apps/v1
22
kind: Deployment
33
metadata:
4-
name: misskey
4+
name: calckey
55
spec:
66
template:
77
spec:
88
initContainers:
99
- name: migrate
10-
image: misskey/misskey
10+
image: thatonecalculator/calckey
1111
command: [npm, run, migrate]
1212
env:
1313
- name: NODE_ENV
1414
value: production
1515
- name: PGPASSWORD
1616
valueFrom:
1717
secretKeyRef:
18-
name: misskey-configuration
18+
name: calckey-db
1919
key: PGPASSWORD
2020
- name: PGSSLMODE
2121
value: no-verify
2222
volumeMounts:
23-
- name: misskey-configuration
24-
mountPath: /misskey/.config
23+
- name: configuration
24+
mountPath: /calckey/.config
2525
readOnly: true
2626
containers:
27-
- name: misskey
28-
image: misskey/misskey
27+
- name: calckey
28+
image: thatonecalculator/calckey
2929
command: [npm, run, start]
3030
env:
3131
- name: NODE_ENV
3232
value: production
3333
- name: PGPASSWORD
3434
valueFrom:
3535
secretKeyRef:
36-
name: misskey-configuration
36+
name: calckey-db
3737
key: PGPASSWORD
3838
- name: PGSSLMODE
3939
value: no-verify
4040
resources:
4141
requests:
4242
memory: 350M
4343
volumeMounts:
44-
- name: misskey-configuration
45-
mountPath: /misskey/.config
44+
- name: configuration
45+
mountPath: /calckey/.config
4646
readOnly: true
4747
ports:
4848
- name: http
4949
containerPort: 3000
5050
volumes:
51-
- name: misskey-configuration
51+
- name: configuration
5252
configMap:
53-
name: misskey-configuration
53+
name: calckey-configuration

social/misskey/files/default.yml renamed to social/calckey/files/default.yml

Lines changed: 64 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
2-
# Misskey configuration
2+
# Calckey configuration
33
#━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
44

55
# ┌─────┐
@@ -93,6 +93,9 @@ id: 'aid'
9393
# ┌─────────────────────┐
9494
#───┘ Other configuration └─────────────────────────────────────
9595

96+
# Max note length, should be < 8000.
97+
#maxNoteLength: 3000
98+
9699
# Whether disable HSTS
97100
#disableHsts: true
98101

@@ -114,35 +117,85 @@ id: 'aid'
114117
# IP address family used for outgoing request (ipv4, ipv6 or dual)
115118
#outgoingAddressFamily: ipv4
116119

120+
# Syslog option
121+
#syslog:
122+
# host: localhost
123+
# port: 514
124+
117125
# Proxy for HTTP/HTTPS
118126
#proxy: http://127.0.0.1:3128
119127

120-
proxyBypassHosts:
121-
- api.deepl.com
122-
- api-free.deepl.com
123-
- www.recaptcha.net
124-
- hcaptcha.com
125-
- challenges.cloudflare.com
128+
#proxyBypassHosts: [
129+
# 'example.com',
130+
# '192.0.2.8'
131+
#]
126132

127133
# Proxy for SMTP/SMTPS
128134
#proxySmtp: http://127.0.0.1:3128 # use HTTP/1.1 CONNECT
129135
#proxySmtp: socks4://127.0.0.1:1080 # use SOCKS4
130136
#proxySmtp: socks5://127.0.0.1:1080 # use SOCKS5
131137

132138
# Media Proxy
133-
# Reference Implementation: https://github.com/misskey-dev/media-proxy
134139
#mediaProxy: https://example.com/proxy
135140

136141
# Proxy remote files (default: false)
137142
#proxyRemoteFiles: true
138143

139-
# Sign to ActivityPub GET request (default: true)
140-
signToActivityPubGet: true
141-
142144
#allowedPrivateNetworks: [
143145
# '127.0.0.1/32'
144146
#]
145147

148+
# TWA
149+
#twa:
150+
# nameSpace: android_app
151+
# packageName: tld.domain.twa
152+
# sha256CertFingerprints: ['AB:CD:EF']
153+
146154
# Upload or download file size limits (bytes)
147155
#maxFileSize: 262144000
148156

157+
# Managed hosting settings
158+
# !!!!!!!!!!
159+
# >>>>>> NORMAL SELF-HOSTERS, STAY AWAY! <<<<<<
160+
# >>>>>> YOU DON'T NEED THIS! <<<<<<
161+
# !!!!!!!!!!
162+
# Each category is optional, but if each item in each category is mandatory!
163+
# If you mess this up, that's on you, you've been warned...
164+
165+
#maxUserSignups: 100
166+
#isManagedHosting: true
167+
#deepl:
168+
# managed: true
169+
# authKey: ''
170+
# isPro: false
171+
#
172+
#email:
173+
# managed: true
174+
# address: '[email protected]'
175+
# host: 'email.com'
176+
# port: 587
177+
178+
# pass: ''
179+
# useImplicitSslTls: false
180+
#
181+
#objectStorage:
182+
# managed: true
183+
# baseUrl: ''
184+
# bucket: ''
185+
# prefix: ''
186+
# endpoint: ''
187+
# region: ''
188+
# accessKey: ''
189+
# secretKey: ''
190+
# useSsl: true
191+
# connnectOverProxy: false
192+
# setPublicReadOnUpload: true
193+
# s3ForcePathStyle: true
194+
195+
# !!!!!!!!!!
196+
# >>>>>> AGAIN, NORMAL SELF-HOSTERS, STAY AWAY! <<<<<<
197+
# >>>>>> YOU DON'T NEED THIS, ABOVE SETTINGS ARE FOR MANAGED HOSTING ONLY! <<<<<<
198+
# !!!!!!!!!!
199+
200+
# Seriously. Do NOT fill out the above settings if you're self-hosting.
201+
# They're much better off being set from the control panel.
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
commonLabels:
4-
app.kubernetes.io/component: misskey
4+
app.kubernetes.io/component: calckey
55
resources:
66
- deployment.yaml
77
- service.yaml
88
configMapGenerator:
9-
- name: misskey-configuration
9+
- name: calckey-configuration
1010
files:
1111
- files/default.yml
1212
generators:
1313
- secret-generator.yaml
1414
images:
15-
- name: misskey/misskey
16-
newTag: 13.5.2@sha256:1b8eae17b59cf793b96e3f9128e7021d35bbe0f44142a5bcdc09dbe8df962316
15+
- name: thatonecalculator/calckey
16+
newTag: v13.1.4.1@sha256:f8a9dd03f8e639f81c6ee3c35985301f4ce49d11ff5ba0d75a6146de5139fe18
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
apiVersion: viaduct.ai/v1
2+
kind: ksops
3+
metadata:
4+
name: calckey-secrets
5+
files:
6+
- ./calckey-db.enc.yaml

social/misskey/service.yaml renamed to social/calckey/service.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v1
22
kind: Service
33
metadata:
4-
name: misskey
4+
name: calckey
55
spec:
66
type: ClusterIP
77
ports:

social/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ namespace: social
44
commonLabels:
55
app.kubernetes.io/name: social
66
resources:
7-
- ./misskey
7+
- ./calckey
88
- ./redis
99
- networkpolicy.yaml
1010
- ingress.yaml

social/misskey/secret-generator.yaml

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

social/networkpolicy.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: networking.k8s.io/v1
22
kind: NetworkPolicy
33
metadata:
4-
name: misskey-redis-network-policy
4+
name: calckey-redis-network-policy
55
spec:
66
egress:
77
- ports:
@@ -16,7 +16,7 @@ spec:
1616
- from:
1717
- podSelector:
1818
matchLabels:
19-
app.kubernetes.io/name: misskey
19+
app.kubernetes.io/name: calckey
2020
ports:
2121
- port: 6379
2222
protocol: TCP

0 commit comments

Comments
 (0)