From b4e67699dc7682be9d4142509e4855eb91a0ecd1 Mon Sep 17 00:00:00 2001
From: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
Date: Fri, 11 Mar 2022 11:49:02 +0200
Subject: [PATCH] fix(friendica): fix blank page issue (breaking change)
 (#2131)

* fix(friendica): fix blank page issue

* re-add varrun
---
 charts/stable/friendica/Chart.yaml     |  2 +-
 charts/stable/friendica/questions.yaml | 70 ++++++++++++++++++++++++++
 charts/stable/friendica/values.yaml    | 31 +++++++++---
 3 files changed, 96 insertions(+), 7 deletions(-)

diff --git a/charts/stable/friendica/Chart.yaml b/charts/stable/friendica/Chart.yaml
index bee37f76d9a..e1ca1b9c490 100644
--- a/charts/stable/friendica/Chart.yaml
+++ b/charts/stable/friendica/Chart.yaml
@@ -27,7 +27,7 @@ name: friendica
 sources:
   - https://friendi.ca/
   - https://hub.docker.com/_/friendica
-version: 1.0.3
+version: 2.0.0
 annotations:
   truecharts.org/catagories: |
     - social
diff --git a/charts/stable/friendica/questions.yaml b/charts/stable/friendica/questions.yaml
index 6059b7cef8b..02709f2296a 100644
--- a/charts/stable/friendica/questions.yaml
+++ b/charts/stable/friendica/questions.yaml
@@ -83,6 +83,12 @@ questions:
       additional_attrs: true
       type: dict
       attrs:
+        - variable: FRIENDICA_UPGRADE
+          label: "Friendica Force Upgrade"
+          description: "Force starting the Friendica update even it's the same version"
+          schema:
+            type: boolean
+            default: false
         - variable: FRIENDICA_ADMIN_MAIL
           label: "Admin E-Mail"
           description: "E-Mail address of the administrator."
@@ -97,6 +103,27 @@ questions:
             type: string
             required: true
             default: ""
+        - variable: FRIENDICA_SITENAME
+          label: "Friendica Site Name"
+          description: "The Sitename of the Friendica server."
+          schema:
+            type: string
+            required: true
+            default: ""
+        - variable: PHP_MEMORY_LIMIT
+          label: "PHP Memory Limit"
+          description: "This sets the maximum amount of memory in bytes that a script is allowed to allocate."
+          schema:
+            type: string
+            required: true
+            default: "512M"
+        - variable: PHP_UPLOAD_LIMIT
+          label: "PHP Upload Limit"
+          description: "This sets the upload limit (post_max_size and upload_max_filesize) for big files."
+          schema:
+            type: string
+            required: true
+            default: "512M"
 # Include{containerConfig}
 
   - variable: service
@@ -236,6 +263,49 @@ questions:
                       description: "Default"
                     - value: "Memory"
                       description: "Memory"
+# Include{persistenceAdvanced}
+        - variable: data
+          label: "App Data Storage"
+          description: "Stores the Application Data."
+          schema:
+            additional_attrs: true
+            type: dict
+            attrs:
+              - variable: type
+                label: "Type of Storage"
+                description: "Sets the persistence type, Anything other than PVC could break rollback!"
+                schema:
+                  type: string
+                  default: "simplePVC"
+                  enum:
+                    - value: "simplePVC"
+                      description: "PVC (simple)"
+                    - value: "simpleHP"
+                      description: "HostPath (simple)"
+                    - value: "emptyDir"
+                      description: "emptyDir"
+                    - value: "pvc"
+                      description: "pvc"
+                    - value: "hostPath"
+                      description: "hostPath"
+# Include{persistenceBasic}
+              - variable: hostPath
+                label: "hostPath"
+                description: "Path inside the container the storage is mounted"
+                schema:
+                  show_if: [["type", "=", "hostPath"]]
+                  type: hostpath
+              - variable: medium
+                label: "EmptyDir Medium"
+                schema:
+                  show_if: [["type", "=", "emptyDir"]]
+                  type: string
+                  default: ""
+                  enum:
+                    - value: ""
+                      description: "Default"
+                    - value: "Memory"
+                      description: "Memory"
 # Include{persistenceAdvanced}
 # Include{persistenceList}
 
diff --git a/charts/stable/friendica/values.yaml b/charts/stable/friendica/values.yaml
index 38d717283db..15aebdf3ee0 100644
--- a/charts/stable/friendica/values.yaml
+++ b/charts/stable/friendica/values.yaml
@@ -5,18 +5,26 @@ image:
 
 securityContext:
   runAsNonRoot: false
+  readOnlyRootFilesystem: false
 
 podSecurityContext:
   runAsUser: 0
   runAsGroup: 0
 
-# See more environment variables in the friendica documentation
-# https://hub.docker.com/_/friendica
 env:
-  MYSQL_USER: friendica
-  MYSQL_DATABASE: friendica
+  MYSQL_USER: "{{ .Values.mariadb.mariadbUsername }}"
+  MYSQL_DATABASE: "{{ .Values.mariadb.mariadbDatabase }}"
+  MYSQL_PORT: 3306
+  REDIS_PORT: 6379
+  REDIS_DB: 1
+  FRIENDICA_TZ: "{{ .Values.TZ }}"
+  FRIENDICA_DATA_DIR: "/data"
+  FRIENDICA_CONFIG_DIR: "/config"
   FRIENDICA_ADMIN_MAIL: "my@domain.com"
-  FRIENDICA_URL: "https://friendica.local"
+  FRIENDICA_URL: "http://localhost:{{ .Values.service.main.ports.main.port }}"
+  FRIENDICA_UPGRADE: false
+  PHP_MEMORY_LIMIT: "512M"
+  PHP_UPLOAD_LIMIT: "512M"
 
 service:
   main:
@@ -25,12 +33,23 @@ service:
         port: 10058
         targetPort: 80
 
+probes:
+  liveness:
+    path: "/friendica"
+  readiness:
+    path: "/friendica"
+  startup:
+    path: "/friendica"
+
 persistence:
   varrun:
     enabled: true
   config:
     enabled: true
-    mountPath: "/var/www/html"
+    mountPath: "/config"
+  data:
+    enabled: true
+    mountPath: "/data"
 
 envValueFrom:
   MYSQL_HOST: