Update for forcing https

for the entire site.

diff --git a/.htaccess b/.htaccess
index 5d91c00..414919c 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -21,6 +21,14 @@ RewriteCond %{ENV:GLM_HOST_ID} PRODUCTION
 RewriteCond %{HTTP_HOST} !^www\.troutcreek\. [NC]
 RewriteRule ^(.*)$ http://www.troutcreek.com/$1 [R=301,L]
 
+RewriteCond %{ENV:GLM_HOST_ID} DEVELOPMENT
+RewriteCond %{SERVER_PORT} 80
+RewriteRule ^(.*)$ https://dev53.gaslightmedia.com/www.troutcreek.com [R,L]
+
+RewriteCond %{ENV:GLM_HOST_ID} PRODUCTION
+RewriteCond %{SERVER_PORT} 80
+RewriteRule ^(.*)$ https://www.troutcreek.com [R,L]
+
 # CacheBusting
 RewriteCond %{REQUEST_URI} v/[0-9\.]+/
 RewriteRule ^v/[0-9\.]+/(.*) $1 [L]

diff --git a/config/server.ini b/config/server.ini
index 988f64c..223ce4a 100644 (file)
--- a/config/server.ini
+++ b/config/server.ini
@@ -163,7 +163,7 @@ resources.environment.css = "prod"
 ; development site configuration data inherits from production and
 ; overrides values as necessary
 [development : production]
-site_url = "http://dev53.gaslightmedia.com/www.troutcreek.com/"
+site_url = "https://dev53.gaslightmedia.com/www.troutcreek.com/"
 
 mobile.link =
 mobile.hostname = Off
@@ -171,7 +171,7 @@ mobile.hostname = Off
 google.search.key = "ABQIAAAANX0yQZ2OteLu_zqbwdfUuRTeX7yNUukyMrmY8FsCXcCA9axlYBTyhehgzuXOUfNI0E5UYHCLponA0A"
 google.maps.key   = "ABQIAAAANX0yQZ2OteLu_zqbwdfUuRQsHGkczIjpqPY1-dTKNoaiGtfPJBTloI-YH7fzUV-bsMLwcy2Yjyti7A"
 
-app.base_url        = "http://dev53.gaslightmedia.com/app.gaslightmedia.com/"
+app.base_url        = "https://dev53.gaslightmedia.com/app.gaslightmedia.com/"
 app.base_secure_url = "https://dev53.gaslightmedia.com/app.gaslightmedia.com/"
 
 error.reporting[] = E_ALL