fix(ganymede): fix after update broke it
This commit is contained in:
parent
d4e5a254a7
commit
1e602ec8e7
|
@ -26,21 +26,21 @@ spec:
|
||||||
# fsGroup: 10000
|
# fsGroup: 10000
|
||||||
# fsGroupChangePolicy: OnRootMismatch
|
# fsGroupChangePolicy: OnRootMismatch
|
||||||
|
|
||||||
initContainers:
|
|
||||||
copy-config:
|
|
||||||
image:
|
|
||||||
repository: alpine
|
|
||||||
tag: 3.20
|
|
||||||
|
|
||||||
command: [ "sh", "-c", "cat /ganymede-config.json && cp -v /ganymede-config.json /data/config.json" ]
|
|
||||||
|
|
||||||
containers:
|
containers:
|
||||||
api:
|
api:
|
||||||
image:
|
image:
|
||||||
repository: ghcr.io/zibbp/ganymede
|
repository: ghcr.io/zibbp/ganymede
|
||||||
tag: 3.0.1
|
tag: 3.0.1
|
||||||
|
|
||||||
|
securityContext:
|
||||||
|
#allowPrivilegeEscalation: false
|
||||||
|
#capabilities: { drop: ["ALL"] }
|
||||||
|
|
||||||
env:
|
env:
|
||||||
|
- name: PUID
|
||||||
|
value: 555
|
||||||
|
- name: PGID
|
||||||
|
value: 555
|
||||||
- name: TZ
|
- name: TZ
|
||||||
value: "America/New_York" # Set to your timezone
|
value: "America/New_York" # Set to your timezone
|
||||||
- name: DB_HOST
|
- name: DB_HOST
|
||||||
|
@ -74,9 +74,9 @@ spec:
|
||||||
name: ganymede-env
|
name: ganymede-env
|
||||||
key: twitchClientSecret
|
key: twitchClientSecret
|
||||||
- name: FRONTEND_HOST
|
- name: FRONTEND_HOST
|
||||||
value: https://twvods.${SECRET_NEW_DOMAIN}
|
value: https://twvods.seanomik.net
|
||||||
- name: OAUTH_PROVIDER_URL
|
- name: OAUTH_PROVIDER_URL
|
||||||
value: "https://auth.${SECRET_NEW_DOMAIN}/application/o/ganymede/.well-known/openid-configuration"
|
value: "https://auth.seanomik.net/application/o/ganymede/.well-known/openid-configuration"
|
||||||
- name: OAUTH_CLIENT_ID
|
- name: OAUTH_CLIENT_ID
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: ganymede-env
|
name: ganymede-env
|
||||||
|
@ -86,7 +86,7 @@ spec:
|
||||||
name: ganymede-env
|
name: ganymede-env
|
||||||
key: oauthClientSecret
|
key: oauthClientSecret
|
||||||
- name: OAUTH_REDIRECT_URL
|
- name: OAUTH_REDIRECT_URL
|
||||||
value: "https://twvods.${SECRET_NEW_DOMAIN}/api/v1/auth/oauth/callback"
|
value: "https://twvods.seanomik.net/api/v1/auth/oauth/callback"
|
||||||
- name: TEMPORAL_URL
|
- name: TEMPORAL_URL
|
||||||
value: "temporal:7233"
|
value: "temporal:7233"
|
||||||
|
|
||||||
|
@ -108,10 +108,10 @@ spec:
|
||||||
env:
|
env:
|
||||||
- name: API_URL
|
- name: API_URL
|
||||||
# /api will be added to this
|
# /api will be added to this
|
||||||
value: "https://twvods.${SECRET_NEW_DOMAIN}" # Points to the API service
|
value: "https://twvods.seanomik.net" # Points to the API service
|
||||||
- name: CDN_URL
|
- name: CDN_URL
|
||||||
# /vods will be added to this
|
# /vods will be added to this
|
||||||
value: "https://twvods.${SECRET_NEW_DOMAIN}" # Points to the CDN service
|
value: "https://twvods.seanomik.net" # Points to the CDN service
|
||||||
- name: SHOW_SSO_LOGIN_BUTTON
|
- name: SHOW_SSO_LOGIN_BUTTON
|
||||||
value: "true" # show/hide SSO login button on login page
|
value: "true" # show/hide SSO login button on login page
|
||||||
- name: FORCE_SSO_AUTH
|
- name: FORCE_SSO_AUTH
|
||||||
|
@ -124,6 +124,10 @@ spec:
|
||||||
repository: nginxinc/nginx-unprivileged
|
repository: nginxinc/nginx-unprivileged
|
||||||
tag: 1.27.1-alpine
|
tag: 1.27.1-alpine
|
||||||
|
|
||||||
|
securityContext:
|
||||||
|
allowPrivilegeEscalation: false
|
||||||
|
capabilities: { drop: ["ALL"] }
|
||||||
|
|
||||||
service:
|
service:
|
||||||
app:
|
app:
|
||||||
controller: main
|
controller: main
|
||||||
|
@ -145,7 +149,7 @@ spec:
|
||||||
traefik.ingress.kubernetes.io/router.entrypoints: websecure
|
traefik.ingress.kubernetes.io/router.entrypoints: websecure
|
||||||
|
|
||||||
hosts:
|
hosts:
|
||||||
- host: twvods.${SECRET_NEW_DOMAIN}
|
- host: twvods.seanomik.net
|
||||||
paths:
|
paths:
|
||||||
- path: /
|
- path: /
|
||||||
service:
|
service:
|
||||||
|
@ -155,7 +159,7 @@ spec:
|
||||||
service:
|
service:
|
||||||
identifier: app
|
identifier: app
|
||||||
port: api
|
port: api
|
||||||
- path: /vods
|
- path: /data/videos
|
||||||
service:
|
service:
|
||||||
identifier: app
|
identifier: app
|
||||||
port: nginx
|
port: nginx
|
||||||
|
@ -168,18 +172,18 @@ spec:
|
||||||
storageClass: mainpool-hostpath
|
storageClass: mainpool-hostpath
|
||||||
accessMode: ReadWriteOnce
|
accessMode: ReadWriteOnce
|
||||||
globalMounts:
|
globalMounts:
|
||||||
- path: /vods
|
- path: /data/videos
|
||||||
|
|
||||||
ganymede-data:
|
ganymede-data:
|
||||||
type: persistentVolumeClaim
|
type: persistentVolumeClaim
|
||||||
size: 5Gi
|
size: 15Gi
|
||||||
retain: true
|
retain: true
|
||||||
storageClass: mainpool-hostpath
|
storageClass: mainpool-hostpath
|
||||||
accessMode: ReadWriteOnce
|
accessMode: ReadWriteOnce
|
||||||
advancedMounts:
|
advancedMounts:
|
||||||
main: # controller name
|
main: # controller name
|
||||||
api: # container name
|
api: # container name
|
||||||
- path: /data
|
- path: /data/temp
|
||||||
|
|
||||||
ganymede-logs:
|
ganymede-logs:
|
||||||
type: persistentVolumeClaim
|
type: persistentVolumeClaim
|
||||||
|
@ -190,7 +194,7 @@ spec:
|
||||||
advancedMounts:
|
advancedMounts:
|
||||||
main: # controller name
|
main: # controller name
|
||||||
api: # container name
|
api: # container name
|
||||||
- path: /logs
|
- path: /data/logs
|
||||||
|
|
||||||
nginx-conf:
|
nginx-conf:
|
||||||
name: ganymede-nginx-conf
|
name: ganymede-nginx-conf
|
||||||
|
@ -199,17 +203,8 @@ spec:
|
||||||
advancedMounts:
|
advancedMounts:
|
||||||
main: # controller name
|
main: # controller name
|
||||||
nginx: # container name
|
nginx: # container name
|
||||||
- subPath: nginx.conf
|
- path: /etc/nginx/nginx.conf
|
||||||
path: /etc/nginx/nginx.conf
|
subPath: nginx.conf
|
||||||
|
|
||||||
ganymede-temp-conf:
|
|
||||||
type: emptyDir
|
|
||||||
advancedMounts:
|
|
||||||
main: # controller name
|
|
||||||
api: # container name
|
|
||||||
- path: /data
|
|
||||||
copy-config: # container name
|
|
||||||
- path: /data
|
|
||||||
|
|
||||||
ganymede-conf:
|
ganymede-conf:
|
||||||
name: ganymede-conf
|
name: ganymede-conf
|
||||||
|
@ -217,6 +212,7 @@ spec:
|
||||||
defaultMode: 0777
|
defaultMode: 0777
|
||||||
advancedMounts:
|
advancedMounts:
|
||||||
main: # controller name
|
main: # controller name
|
||||||
copy-config: # container name
|
api: # container name
|
||||||
- subPath: config.json
|
- path: /data/config/config.json
|
||||||
path: /ganymede-config.json
|
subPath: config.json
|
||||||
|
|
||||||
|
|
|
@ -26,16 +26,16 @@ data:
|
||||||
|
|
||||||
server {
|
server {
|
||||||
listen 8080;
|
listen 8080;
|
||||||
root /vods;
|
root /data/videos;
|
||||||
|
|
||||||
add_header 'Access-Control-Allow-Origin' '*' always;
|
add_header 'Access-Control-Allow-Origin' '*' always;
|
||||||
add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS' always;
|
add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS' always;
|
||||||
add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range' always;
|
add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range' always;
|
||||||
add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range' always;
|
add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range' always;
|
||||||
|
|
||||||
location ^~ /vods {
|
location ^~ /data/videos {
|
||||||
autoindex on;
|
autoindex on;
|
||||||
alias /vods;
|
alias /data/videos;
|
||||||
|
|
||||||
location ~* \.(ico|css|js|gif|jpeg|jpg|png|svg|webp)$ {
|
location ~* \.(ico|css|js|gif|jpeg|jpg|png|svg|webp)$ {
|
||||||
expires 30d;
|
expires 30d;
|
||||||
|
|
Loading…
Reference in New Issue