wip #3046 @0.5

diff --git a/.env.production b/.env.production
index c065b1e38f679b54f248f452b70a4b4ca97a5cce..324e0dbf1cc8e94df98bb7a5f260c10dcb2259b2 100644 (file)
--- a/.env.production
+++ b/.env.production
@@ -2,8 +2,7 @@ APP_NAME=PMI
 APP_ENV=production
 APP_KEY=base64:/Jmlg7TepI/inQ4KJ3VF0YVTqghRGvvBrnDI7NkUk94=
 APP_DEBUG=true
-APP_URL=https://staging.pm-instrumentation.com
-
+APP_URL=https://www.pm-instrumentation.com
 LOG_CHANNEL=stack
 
 DB_CONNECTION=mysql
@@ -42,7 +41,7 @@ MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
 
 SEO_ROBOTS=true
 
-GOOGLE_ANALYTICS_ID=UA-4339912-10
+GOOGLE_ANALYTICS_ID=UA-11105497-1
 BACKPACK_LICENSE=YwdOWjeEczPAwy06GzkBJggW
 
 CUBIST_INTERNAL_SEARCH=true
@@ -61,3 +60,4 @@ FEATURE_I18N=false
 FEATURE_TEAM=true
 FEATURE_CLIENTS=true
 FEATURE_PARTNERS=true
+

diff --git a/public/.htaccess b/public/.htaccess
index dd46d0cb17204a6a8c61d6a61464dfa419ad9faa..cc89ef44967fb208bf01696c698406ec8e4665fc 100644 (file)
--- a/public/.htaccess
+++ b/public/.htaccess
@@ -10,9 +10,11 @@
     RewriteCond %{HTTP_HOST} (pm-instrumentation.com)$
     RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L]
 
-    # Redirect first dev space to staging
-    RewriteCond %{HTTP_HOST} =pmi.dev.cubedesigners.com
-    RewriteRule ^(.*)$ https://staging.pm-instrumentation.com/$1 [R=301,L]
+    # Redirect all subdomains to www
+    RewriteCond %{HTTP_HOST} =pmi.dev.cubedesigners.com [OR]
+    RewriteCond %{HTTP_HOST} =staging.pm-instrumentation.com [OR]
+    RewriteCond %{HTTP_HOST} =pm-instrumentation.com
+    RewriteRule ^(.*)$ https://www.pm-instrumentation.com/$1 [R=301,L]
 
     # Handle Authorization Header
     RewriteCond %{HTTP:Authorization} .