github-personal/Biohazard
1
0
Fork 0
mirror of https://github.com/outbackdingo/Biohazard.git synced 2026-01-27 18:18:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(nextcloud): rm push for now

Browse Source
This commit is contained in:
JJGadgets
2023-11-03 11:11:27 +08:00
parent 8856fe9933
commit f04fc3ac9b
1 changed files with 57 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
kube/deploy/apps/nextcloud/app/hr.yaml
View File

@@ -103,25 +103,25 @@ spec:
memory: 32Mi
limits:
memory: 256Mi
push:
image: *ncimg
command: ["/var/www/html/custom_apps/notify_push/bin/x86_64/notify_push", "/var/www/html/config/redis.php"]
env:
PORT: &push "7867"
NEXTCLOUD_URL: "https://${APP_DNS_NEXTCLOUD}"
DATABASE_PREFIX: "oc"
DATABASE_URL:
valueFrom:
secretKeyRef:
name: *pgsec
key: "uri"
securityContext: *sc
resources:
requests:
cpu: 10m
memory: 32Mi
limits:
memory: 256Mi
# push:
# image: *ncimg
# command: ["/var/www/html/custom_apps/notify_push/bin/x86_64/notify_push", "/var/www/html/config/redis.php"]
# env:
# PORT: &push "7867"
# NEXTCLOUD_URL: "https://${APP_DNS_NEXTCLOUD}"
# DATABASE_PREFIX: "oc"
# DATABASE_URL:
# valueFrom:
# secretKeyRef:
# name: *pgsec
# key: "uri"
# securityContext: *sc
# resources:
# requests:
# cpu: 10m
# memory: 32Mi
# limits:
# memory: 256Mi
statefulset:
volumeClaimTemplates:
- name: "data"
@@ -134,10 +134,10 @@ spec:
path: /var/www/html
- subPath: data
path: /ceph
push:
- subPath: nextcloud
path: /var/www/html
readOnly: true
# push:
# - subPath: nextcloud
# path: /var/www/html
# readOnly: true
web:
- subPath: nextcloud
path: /var/www/html
@@ -162,8 +162,8 @@ spec:
fpm:
primary: true
port: 9000
push:
port: *push
# push:
# port: *push
ingress:
main: &ingress
enabled: true
@@ -197,19 +197,19 @@ spec:
# service:
# name: main
# port: fpm
push:
<<: *ingress
annotations:
nginx.ingress.kubernetes.io/use-regex: "true"
nginx.ingress.kubernetes.io/rewrite-target: "/$2"
hosts:
- host: *host
paths:
- path: "/push(/|$)(.*)"
pathType: ImplementationSpecific
service:
name: main
port: push
# push:
# <<: *ingress
# annotations:
# nginx.ingress.kubernetes.io/use-regex: "true"
# nginx.ingress.kubernetes.io/rewrite-target: "/$2"
# hosts:
# - host: *host
# paths:
# - path: "/push(/|$)(.*)"
# pathType: ImplementationSpecific
# service:
# name: main
# port: push
dav:
<<: *ingress
annotations:
@@ -244,9 +244,9 @@ spec:
main:
- path: "/var/www/html/config"
readOnly: true
push:
- path: "/var/www/html/config"
readOnly: true
# push:
# - path: "/var/www/html/config"
# readOnly: true
caddy:
enabled: true
type: configMap
@@ -276,10 +276,10 @@ spec:
- &sockmnt
subPath: "sockets"
path: "/sockets"
push:
- subPath: "nextcloud"
path: "/tmp"
- *sockmnt
# push:
# - subPath: "nextcloud"
# path: "/tmp"
# - *sockmnt
redis:
- subPath: "redis-tmp"
path: "/tmp"
@@ -348,15 +348,18 @@ spec:
),
),
);
redis.php: |
'memcache.local' => '\\OC\\Memcache\\APCu',
'memcache.distributed' => '\\OC\\Memcache\\Redis',
'memcache.locking' => '\\OC\\Memcache\\Redis',
'redis' =>
array (
'host' => '/sockets/redis.sock',
'port' => 0,
),
# redis.php: |
# <?php
# $CONFIG = array (
# 'memcache.local' => '\\OC\\Memcache\\APCu',
# 'memcache.distributed' => '\\OC\\Memcache\\Redis',
# 'memcache.locking' => '\\OC\\Memcache\\Redis',
# 'redis' =>
# array (
# 'host' => '/sockets/redis.sock',
# 'port' => 0,
# ),
# );
caddy:
enabled: true
data: