Commit 74f3c357 authored by Dominik Hebeler's avatar Dominik Hebeler

Merge branch 'development' into '932-dark-stylesheet-alternative'

Development

See merge request !1560
parents 8828d367 7ebeb31d
......@@ -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"
......
......@@ -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())
......
......@@ -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
......
......@@ -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:
......
......@@ -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 () {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment