fixing merge issues with main

helm/templates/configmap.yaml

@@ -16,3 +16,15 @@ data:
   PROBABILITY_ERROR_CODES: {{ .Values.config.probabilityErrorCodes | quote }}
   SERVER_HEADER: {{ .Values.config.serverHeader | quote }}
   CANARY_TOKEN_URL: {{ .Values.config.canaryTokenUrl | quote }}
+  {{- if .Values.config.dashboardSecretPath }}
+  DASHBOARD_SECRET_PATH: {{ .Values.config.dashboardSecretPath | quote }}
+  {{- end }}
+  {{- if .Values.config.serverHeader }}
+  SERVER_HEADER: {{ .Values.config.serverHeader | quote }}
+  {{- end }}
+  {{- if .Values.config.timezone }}
+  TIMEZONE: {{ .Values.config.timezone | quote }}
+  {{- end }}
+  # Database configuration
+  DATABASE_PATH: {{ .Values.database.path | quote }}
+  DATABASE_RETENTION_DAYS: {{ .Values.database.retentionDays | quote }}

helm/templates/deployment.yaml

@@ -54,6 +54,10 @@ spec:
           mountPath: /app/wordlists.json
           subPath: wordlists.json
           readOnly: true
+        {{- if .Values.database.persistence.enabled }}
+        - name: database
+          mountPath: /app/data
+        {{- end }}
         {{- with .Values.resources }}
         resources:
           {{- toYaml . | nindent 12 }}
@@ -62,6 +66,16 @@ spec:
       - name: wordlists
         configMap:
           name: {{ include "krawl.fullname" . }}-wordlists
+      {{- if .Values.database.persistence.enabled }}
+      - name: database
+        {{- if .Values.database.persistence.existingClaim }}
+        persistentVolumeClaim:
+          claimName: {{ .Values.database.persistence.existingClaim }}
+        {{- else }}
+        persistentVolumeClaim:
+          claimName: {{ include "krawl.fullname" . }}-db
+        {{- end }}
+      {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

helm/templates/pvc.yaml

@@ -0,0 +1,17 @@
+{{- if and .Values.database.persistence.enabled (not .Values.database.persistence.existingClaim) }}
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: {{ include "krawl.fullname" . }}-db
+  labels:
+    {{- include "krawl.labels" . | nindent 4 }}
+spec:
+  accessModes:
+    - {{ .Values.database.persistence.accessMode }}
+  {{- if .Values.database.persistence.storageClassName }}
+  storageClassName: {{ .Values.database.persistence.storageClassName }}
+  {{- end }}
+  resources:
+    requests:
+      storage: {{ .Values.database.persistence.size }}
+{{- end }}

helm/values.yaml

@@ -74,7 +74,29 @@ config:
   canaryTokenTries: 10
   probabilityErrorCodes: 0
   serverHeader: "Apache/2.2.22 (Ubuntu)"
+# timezone: "UTC"
+#  serverHeader: "Apache/2.2.22 (Ubuntu)"
+#  dashboardSecretPath: "/my-secret-dashboard"
 #  canaryTokenUrl: set-your-canary-token-url-here
+#  timezone: "UTC"  # IANA timezone (e.g., "America/New_York", "Europe/Rome"). If not set, system timezone is used.
+
+# Database configuration
+database:
+  # Path to the SQLite database file
+  path: "data/krawl.db"
+  # Number of days to retain access logs and attack data
+  retentionDays: 30
+  # Persistence configuration
+  persistence:
+    enabled: true
+    # Storage class name (use default if not specified)
+    # storageClassName: ""
+    # Access mode for the persistent volume
+    accessMode: ReadWriteOnce
+    # Size of the persistent volume
+    size: 1Gi
+    # Optional: Use existing PVC
+    # existingClaim: ""
 
 networkPolicy:
   enabled: true
@@ -268,6 +290,17 @@ wordlists:
       - .git/
       - keys/
       - credentials/
+  server_headers:
+    - Apache/2.2.22 (Ubuntu)
+    - nginx/1.18.0
+    - Microsoft-IIS/10.0
+    - LiteSpeed
+    - Caddy
+    - Gunicorn/20.0.4
+    - uvicorn/0.13.4
+    - Express
+    - Flask/1.1.2
+    - Django/3.1
   error_codes:
     - 400
     - 401