diff --git a/Chart.yaml b/Chart.yaml index b870cbf..1079fa4 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -4,14 +4,14 @@ name: mediawiki version: 0.1.0 dependencies: - name: mariadb - version: ^11.1.6 + version: ^11.4.3 repository: https://charts.bitnami.com/bitnami condition: mariadb.enabled - name: redis - version: ^16.1.0 + version: ^17.4.2 repository: https://charts.bitnami.com/bitnami condition: redis.enabled - name: elasticsearch - version: ^19.1.10 + version: ^19.5.8 repository: https://charts.bitnami.com/bitnami condition: elasticsearch.enabled \ No newline at end of file diff --git a/Todo.md b/Todo.md index 481e220..9010f55 100644 --- a/Todo.md +++ b/Todo.md @@ -1,2 +1 @@ -- Add elasticsearch things -- Make config a configmap +- Use https://github.com/bitnami/charts/blob/main/bitnami/elasticsearch/values.yaml#L2188-L2189 to set address? \ No newline at end of file diff --git a/templates/configmap.yaml b/templates/configmap.yaml index a4b166c..e2f8663 100644 --- a/templates/configmap.yaml +++ b/templates/configmap.yaml @@ -5,4 +5,5 @@ metadata: name: {{ include "mediawiki.fullname" . }} data: robots.txt: | - Sitemap: {{ if .Values.ingress.tls }}https://{{ else }}http://{{ end }}{{ .Values.ingress.hostname }}/sitemap/sitemap-index-{{ .Values.wiki_id }}.xml \ No newline at end of file + Sitemap: {{ if .Values.ingress.tls }}https://{{ else }}http://{{ end }}{{ .Values.ingress.hostname }}/sitemap/sitemap-index-{{ .Values.wiki_id }}.xml + LocalSettings.php: {{ .Values.local_settings }} \ No newline at end of file diff --git a/templates/crons.yaml b/templates/crons.yaml index 444df60..357caae 100644 --- a/templates/crons.yaml +++ b/templates/crons.yaml @@ -79,43 +79,6 @@ spec: --- apiVersion: batch/v1 kind: CronJob -metadata: - name: "{{ include "mediawiki.fullname" . }}-local-update" -spec: - schedule: "@daily" - jobTemplate: - spec: - template: - spec: - containers: - - name: RunJobs - image: "{{ .Values.image.repository }}:{{ include "mediawiki.imageTag" . }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - command: - - /usr/local/bin/php - - /var/www/html/extensions/LocalisationUpdate/update.php - - --quiet - volumeMounts: - - mountPath: /var/www/html/images - name: image-volume - {{- with .Values.extraVolumeMounts }} - {{- . | toYaml | nindent 12 }} - {{- end }} - restartPolicy: OnFailure - volumes: - {{- if .Values.persistence.enabled }} - - name: image-volume - persistentVolumeClaim: - claimName: {{ .Values.persistence.existingClaim | default (include "mediawiki.fullname" .) }} - {{- else }} - emptyDir: {} - {{- end }} - {{- with .Values.extraVolumes }} - {{- . | toYaml | nindent 8 }} - {{- end }} ---- -apiVersion: batch/v1 -kind: CronJob metadata: name: "{{ include "mediawiki.fullname" . }}-rebuild-cache" spec: diff --git a/values.yaml b/values.yaml index 61ddb6a..8ccbc1c 100644 --- a/values.yaml +++ b/values.yaml @@ -23,7 +23,11 @@ image: # fullnameOverride: "" ## This is required for correct setup of sitemaps -wiki_id: "miki_en" +wiki_id: "example_wiki" + +## LocalSettings.php +local_settings: | +