Merge branch 'development' into 'master'

Development

See merge request !1465

.gitlab-ci.yml

@@ -11,6 +11,8 @@ update(144.76.113.134):
     - which sqlite3
   script:
     - sh build.sh
+  variables:
+    STAGE: production
    
 update(metager2):
   tags:
@@ -25,6 +27,8 @@ update(metager2):
     - which sqlite3
   script:
     - sh build.sh
+  variables:
+    STAGE: production
     
 update(metager3.de):
   tags:
@@ -38,4 +42,6 @@ update(metager3.de):
     - which php
     - which sqlite3
   script:
-    - sh build.sh
+    - sh build.sh
\ No newline at end of file
+  variables:
+    STAGE: development
\ No newline at end of file

app/Models/Quicktips/Quicktips.php

@@ -11,7 +11,7 @@ class Quicktips
 {
     use DispatchesJobs;
 
-    const QUICKTIP_URL = "http://localhost:63825/1.1/quicktips.xml";
+    private $quicktipUrl = "/1.1/quicktips.xml";
     const QUICKTIP_NAME = "quicktips";
     const CACHE_DURATION = 60;
 
@@ -19,12 +19,17 @@ class Quicktips
 
     public function __construct($search, $locale, $max_time)
     {
+        if (env("APP_ENV") === "production") {
+            $this->quicktipUrl = "https://quicktips.metager.de" . $this->quicktipUrl;
+        } else {
+            $this->quicktipUrl = "https://dev.quicktips.metager.de" . $this->quicktipUrl;
+        }
         $this->startSearch($search, $locale, $max_time);
     }
 
     public function startSearch($search, $locale, $max_time)
     {
-        $url = self::QUICKTIP_URL . "?search=" . $this->normalize_search($search) . "&locale=" . $locale;
+        $url = $this->quicktipUrl . "?search=" . $this->normalize_search($search) . "&locale=" . $locale;
         # TODO anders weitergeben
         $this->hash = md5($url);
 

build.sh

@@ -8,7 +8,8 @@ if [ -d MetaGer_neu ]; then rm -rf MetaGer_neu;fi
 git clone "$path" MetaGer_neu
 cd MetaGer_neu
 composer install
-scp -P 63824 metager@metager3.de:~/.env .
+cp $ENVFILE .env
+sed -i -e "s/APP_ENV=production/APP_ENV=$STAGE/g" .env
 cp $SUMAS config/sumas.json
 cp $SUMASEN config/sumasEn.json
 scp -P 63824 metager@metager3.de:~/blacklistUrl.txt config/