wip #6278 @01

diff --git a/.env.dev b/.env.dev
index a9fda084775692c6b7b5eab140af88efbb53d9c9..cc07b24076d22b4e2bbeb0de3316ffacfb58be8a 100644 (file)
--- a/.env.dev
+++ b/.env.dev
@@ -8,20 +8,20 @@ APP_VARIANTS=PMI,MICHSCI
 LOG_CHANNEL=stack
 
 DB_CONNECTION=mysql
-DB_HOST=localhost
+DB_HOST=pmi-dev-mariadb
 DB_PORT=3306
-DB_DATABASE=pmi_dev
-DB_USERNAME=pmi
-DB_PASSWORD=ZJMcD6nAc3xnLjLVKZ2iWi69
+DB_DATABASE=pmi-dev
+DB_USERNAME=root
+DB_PASSWORD=PFBq8Exwz7ys5CzR
 
 BROADCAST_DRIVER=log
-CACHE_DRIVER=memcached
+CACHE_DRIVER=redis
 QUEUE_CONNECTION=sync
 SESSION_DRIVER=file
 SESSION_LIFETIME=120
 SESSION_DOMAIN=.pm-instrumentation.com,.michsci-europe.com
 
-REDIS_HOST=127.0.0.1
+REDIS_HOST=pmi-dev-redis
 REDIS_PASSWORD=null
 REDIS_PORT=6379
 
@@ -50,12 +50,12 @@ BACKPACK_LICENSE=YwdOWjeEczPAwy06GzkBJggW
 
 CUBIST_INTERNAL_SEARCH=true
 
-ELASTICSEARCH_HOST=clockwork.cubedesigners.com
+ELASTICSEARCH_HOST=pmi-dev-elasticsearch
 ELASTICSEARCH_PORT=9200
 ELASTICSEARCH_SCHEME=http
 ELASTICSEARCH_USER=
 ELASTICSEARCH_PASS=
-ELASTICSEARCH_INDEX_NAME=pmi_dev
+ELASTICSEARCH_INDEX_NAME=index
 
 FEATURE_QUOTE=true
 FEATURE_NEWS=true

diff --git a/public/.htaccess b/public/.htaccess
index f28bd85323d61b23158a290bcc9bd89449d4e04b..047d554a5b820f58ab8e771832c0877e72a38b13 100644 (file)
--- a/public/.htaccess
+++ b/public/.htaccess
@@ -5,10 +5,6 @@
 
     RewriteEngine On
 
-    # Redirect to https if accessing from http
-    RewriteCond %{HTTPS} off
-    RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L]
-
     # Redirect all subdomains to www
     RewriteCond %{HTTP_HOST} =en.michsci-europe.com [OR]
     RewriteCond %{HTTP_HOST} =staging.michsci-europe.com [OR]