diff --git a/charts/timesketch/config/regex_features.yaml b/charts/timesketch/config/regex_features.yaml index e1e7a1c..ff35840 100644 --- a/charts/timesketch/config/regex_features.yaml +++ b/charts/timesketch/config/regex_features.yaml @@ -73,7 +73,7 @@ github_accounts: query_string: 'source_short:"WEBHIST" AND url:"https://github.com/users" AND title:"Your Profile"' attribute: 'url' store_as: 'found_account' - re: 'https://github.com/users/([A-z-\d]{1,39})' + re: 'https://github.com/users/([A-z\-\d]{1,39})' re_flags: [] tags: ['github-account'] emojis: ['ID_BUTTON'] @@ -83,7 +83,7 @@ linkedin_accounts: query_string: 'source_short:"WEBHIST" AND url:"https://www.linkedin.com/in/" AND url:"/edit/"' attribute: 'url' store_as: 'found_account' - re: 'https://www.linkedin.com/in/([A-z-\d]{5,32})/edit/' + re: 'https://www.linkedin.com/in/([a-z\-\d]{5,32})/edit/' tags: ['linkedin-account'] emojis: ['ID_BUTTON'] diff --git a/charts/timesketch/templates/deployment-frontend.yaml b/charts/timesketch/templates/deployment-frontend.yaml index 854c3a4..3151a23 100644 --- a/charts/timesketch/templates/deployment-frontend.yaml +++ b/charts/timesketch/templates/deployment-frontend.yaml @@ -32,7 +32,7 @@ spec: {{- toYaml .Values.frontend.securityContext | nindent 12 }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.image.pullPolicy }} - command: ["sh", "-c", "update-ca-certificates && cp /var/timesketch.conf /etc/ && gunicorn --bind 0.0.0.0:8080 --log-file - \ + command: ["sh", "-c", "update-ca-certificates && cp /etc/timesketch/timesketch.conf /etc/ && gunicorn --bind 0.0.0.0:8080 --log-file - \ --error-logfile - --log-level info \ --capture-output --timeout 600 --limit-request-line 8190 \ --workers 4 timesketch.wsgi:application"] @@ -66,11 +66,11 @@ spec: {{ $recreatedPath := (regexReplaceAll "__" $path "/") | trimPrefix "config/" }} {{ $key := (regexReplaceAll "/" $path "__") }} - name: timesketch-default-config - mountPath: /config/{{ $recreatedPath }} + mountPath: /etc/timesketch/{{ $recreatedPath }} subPath: {{ $key }} {{- end }} - name: timesketch-conf - mountPath: /var/timesketch.conf + mountPath: /etc/timesketch/timesketch.conf subPath: timesketch.conf readOnly: false - name: ca-cert diff --git a/charts/timesketch/templates/deployment-worker.yaml b/charts/timesketch/templates/deployment-worker.yaml index 9241a47..fa9a0a6 100644 --- a/charts/timesketch/templates/deployment-worker.yaml +++ b/charts/timesketch/templates/deployment-worker.yaml @@ -32,7 +32,7 @@ spec: {{- toYaml .Values.worker.securityContext | nindent 12 }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.image.pullPolicy }} - command: ["sh", "-c", "update-ca-certificates && cp /var/timesketch.conf /etc/ && celery -A timesketch.lib.tasks worker \ + command: ["sh", "-c", "update-ca-certificates && celery -A timesketch.lib.tasks worker \ --loglevel=DEBUG"] env: - name: POD_NAME @@ -62,11 +62,11 @@ spec: {{ $recreatedPath := (regexReplaceAll "__" $path "/") | trimPrefix "config/" }} {{ $key := (regexReplaceAll "/" $path "__") }} - name: timesketch-default-config - mountPath: /config/{{ $recreatedPath }} + mountPath: /etc/timesketch/{{ $recreatedPath }} subPath: {{ $key }} {{- end }} - name: timesketch-conf - mountPath: /var/timesketch.conf + mountPath: /etc/timesketch/timesketch.conf subPath: timesketch.conf readOnly: true - name: ca-cert