diff --git a/freescout/application.yml b/freescout/application.yml index 9d0adc1..5116711 100644 --- a/freescout/application.yml +++ b/freescout/application.yml @@ -25,6 +25,7 @@ spec: uri: https://freescout.k-space.ee redirectUris: - https://freescout.k-space.ee/oauth_callback + - https://freescout.k-space.ee/oauth-login/callback/mlz500opr allowedGroups: - k-space:floor grantTypes: @@ -140,7 +141,7 @@ spec: ports: - protocol: TCP port: 80 - targetPort: 8080 + targetPort: 80 --- apiVersion: apps/v1 kind: Deployment @@ -160,14 +161,16 @@ spec: labels: app: freescout spec: - containers: + containers: - name: freescout - image: harbor.k-space.ee/k-space/freescout + image: ghcr.io/tiredofit/docker-freescout:php8.3-1.17.135 ports: - - containerPort: 8080 + - containerPort: 80 env: - name: DISPLAY_ERRORS - value: 'true' + value: 'false' + - name: APP_DEBUG + value: 'false' - name: SITE_URL value: 'https://freescout.k-space.ee' - name: APP_URL @@ -176,104 +179,41 @@ spec: value: mariadb - name: DB_PORT value: "3306" - - name: DB_DATABASE + - name: DB_NAME value: freescout - - name: DB_USERNAME + - name: DB_USER value: freescout - - name: ADMIN_EMAIL - value: lauri@k-space.ee - - name: ADMIN_PASS - value: Salakala1! - name: TIMEZONE value: Europe/Tallinn - - name: FREESCOUT_ATTACHMENTS_DRIVER - value: s3 - - name: DB_PASSWORD + - name: DB_PASS valueFrom: secretKeyRef: name: mariadb-secrets key: MYSQL_PASSWORD - - name: AWS_USE_PATH_STYLE_ENDPOINT - value: "true" - - name: AWS_BUCKET - valueFrom: - secretKeyRef: - name: miniobucket-attachments-owner-secrets - key: BUCKET_NAME - - name: APP_KEY - valueFrom: - secretKeyRef: - name: freescout-app - key: APP_KEY - envFrom: - - secretRef: - name: miniobucket-attachments-owner-secrets + volumeMounts: + - name: freescout-attachments + mountPath: /www/html/storage/app/attachment + subPath: attachment + - name: freescout-attachments + mountPath: /www/html/Modules + subPath: Modules + volumes: + - name: freescout-attachments + persistentVolumeClaim: + claimName: freescout-attachments --- -apiVersion: batch/v1 -kind: CronJob +apiVersion: v1 +kind: PersistentVolumeClaim metadata: - name: freescout-cron + name: freescout-attachments namespace: freescout spec: - schedule: "0,30 * * * *" # Should be every minute in theory, keeps hanging - jobTemplate: - spec: - activeDeadlineSeconds: 1800 # this is unholy https://github.com/freescout-helpdesk/freescout/blob/dist/app/Console/Kernel.php - ttlSecondsAfterFinished: 100 - template: - spec: - containers: - - name: freescout-cron - image: harbor.k-space.ee/k-space/freescout - imagePullPolicy: Always - command: - - php - - artisan - - schedule:run - env: - - name: DISPLAY_ERRORS - value: 'true' - - name: SITE_URL - value: 'https://freescout.k-space.ee' - - name: APP_URL - value: 'https://freescout.k-space.ee' - - name: DB_HOST - value: mariadb - - name: DB_PORT - value: "3306" - - name: DB_DATABASE - value: freescout - - name: DB_USERNAME - value: freescout - - name: ADMIN_EMAIL - value: lauri@k-space.ee - - name: ADMIN_PASS - value: Salakala1! - - name: TIMEZONE - value: Europe/Tallinn - - name: FREESCOUT_ATTACHMENTS_DRIVER - value: s3 - - name: DB_PASSWORD - valueFrom: - secretKeyRef: - name: freescout-secrets - key: MYSQL_PASSWORD - - name: AWS_USE_PATH_STYLE_ENDPOINT - value: "true" - - name: AWS_BUCKET - valueFrom: - secretKeyRef: - name: miniobucket-attachments-owner-secrets - key: BUCKET_NAME - - name: APP_KEY - valueFrom: - secretKeyRef: - name: freescout-app - key: APP_KEY - envFrom: - - secretRef: - name: miniobucket-attachments-owner-secrets - restartPolicy: Never + storageClassName: ceph-rbd + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 10Gi --- apiVersion: codemowers.cloud/v1beta1 kind: MinioBucketClaim