diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 54cdae77206c0a4de689ff246c7c362edd4bb269..acd4464664bb33d5c2e463f62483db54697fb71b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,74 +37,6 @@ stages:
build:
services:
-# Prepares the secret files that we cannot or don't want to share with public
-prepare_secrets_master:
- stage: prepare
- image: alpine:latest
- script:
- - cp $ENVFILE .env
- - cp $SUMAS config/sumas.json
- - cp $SUMASEN config/sumasEn.json
- - cp $BLACKLISTURL config/blacklistUrl.txt
- - cp $BLACKLISTDOMAINS config/blacklistDomains.txt
- - cp $ADBLACKLISTURL config/adBlacklistUrl.txt
- - cp $ADBLACKLISTDOMAINS config/adBlacklistDomains.txt
- - cp $SPAM config/spam.txt
- - cp $USERSSEEDER database/seeds/UsersSeeder.php
- - cp database/useragents.sqlite.example database/useragents.sqlite
- - sed -i 's/^APP_ENV=.*/APP_ENV=production/g' .env
- - sed -i 's/^REDIS_PASSWORD=.*/REDIS_PASSWORD=null/g' .env
- artifacts:
- paths:
- - .env
- - config/sumas.json
- - config/sumasEn.json
- - config/blacklistUrl.txt
- - config/blacklistDomains.txt
- - config/adBlacklistUrl.txt
- - config/adBlacklistDomains.txt
- - config/spam.txt
- - database/seeds/UsersSeeder.php
- - database/useragents.sqlite
- only:
- refs:
- - master
-
-prepare_secrets_development:
- stage: prepare
- image: alpine:latest
- script:
- - cp $ENVFILE .env
- - cp $SUMAS config/sumas.json
- - cp $SUMASEN config/sumasEn.json
- - cp $BLACKLISTURL config/blacklistUrl.txt
- - cp $BLACKLISTDOMAINS config/blacklistDomains.txt
- - cp $ADBLACKLISTURL config/adBlacklistUrl.txt
- - cp $ADBLACKLISTDOMAINS config/adBlacklistDomains.txt
- - cp $SPAM config/spam.txt
- - cp $USERSSEEDER database/seeds/UsersSeeder.php
- - cp database/useragents.sqlite.example database/useragents.sqlite
- - sed -i 's/^APP_ENV=.*/APP_ENV=development/g' .env
- - sed -i 's/^REDIS_PASSWORD=.*/REDIS_PASSWORD=null/g' .env
- artifacts:
- paths:
- - .env
- - config/sumas.json
- - config/sumasEn.json
- - config/blacklistUrl.txt
- - config/blacklistDomains.txt
- - config/adBlacklistUrl.txt
- - config/adBlacklistDomains.txt
- - config/spam.txt
- - database/seeds/UsersSeeder.php
- - database/useragents.sqlite
- only:
- - branches
- - tags
- except:
- refs:
- - master
-
prepare_node:
stage: prepare
image: node:10
@@ -211,6 +143,11 @@ integrationtest:
script:
# Install Dev Dependencies
- composer install
+ - cp .env.example .env
+ - echo "WEBDRIVER_USER=\"$WEBDRIVER_KEY\"" >> .env
+ - echo "WEBDRIVER_URL=\"$WEBDRIVER_URL\"" >> .env
+ - echo "WEBDRIVER_KEY=\"$WEBDRIVER_USER\"" >> .env
+ - php artisan key:generate
- URL=$(cat environment_url.txt | tr -d '\n')
- sed -i "s#^APP_URL=.*#APP_URL=$URL#g" .env
- sed -i "s#^BRANCH_NAME=.*#BRANCH_NAME=$CI_COMMIT_REF_NAME#g" .env
diff --git a/Dockerfile b/Dockerfile
index 7bfbc1866a1f3b39b5a057fbaac0c42e7fa298c9..a74f916b948735b21b1bc4ae838d4f2a515dae5d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -69,7 +69,11 @@ COPY --chown=root:nginx . /html
WORKDIR /html
EXPOSE 80
-CMD chown -R root:nginx storage/logs/metager bootstrap/cache && \
+CMD cp /root/.env .env && \
+ sed -i 's/^REDIS_PASSWORD=.*/REDIS_PASSWORD=null/g' .env && \
+ if [ "$GITLAB_ENVIRONMENT_NAME" = "production" ]; then sed -i 's/^APP_ENV=.*/APP_ENV=production/g' .env; else sed -i 's/^APP_ENV=.*/APP_ENV=development/g' .env; fi && \
+ cp database/useragents.sqlite.example database/useragents.sqlite && \
+ chown -R root:nginx storage/logs/metager bootstrap/cache && \
chmod -R g+w storage/logs/metager bootstrap/cache && \
crond -L /dev/stdout && \
php-fpm7
diff --git a/app/Http/Controllers/MetaGerSearch.php b/app/Http/Controllers/MetaGerSearch.php
index 4d594cb5b85cdfd1dc1735fdb0320fb200b551d5..55589b09cd032fcb5454049a6deb038bf6ff6d43 100644
--- a/app/Http/Controllers/MetaGerSearch.php
+++ b/app/Http/Controllers/MetaGerSearch.php
@@ -7,6 +7,7 @@ use App\MetaGer;
use Cache;
use Illuminate\Http\Request;
use LaravelLocalization;
+use Log;
use View;
class MetaGerSearch extends Controller
@@ -63,7 +64,7 @@ class MetaGerSearch extends Controller
# Search query can be empty after parsing the formdata
# we will cancel the search in that case and show an error to the user
- if(empty($metager->getQ())){
+ if (empty($metager->getQ())) {
return $metager->createView();
}
@@ -109,7 +110,11 @@ class MetaGerSearch extends Controller
}
}
- Cache::put("loader_" . $metager->getSearchUid(), $metager->getEngines(), 60 * 60);
+ try {
+ Cache::put("loader_" . $metager->getSearchUid(), $metager->getEngines(), 60 * 60);
+ } catch (\Exception $e) {
+ Log::error($e->getMessage());
+ }
if (!empty($timings)) {
$timings["Filled resultloader Cache"] = microtime(true) - $time;
}
@@ -117,7 +122,11 @@ class MetaGerSearch extends Controller
# Die Ausgabe erstellen:
$resultpage = $metager->createView();
if ($spamEntry !== null) {
- Cache::put('spam.' . $metager->getFokus() . "." . md5($spamEntry), $resultpage->render(), 604800);
+ try {
+ Cache::put('spam.' . $metager->getFokus() . "." . md5($spamEntry), $resultpage->render(), 604800);
+ } catch (\Exception $e) {
+ Log::error($e->getMessage());
+ }
}
if (!empty($timings)) {
@@ -133,7 +142,7 @@ class MetaGerSearch extends Controller
$counter->incBy(sizeof($metager->getResults()));
$counter = $registry->getOrRegisterCounter('metager', 'query_counter', 'counts total number of search queries', []);
$counter->inc();
-
+
return $resultpage;
}
@@ -225,7 +234,7 @@ class MetaGerSearch extends Controller
$result["finished"] = $finished;
- if($newResults > 0){
+ if ($newResults > 0) {
$registry = \Prometheus\CollectorRegistry::getDefault();
$counter = $registry->getOrRegisterCounter('metager', 'result_counter', 'counts total number of returned results', []);
$counter->incBy($newResults);
@@ -290,7 +299,7 @@ class MetaGerSearch extends Controller
{
$search = $request->input('search', '');
$quotes = $request->input('quotes', 'on');
- if(empty($search)){
+ if (empty($search)) {
abort(404);
}
diff --git a/app/Http/Middleware/HumanVerification.php b/app/Http/Middleware/HumanVerification.php
index a39debc384ccfb8a86bbc3f7a3c99311431f4054..5599671c6102f335ee32d1c2e3b9f8b8eefa2453 100644
--- a/app/Http/Middleware/HumanVerification.php
+++ b/app/Http/Middleware/HumanVerification.php
@@ -7,6 +7,7 @@ use Captcha;
use Closure;
use Cookie;
use Illuminate\Http\Response;
+use Log;
use URL;
class HumanVerification
@@ -66,7 +67,6 @@ class HumanVerification
} else {
$user = $users[$uid];
}
-
# Lock out everyone in a Bot network
# Find out how many requests this IP has made
$sum = 0;
@@ -128,16 +128,23 @@ class HumanVerification
if ($user["unusedResultPages"] === 50 || ($user["unusedResultPages"] > 50 && $user["unusedResultPages"] % 25 === 0)) {
$user["locked"] = true;
}
-
}
+ \App\PrometheusExporter::HumanVerificationSuccessfull();
+ } catch (\Exception $e) {
+ Log::error($e->getMessage());
+ \App\PrometheusExporter::HumanVerificationError();
} finally {
- if ($update) {
+ if ($update && $user != null) {
if ($user["whitelist"]) {
$user["expiration"] = now()->addWeeks(2);
} else {
$user["expiration"] = now()->addHours(72);
}
- $this->setUser($prefix, $user);
+ try {
+ $this->setUser($prefix, $user);
+ } catch (\Exception $e) {
+ Log::error($e->getMessage());
+ }
}
}
@@ -148,7 +155,6 @@ class HumanVerification
public function setUser($prefix, $user)
{
- // Lock must be acquired within 2 seconds
$userList = Cache::get($prefix . "." . $user["id"], []);
$userList[$user["uid"]] = $user;
Cache::put($prefix . "." . $user["id"], $userList, 2 * 7 * 24 * 60 * 60);
diff --git a/app/Models/Quicktips/Quicktips.php b/app/Models/Quicktips/Quicktips.php
index ba558afcf9dd0f498c2ae3bf15dec2686f2784f2..1210568fe193be1f0f8295598e6249d8627d0fba 100644
--- a/app/Models/Quicktips/Quicktips.php
+++ b/app/Models/Quicktips/Quicktips.php
@@ -32,12 +32,23 @@ class Quicktips
$url = $this->quicktipUrl . "?search=" . $this->normalize_search($search) . "&locale=" . $locale . ""es=" . $quotes;
$this->hash = md5($url);
- if (!Cache::has($this->hash)) {
+ $results = null;
+
+ try {
+ if (!Cache::has($this->hash)) {
+ $results = file_get_contents($url);
+ Cache::put($this->hash, $results, Quicktips::CACHE_DURATION);
+ } else {
+ $results = Cache::get($this->hash);
+ }
+ } catch (\Exception $e) {
+ Log::error($e->getMessage());
+ }
+
+ if ($results === null) {
$results = file_get_contents($url);
- Cache::put($this->hash, $results, Quicktips::CACHE_DURATION);
- } else {
- $results = Cache::get($this->hash);
}
+
$this->results = $this->loadResults($results);
}
diff --git a/app/Models/Searchengine.php b/app/Models/Searchengine.php
index eba7c83bd86e4a2104b17fd5a165de4c43fc3570..9cafcf0c61aa5b5d1542b6054ae25ec13127b327 100644
--- a/app/Models/Searchengine.php
+++ b/app/Models/Searchengine.php
@@ -5,6 +5,7 @@ namespace App\Models;
use App\MetaGer;
use Cache;
use Illuminate\Support\Facades\Redis;
+use Log;
abstract class Searchengine
{
@@ -94,7 +95,7 @@ abstract class Searchengine
$tmpPara = true;
$engineParameterKey = $filter->sumas->{$name}->{"get-parameter"};
$engineParameterValue = $filter->sumas->{$name}->values->{$inputParameter};
- if(stripos($engineParameterValue, "dyn-") === 0){
+ if (stripos($engineParameterValue, "dyn-") === 0) {
$functionname = substr($engineParameterValue, stripos($engineParameterValue, "dyn-") + 4);
$engineParameterValue = \App\DynamicEngineParameters::$functionname();
}
@@ -207,7 +208,11 @@ abstract class Searchengine
}
if ($body !== null) {
- Cache::put($this->hash, $body, $this->cacheDuration * 60);
+ try {
+ Cache::put($this->hash, $body, $this->cacheDuration * 60);
+ } catch (\Exception $e) {
+ Log::error($e->getMessage());
+ }
$this->loadResults($body);
$this->getNext($metager, $body);
$this->markNew();
diff --git a/app/PrometheusExporter.php b/app/PrometheusExporter.php
index 1332e1cf2f5176fbcd91e6b8c704ac7cc692fa9c..dd70db4e0a2c3a240aab2675bd5f718486faed46 100644
--- a/app/PrometheusExporter.php
+++ b/app/PrometheusExporter.php
@@ -2,24 +2,41 @@
namespace App;
-class PrometheusExporter {
+class PrometheusExporter
+{
- public static function CaptchaShown() {
+ public static function CaptchaShown()
+ {
$registry = \Prometheus\CollectorRegistry::getDefault();
$counter = $registry->getOrRegisterCounter('metager', 'captcha_shown', 'counts how often the captcha was shown', []);
$counter->inc();
}
- public static function CaptchaCorrect() {
+ public static function CaptchaCorrect()
+ {
$registry = \Prometheus\CollectorRegistry::getDefault();
$counter = $registry->getOrRegisterCounter('metager', 'captcha_correct', 'counts how often the captcha was solved correctly', []);
$counter->inc();
}
- public static function CaptchaAnswered() {
+ public static function CaptchaAnswered()
+ {
$registry = \Prometheus\CollectorRegistry::getDefault();
$counter = $registry->getOrRegisterCounter('metager', 'captcha_answered', 'counts how often the captcha was answered', []);
$counter->inc();
}
-}
\ No newline at end of file
+ public static function HumanVerificationSuccessfull()
+ {
+ $registry = \Prometheus\CollectorRegistry::getDefault();
+ $counter = $registry->getOrRegisterCounter('metager', 'humanverification_success', 'counts how often humanverification middleware was successfull', []);
+ $counter->inc();
+ }
+
+ public static function HumanVerificationError()
+ {
+ $registry = \Prometheus\CollectorRegistry::getDefault();
+ $counter = $registry->getOrRegisterCounter('metager', 'humanverification_error', 'counts how often humanverification middleware had an error', []);
+ $counter->inc();
+ }
+}
diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml
index b790fdcba3e3bb955c5c11bbdb36f56de234240a..c01a6f1142d516d7048360218bfe80887ce5c063 100644
--- a/chart/templates/deployment.yaml
+++ b/chart/templates/deployment.yaml
@@ -47,6 +47,21 @@ spec:
- 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
containers:
# Main PHP-FPM Container
- name: {{ .Chart.Name }}-phpfpm
@@ -81,6 +96,42 @@ spec:
- name: mglogs-persistent-storage
mountPath: /html/storage/logs/metager
readOnly: false
+ - name: env-files
+ mountPath: /root/.env
+ subPath: .env
+ readOnly: true
+ - name: env-files
+ mountPath: /html/database/seeds/UsersSeeder.php
+ subPath: UsersSeeder.php
+ readOnly: true
+ - name: env-files
+ mountPath: /html/config/spam.txt
+ subPath: spam.txt
+ readOnly: true
+ - name: sumas
+ mountPath: /html/config/sumas.json
+ subPath: sumas.json
+ readOnly: true
+ - name: sumas-en
+ mountPath: /html/config/sumasEn.json
+ subPath: sumasEn.json
+ readOnly: true
+ - name: blacklist
+ mountPath: /html/config/blacklistUrl.txt
+ subPath: blacklistUrl.txt
+ readOnly: true
+ - name: blacklist
+ mountPath: /html/config/blacklistDomains.txt
+ subPath: blacklistDomains.txt
+ readOnly: true
+ - name: blacklist-ad
+ mountPath: /html/config/adBlacklistUrl.txt
+ subPath: adBlacklistUrl.txt
+ readOnly: true
+ - name: blacklist-ad
+ mountPath: /html/config/adBlacklistDomains.txt
+ subPath: adBlacklistDomains.txt
+ readOnly: true
resources:
requests:
cpu: 500m
diff --git a/contributor license agreement.md b/contributor license agreement.md
new file mode 100644
index 0000000000000000000000000000000000000000..7e7cbcd9f1a2d15b38a46aa381c9246cb9891f68
--- /dev/null
+++ b/contributor license agreement.md
@@ -0,0 +1,79 @@
+
+# Contributor Agreement
+### Entity Contributor Non-Exclusive License Agreement (including the Traditional Patent License OPTION)
+
+Thank you for your interest in contributing to SUMA-EV – Verein für freien Wissenszugang's MetaGer ("We" or "Us").
+
+The purpose of this contributor agreement ("Agreement") is to clarify and document the rights granted by contributors to Us.
+
+## 1. Definitions
+
+"You" means the individual Copyright owner who Submits a Contribution to Us.
+
+"Legal Entity" means an entity that is not a natural person.
+
+"Affiliate" means any other Legal Entity that controls, is controlled by, or under common control with that Legal Entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such Legal Entity, whether by contract or otherwise, (ii) ownership of fifty percent (50%) or more of the outstanding shares or securities that vote to elect the management or other persons who direct such Legal Entity or (iii) beneficial ownership of such entity.
+
+"Contribution" means any original work of authorship, including any original modifications or additions to an existing work of authorship, Submitted by You to Us, in which You own the Copyright.
+
+"Copyright" means all rights protecting works of authorship, including copyright, moral and neighboring rights, as appropriate, for the full term of their existence.
+
+"Material" means the software or documentation made available by Us to third parties. When this Agreement covers more than one software project, the Material means the software or documentation to which the Contribution was Submitted. After You Submit the Contribution, it may be included in the Material.
+
+"Submit" means any act by which a Contribution is transferred to Us by You by means of tangible or intangible media, including but not limited to electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, Us, but excluding any transfer that is conspicuously marked or otherwise designated in writing by You as "Not a Contribution."
+
+"Documentation" means any non-software portion of a Contribution.
+## 2. License grant
+### 2.1 Copyright license to Us
+
+Subject to the terms and conditions of this Agreement, You hereby grant to Us a worldwide, royalty-free, NON-exclusive, perpetual and irrevocable (except as stated in Section 8.2) license, with the right to transfer an unlimited number of non-exclusive licenses or to grant sublicenses to third parties, under the Copyright covering the Contribution to use the Contribution by all means, including, but not limited to:
+
+- publish the Contribution,
+- modify the Contribution,
+- prepare derivative works based upon or containing the Contribution and/or to combine the Contribution with other Materials,
+- reproduce the Contribution in original or modified form,
+- distribute, to make the Contribution available to the public, display and publicly perform the Contribution in original or modified form.
+
+## 2.2 Moral rights
+
+Moral Rights remain unaffected to the extent they are recognized and not waivable by applicable law. Notwithstanding, You may add your name to the attribution mechanism customary used in the Materials you Contribute to, such as the header of the source code files of Your Contribution, and We will respect this attribution when using Your Contribution.
+## 3. Patents
+### 3.1 Patent license
+
+Subject to the terms and conditions of this Agreement You hereby grant to Us and to recipients of Materials distributed by Us a worldwide, royalty-free, non-exclusive, perpetual and irrevocable (except as stated in Section 3.2) patent license, with the right to transfer an unlimited number of non-exclusive licenses or to grant sublicenses to third parties, to make, have made, use, sell, offer for sale, import and otherwise transfer the Contribution and the Contribution in combination with any Material (and portions of such combination). This license applies to all patents owned or controlled by You, whether already acquired or hereafter acquired, that would be infringed by making, having made, using, selling, offering for sale, importing or otherwise transferring of Your Contribution(s) alone or by combination of Your Contribution(s) with any Material.
+3.2 Revocation of patent license
+
+You reserve the right to revoke the patent license stated in section 3.1 if We make any infringement claim that is targeted at your Contribution and not asserted for a Defensive Purpose. An assertion of claims of the Patents shall be considered for a "Defensive Purpose" if the claims are asserted against an entity that has filed, maintained, threatened, or voluntarily participated in a patent infringement lawsuit against Us or any of Our licensees.
+## 4. License obligations by Us
+
+We agree to (sub)license the Contribution or any Materials containing, based on or derived from your Contribution under the terms of any licenses the Free Software Foundation classifies as Free Software License and which are approved by the Open Source Initiative as Open Source licenses.
+
+We agree to license patents owned or controlled by You only to the extent necessary to (sub)license Your Contribution(s) and the combination of Your Contribution(s) with the Material under the terms of any licenses the Free Software Foundation classifies as Free Software licenses and which are approved by the Open Source Initiative as Open Source licenses.
+## 5. Disclaimer
+
+THE CONTRIBUTION IS PROVIDED "AS IS". MORE PARTICULARLY, ALL EXPRESS OR IMPLIED WARRANTIES INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTY OF SATISFACTORY QUALITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE EXPRESSLY DISCLAIMED BY YOU TO US AND BY US TO YOU. TO THE EXTENT THAT ANY SUCH WARRANTIES CANNOT BE DISCLAIMED, SUCH WARRANTY IS LIMITED IN DURATION AND EXTENT TO THE MINIMUM PERIOD AND EXTENT PERMITTED BY LAW.
+
+## 6. Consequential damage waiver
+
+TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT WILL YOU OR WE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF ANTICIPATED SAVINGS, LOSS OF DATA, INDIRECT, SPECIAL, INCIDENTAL, CONSEQUENTIAL AND EXEMPLARY DAMAGES ARISING OUT OF THIS AGREEMENT REGARDLESS OF THE LEGAL OR EQUITABLE THEORY (CONTRACT, TORT OR OTHERWISE) UPON WHICH THE CLAIM IS BASED.
+## 7. Approximation of disclaimer and damage waiver
+
+IF THE DISCLAIMER AND DAMAGE WAIVER MENTIONED IN SECTION 5. AND SECTION 6. CANNOT BE GIVEN LEGAL EFFECT UNDER APPLICABLE LOCAL LAW, REVIEWING COURTS SHALL APPLY LOCAL LAW THAT MOST CLOSELY APPROXIMATES AN ABSOLUTE WAIVER OF ALL CIVIL OR CONTRACTUAL LIABILITY IN CONNECTION WITH THE CONTRIBUTION.
+## 8. Term
+
+- 8.1 This Agreement shall come into effect upon commiting your contribution to our software repository.
+
+- 8.2 This Agreement shall apply for the term of the copyright and patents licensed here. However, You shall have the right to terminate the Agreement if We do not fulfill the obligations as set forth in Section 4. Such termination must be made in writing.
+
+- 8.3 In the event of a termination of this Agreement Sections 5, 6, 7, 8 and 9 shall survive such termination and shall remain in full force thereafter. For the avoidance of doubt, Free and Open Source Software (sub)licenses that have already been granted for Contributions at the date of the termination shall remain in full force after the termination of this Agreement.
+## 9 Miscellaneous
+
+- 9.1 This Agreement and all disputes, claims, actions, suits or other proceedings arising out of this agreement or relating in any way to it shall be governed by the laws of Germany excluding its private international law provisions.
+
+- 9.2 This Agreement sets out the entire agreement between You and Us for Your Contributions to Us and overrides all other agreements or understandings.
+
+- 9.3 In case of Your death, this agreement shall continue with Your heirs. In case of more than one heir, all heirs must exercise their rights through a commonly authorized person.
+
+- 9.4 If any provision of this Agreement is found void and unenforceable, such provision will be replaced to the extent possible with a provision that comes closest to the meaning of the original provision and that is enforceable. The terms and conditions set forth in this Agreement shall apply notwithstanding any failure of essential purpose of this Agreement or any limited remedy to the maximum extent possible under law.
+
+- 9.5 You agree to notify Us of any facts or circumstances of which you become aware that would make this Agreement inaccurate in any respect.
\ No newline at end of file
diff --git a/resources/views/datenschutz/english.blade.php b/resources/views/datenschutz/english.blade.php
index e70d7394933d0ea8ed3ad2a427ba8cbd96945ceb..c253a5b12394b49af7bb38ff4939a5fd8398884c 100644
--- a/resources/views/datenschutz/english.blade.php
+++ b/resources/views/datenschutz/english.blade.php
@@ -270,8 +270,7 @@
</div>
<div class="section">
<h1>Hosting</h1>
- The websites under the domain "suma-ev.de" are hosted and administered by Intares GmbH. The remaining services
- are administrated by us, the SUMA-EV, and operated on hired hardware at Hetzner Online GmbH.
+ Our services are administrated by us, the SUMA-EV, and operated on rented hardware at Hetzner Online GmbH.
</div>
<div class="section">
<h1>Legal basis for processing</h1>
@@ -345,4 +344,4 @@
Like our offers, this privacy policy is subject to constant change. You should therefore read it again
regularly.
<br />This version of our Privacy Policy is dated 2018-05-24.
- </div>
\ No newline at end of file
+ </div>
diff --git a/resources/views/datenschutz/german.blade.php b/resources/views/datenschutz/german.blade.php
index 104b834885f848122ba780ef3bfb727dc58b7364..572b56b5e12ecd3af2baaba0d703ca77ed791da6 100644
--- a/resources/views/datenschutz/german.blade.php
+++ b/resources/views/datenschutz/german.blade.php
@@ -286,8 +286,7 @@
</div>
<div class="section">
<h1>Hosting</h1>
- Die Webseiten unter der Domain „suma-ev.de“ werden bei der Intares GmbH gehostet und administriert. Die übrigen
- Dienste werden von uns, dem SUMA-EV, administriert und auf angemieteter Hardware bei der Hetzner Online GmbH
+ Unsere Dienste werden von uns, dem SUMA-EV, administriert und auf angemieteter Hardware bei der Hetzner Online GmbH
betrieben.
</div>
<div class="section">
@@ -366,4 +365,4 @@
Wie unsere Angebote ist auch diese Datenschutzerklärung einem ständigen Wandel unterworfen. Sie sollten sie
daher regelmäßig erneut lesen.
<br />Die vorliegende Version unserer Datenschutzerklärung trägt folgendes Datum: 2018-05-24
- </div>
\ No newline at end of file
+ </div>