jina verze

sodew-bash-main/assets/k3s/templates/openlitespeed.yaml

@@ -22,50 +22,6 @@ spec:
   resources: { requests: { storage: 500Gi } }
   storageClassName: ""
 
----
-apiVersion: v1
-kind: PersistentVolume
-metadata: { name: "{{ .Values.openlitespeed }}-private-pv" }
-spec:
-  capacity: { storage: 5Gi }
-  volumeMode: Filesystem
-  accessModes: [ ReadWriteMany ]
-  persistentVolumeReclaimPolicy: Retain
-  hostPath: { path: "{{ .Values.olsPrivatePath }}", type: DirectoryOrCreate }
-
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata: { name: "{{ .Values.openlitespeed }}-private-pvc", namespace: "{{ .Values.namespace }}" }
-spec:
-  volumeName: "{{ .Values.openlitespeed }}-private-pv"
-  volumeMode: Filesystem
-  accessModes: [ ReadWriteMany ]
-  resources: { requests: { storage: 5Gi } }
-  storageClassName: ""
-
----
-apiVersion: v1
-kind: PersistentVolume
-metadata: { name: "{{ .Values.openlitespeed }}-public-pv" }
-spec:
-  capacity: { storage: 10Gi }
-  volumeMode: Filesystem
-  accessModes: [ ReadWriteMany ]
-  persistentVolumeReclaimPolicy: Retain
-  hostPath: { path: "{{ .Values.olsPublicPath }}", type: DirectoryOrCreate }
-
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata: { name: "{{ .Values.openlitespeed }}-public-pvc", namespace: "{{ .Values.namespace }}" }
-spec:
-  volumeName: "{{ .Values.openlitespeed }}-public-pv"
-  volumeMode: Filesystem
-  accessModes: [ ReadWriteMany ]
-  resources: { requests: { storage: 10Gi } }
-  storageClassName: ""
-
 ---
 apiVersion: v1
 kind: PersistentVolume
@@ -75,7 +31,7 @@ spec:
   volumeMode: Filesystem
   accessModes: [ ReadWriteMany ]
   persistentVolumeReclaimPolicy: Retain
-  hostPath: { path: "{{ .Values.olsConfigPath }}", type: DirectoryOrCreate }
+  hostPath: { path: "{{ .Values.openlitespeedConfigPath }}", type: DirectoryOrCreate }
 
 ---
 apiVersion: v1
@@ -97,7 +53,7 @@ spec:
   volumeMode: Filesystem
   accessModes: [ ReadWriteMany ]
   persistentVolumeReclaimPolicy: Retain
-  hostPath: { path: "{{ .Values.olsAdminPath }}", type: DirectoryOrCreate }
+  hostPath: { path: "{{ .Values.openlitespeedAdminPath }}", type: DirectoryOrCreate }
 
 ---
 apiVersion: v1
@@ -119,7 +75,7 @@ spec:
   volumeMode: Filesystem
   accessModes: [ ReadWriteMany ]
   persistentVolumeReclaimPolicy: Retain
-  hostPath: { path: "{{ .Values.olsPhpIniPath }}", type: DirectoryOrCreate }
+  hostPath: { path: "{{ .Values.openlitespeedPhpIniPath }}", type: DirectoryOrCreate }
 
 ---
 apiVersion: v1
@@ -142,7 +98,7 @@ spec:
   accessModes: [ ReadWriteMany ]
   persistentVolumeReclaimPolicy: Retain
   storageClassName: ""
-  hostPath: { path: "{{ .Values.olsLogsPath }}", type: DirectoryOrCreate }
+  hostPath: { path: "{{ .Values.openlitespeedLogsPath }}", type: DirectoryOrCreate }
 
 ---
 apiVersion: v1
@@ -155,6 +111,50 @@ spec:
   resources: { requests: { storage: 10Gi } }
   storageClassName: ""
 
+---
+apiVersion: v1
+kind: PersistentVolume
+metadata: { name: "{{ .Values.openlitespeed }}-vhost-data-pv" }
+spec:
+  capacity: { storage: 5Gi }
+  volumeMode: Filesystem
+  accessModes: [ ReadWriteMany ]
+  persistentVolumeReclaimPolicy: Retain
+  hostPath: { path: "{{ .Values.openlitespeedVhostDataPath }}", type: DirectoryOrCreate }
+
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata: { name: "{{ .Values.openlitespeed }}-vhost-data-pvc", namespace: "{{ .Values.namespace }}" }
+spec:
+  volumeName: "{{ .Values.openlitespeed }}-vhost-data-pv"
+  volumeMode: Filesystem
+  accessModes: [ ReadWriteMany ]
+  resources: { requests: { storage: 5Gi } }
+  storageClassName: ""
+
+---
+apiVersion: v1
+kind: PersistentVolume
+metadata: { name: "{{ .Values.openlitespeed }}-vhost-shared-pv" }
+spec:
+  capacity: { storage: 1Gi }
+  volumeMode: Filesystem
+  accessModes: [ ReadWriteMany ]
+  persistentVolumeReclaimPolicy: Retain
+  hostPath: { path: "{{ .Values.openlitespeedVhostSharedPath }}", type: DirectoryOrCreate }
+
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata: { name: "{{ .Values.openlitespeed }}-vhost-shared-pvc", namespace: "{{ .Values.namespace }}" }
+spec:
+  volumeName: "{{ .Values.openlitespeed }}-vhost-shared-pv"
+  volumeMode: Filesystem
+  accessModes: [ ReadWriteMany ]
+  resources: { requests: { storage: 1Gi } }
+  storageClassName: ""
+
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -194,22 +194,18 @@ spec:
           readinessProbe: { tcpSocket: { port: 80 }, initialDelaySeconds: 5,  periodSeconds: 5,  failureThreshold: 3 }
           livenessProbe:  { tcpSocket: { port: 80 }, initialDelaySeconds: 10, periodSeconds: 10, failureThreshold: 5 }
           volumeMounts:
-            - { name: "{{ .Values.openlitespeed }}-vhosts-volume",  mountPath: {{ .Values.olsPodVhostsPath }} }
-            - { name: "{{ .Values.openlitespeed }}-private-volume", mountPath: {{ .Values.olsPodPrivatePath }}, readOnly: true }
-            - { name: "{{ .Values.openlitespeed }}-public-volume",  mountPath: {{ .Values.olsPodPublicPath }},  readOnly: true }
-            - { name: "{{ .Values.openlitespeed }}-config-volume",  mountPath: /usr/local/lsws/conf }
-            - { name: "{{ .Values.openlitespeed }}-admin-volume",   mountPath: /usr/local/lsws/admin/conf }
-            - { name: "{{ .Values.openlitespeed }}-phpini-volume",  mountPath: /etc/ols-php-ini }
-            - { name: "{{ .Values.openlitespeed }}-logs-volume",    mountPath: /usr/local/lsws/logs }
-            - { name: "{{ .Values.openlitespeed }}-cache-volume",   mountPath: /usr/local/lsws/cachedata }
-            - { name: "{{ .Values.openlitespeed }}-tmp-volume",     mountPath: /tmp/lshttpd }
+            - { name: "{{ .Values.openlitespeed }}-vhosts-volume",       mountPath: /var/www/vhosts }
+            - { name: "{{ .Values.openlitespeed }}-config-volume",       mountPath: /usr/local/lsws/conf }
+            - { name: "{{ .Values.openlitespeed }}-admin-volume",        mountPath: /usr/local/lsws/admin/conf }
+            - { name: "{{ .Values.openlitespeed }}-phpini-volume",       mountPath: /etc/ols-php-ini }
+            - { name: "{{ .Values.openlitespeed }}-logs-volume",         mountPath: /usr/local/lsws/logs }
+            - { name: "{{ .Values.openlitespeed }}-cache-volume",        mountPath: /usr/local/lsws/cachedata }
+            - { name: "{{ .Values.openlitespeed }}-tmp-volume",          mountPath: /tmp/lshttpd }
+            - { name: "{{ .Values.openlitespeed }}-vhost-data-volume",   mountPath: /var/www/data,   readOnly: true }
+            - { name: "{{ .Values.openlitespeed }}-vhost-shared-volume", mountPath: /var/www/shared, readOnly: true }
       volumes:
         - name: "{{ .Values.openlitespeed }}-vhosts-volume"
           persistentVolumeClaim: { claimName: "{{ .Values.openlitespeed }}-vhosts-pvc" }
-        - name: "{{ .Values.openlitespeed }}-private-volume"
-          persistentVolumeClaim: { claimName: "{{ .Values.openlitespeed }}-private-pvc" }
-        - name: "{{ .Values.openlitespeed }}-public-volume"
-          persistentVolumeClaim: { claimName: "{{ .Values.openlitespeed }}-public-pvc" }
         - name: "{{ .Values.openlitespeed }}-config-volume"
           persistentVolumeClaim: { claimName: "{{ .Values.openlitespeed }}-config-pvc" }
         - name: "{{ .Values.openlitespeed }}-admin-volume"
@@ -222,6 +218,10 @@ spec:
           emptyDir: { sizeLimit: 100Gi }
         - name: "{{ .Values.openlitespeed }}-tmp-volume"
           emptyDir: { sizeLimit: 100Gi }
+        - name: "{{ .Values.openlitespeed }}-vhost-data-volume"
+          persistentVolumeClaim: { claimName: "{{ .Values.openlitespeed }}-vhost-data-pvc" }
+        - name: "{{ .Values.openlitespeed }}-vhost-shared-volume"
+          persistentVolumeClaim: { claimName: "{{ .Values.openlitespeed }}-vhost-shared-pvc" }
 
 ---
 apiVersion: v1
@@ -264,7 +264,7 @@ apiVersion: traefik.io/v1alpha1
 kind: MiddlewareTCP
 metadata: { name: "{{ .Values.openlitespeed }}-admin-allowlist", namespace: "{{ .Values.namespace }}" }
 spec:
-  ipAllowList: { sourceRange: [ {{ .Values.olsAdminWhiteList }} ] }
+  ipAllowList: { sourceRange: [ {{ .Values.openlitespeedAdminWhiteList }} ] }
 
 ---
 apiVersion: traefik.io/v1alpha1