diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index df9225a187abd80797c6ed7609ad840bbcde2972..98c03925ba20a1d30102f2d12918ffb691bcd5de 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -157,6 +157,7 @@ development: - $INCREMENTAL_ROLLOUT_ENABLED - $INCREMENTAL_ROLLOUT_MODE + production: variables: ADDITIONAL_HOSTS: "www.metager.de,metager.org,www.metager.org,metager.es,www.metager.es,klassik.metager.org" diff --git a/app/Http/Controllers/MetaGerSearch.php b/app/Http/Controllers/MetaGerSearch.php index ae0b4d9c162e37f4c0e451d187f7654b54b2411f..4f0bcbdac6387a1d90a32e2109f77d040d0c7d83 100644 --- a/app/Http/Controllers/MetaGerSearch.php +++ b/app/Http/Controllers/MetaGerSearch.php @@ -267,8 +267,13 @@ class MetaGerSearch extends Controller ->with('tips', $tips); } - public function quicktips($search) + public function quicktips(Request $request) { + $search = $request->input('search', ''); + if(empty($search)){ + abort(404); + } + $quicktips = new \App\Models\Quicktips\Quicktips($search); return view('quicktips') ->with('quicktips', $quicktips->getResults()) diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml index 98090f8dd40a0a84716afea640d72b7cffca4718..b790fdcba3e3bb955c5c11bbdb36f56de234240a 100644 --- a/chart/templates/deployment.yaml +++ b/chart/templates/deployment.yaml @@ -30,6 +30,15 @@ spec: tier: "{{ .Values.application.tier }}" release: {{ .Release.Name }} spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: worker + operator: NotIn + values: + - temp imagePullSecrets: {{ toYaml .Values.image.secrets | indent 10 }} securityContext: @@ -37,7 +46,7 @@ spec: volumes: - name: mglogs-persistent-storage persistentVolumeClaim: - claimName: mglogs + claimName: mg-logs containers: # Main PHP-FPM Container - name: {{ .Chart.Name }}-phpfpm diff --git a/chart/values.yaml b/chart/values.yaml index 9655f29aad744c9e731ff1090339a0fecf59b46a..f4508a0baf071005b5a9876c66f9a17feca716bc 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -50,14 +50,14 @@ prometheus: metrics: false livenessProbe: path: "/" - initialDelaySeconds: 15 + initialDelaySeconds: 40 timeoutSeconds: 15 scheme: "HTTP" probeType: "httpGet" readinessProbe: path: "/" - initialDelaySeconds: 5 - timeoutSeconds: 3 + initialDelaySeconds: 30 + timeoutSeconds: 15 scheme: "HTTP" probeType: "httpGet" postgresql: diff --git a/routes/web.php b/routes/web.php index 7f6093e491b6413cc4604a2ddaa2f24f81126fb5..16b658253b881a5d38385eea7c4137c440d95e78 100644 --- a/routes/web.php +++ b/routes/web.php @@ -196,7 +196,7 @@ Route::group( Route::get('pluginClose', 'LogController@pluginClose'); Route::get('pluginInstall', 'LogController@pluginInstall'); - Route::get('qt/{eingabe}', 'MetaGerSearch@quicktips'); + Route::get('qt', 'MetaGerSearch@quicktips'); Route::get('tips', 'MetaGerSearch@tips'); Route::get('/plugins/opensearch.xml', 'StartpageController@loadPlugin'); Route::get('owi', function () {