diff --git a/app/Http/Controllers/MetaGerSearch.php b/app/Http/Controllers/MetaGerSearch.php index 032d739bdd2a8d0c2fcdd33a8fa08e10008eb1bd..d1d1f592684015da37811d1e7e0a83d48bdaa1ed 100644 --- a/app/Http/Controllers/MetaGerSearch.php +++ b/app/Http/Controllers/MetaGerSearch.php @@ -22,11 +22,6 @@ class MetaGerSearch extends Controller $timings = ['starttime' => microtime(true)]; } $time = microtime(true); - $spamEntries = []; - $spamEntry = null; - if (file_exists(config_path('spam.txt'))) { - $spamEntries = file(config_path('spam.txt')); - } $focus = $request->input("focus", "web"); @@ -41,17 +36,6 @@ class MetaGerSearch extends Controller return redirect(LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), '/')); } - foreach ($spamEntries as $index => $entry) { - $entry = trim($entry); - if (empty($entry)) { - continue; - } - if (preg_match("/" . $entry . "/si", $eingabe)) { - $spamEntry = $entry; - break; - } - } - # Mit gelieferte Formulardaten parsen und abspeichern: $metager->parseFormData($request); if (!empty($timings)) { @@ -70,12 +54,6 @@ class MetaGerSearch extends Controller return $metager->createView(); } - if ($spamEntry !== null && Cache::has('spam.' . $metager->getFokus() . "." . md5($spamEntry))) { - $responseContent = Cache::get('spam.' . $metager->getFokus() . "." . md5($spamEntry)); - $responseContent = preg_replace('/(name="eingabe"\s+value=")[^"]+/', "$1$eingabe", $responseContent); - return response($responseContent); - } - $quicktips = $metager->createQuicktips(); if (!empty($timings)) { $timings["createQuicktips"] = microtime(true) - $time; @@ -143,13 +121,6 @@ class MetaGerSearch extends Controller # Die Ausgabe erstellen: $resultpage = $metager->createView($quicktipResults); - if ($spamEntry !== null) { - try { - Cache::put('spam.' . $metager->getFokus() . "." . md5($spamEntry), $resultpage->render(), 604800); - } catch (\Exception $e) { - Log::error($e->getMessage()); - } - } if (!empty($timings)) { $timings["createView"] = microtime(true) - $time; diff --git a/app/MetaGer.php b/app/MetaGer.php index 144b9e0789a3cd45c106036329dc9e79b90b5dd8..d2a10ba34a14f6d14f2141dc8a4a5a3cc20b3e5a 100644 --- a/app/MetaGer.php +++ b/app/MetaGer.php @@ -90,17 +90,17 @@ class MetaGer $this->domainsBlacklisted = explode("\n", $tmp); $tmp = file_get_contents(config_path() . "/blacklistUrl.txt"); $this->urlsBlacklisted = explode("\n", $tmp); - } else { - Log::warning("Achtung: Eine, oder mehrere Blacklist Dateien, konnten nicht geöffnet werden"); } + # Versuchen Blacklists einzulesen - if (file_exists(config_path() . "/adBlacklistDomains.txt") && file_exists(config_path() . "/adBlacklistUrl.txt")) { + if (file_exists(config_path() . "/adBlacklistDomains.txt")) { $tmp = file_get_contents(config_path() . "/adBlacklistDomains.txt"); $this->adDomainsBlacklisted = explode("\n", $tmp); + } + + if(file_exists(config_path() . "/adBlacklistUrl.txt")){ $tmp = file_get_contents(config_path() . "/adBlacklistUrl.txt"); $this->adUrlsBlacklisted = explode("\n", $tmp); - } else { - Log::warning("Achtung: Eine, oder mehrere Blacklist Dateien, konnten nicht geöffnet werden"); } # Parser Skripte einhängen diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml index 11157b054c57ce716155708d0ccdad14e06410b7..2ada99a0eac36cbea1cf0b3b6c1d247cac7180c7 100644 --- a/chart/templates/deployment.yaml +++ b/chart/templates/deployment.yaml @@ -45,24 +45,12 @@ spec: imagePullSecrets: {{ toYaml .Values.image.secrets | indent 10 }} volumes: + - name: secrets + secret: + secretName: {{ .Values.application.secretName }} - name: mglogs-persistent-storage persistentVolumeClaim: claimName: mg-logs - - name: env-files - secret: - secretName: metager-env - - name: sumas - secret: - secretName: metager-sumas - - name: sumas-en - secret: - secretName: metager-sumas-en - - name: blacklist - secret: - secretName: metager-blacklist - - name: blacklist-ad - secret: - secretName: metager-ad-blacklist - name: metager-config configMap: name: metager @@ -105,41 +93,37 @@ spec: - name: mglogs-persistent-storage mountPath: /html/storage/logs/metager readOnly: false - - name: env-files + - name: secrets mountPath: /root/.env - subPath: .env + subPath: env readOnly: true - - name: env-files + - name: secrets mountPath: /html/database/seeds/UsersSeeder.php - subPath: UsersSeeder.php - readOnly: true - - name: env-files - mountPath: /html/config/spam.txt - subPath: spam.txt + subPath: userseeder readOnly: true - - name: sumas + - name: secrets mountPath: /html/config/sumas.json - subPath: sumas.json + subPath: sumas readOnly: true - - name: sumas-en + - name: secrets mountPath: /html/config/sumasEn.json - subPath: sumasEn.json + subPath: sumasen readOnly: true - - name: blacklist + - name: secrets mountPath: /html/config/blacklistUrl.txt - subPath: blacklistUrl.txt + subPath: blacklisturl readOnly: true - - name: blacklist + - name: secrets mountPath: /html/config/blacklistDomains.txt - subPath: blacklistDomains.txt + subPath: blacklistdomains readOnly: true - - name: blacklist-ad + - name: secrets mountPath: /html/config/adBlacklistUrl.txt - subPath: adBlacklistUrl.txt + subPath: adblacklisturl readOnly: true - - name: blacklist-ad + - name: secrets mountPath: /html/config/adBlacklistDomains.txt - subPath: adBlacklistDomains.txt + subPath: adblacklistdomains readOnly: true resources: {{ toYaml .Values.resourcesPhpfpm | indent 12 }} @@ -220,9 +204,9 @@ spec: command: ["su"] args: ["-s", "/bin/sh", "-c", "php artisan requests:fetcher", "nginx"] volumeMounts: - - name: env-files + - name: secrets mountPath: /html/.env - subPath: .env + subPath: env readOnly: true imagePullPolicy: {{ .Values.image.pullPolicy }} livenessProbe: