From: Ian Weller <ian@gaslightmedia.com>
Date: Wed, 6 Aug 2014 19:49:09 +0000 (+0000)
Subject: accidently commited bad htaccess and config
X-Git-Tag: v1.0.0~2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=26a2177863bf5040adcf1947a4dc8192b666cb8c;p=web%2FTroutCreek.git

accidently commited bad htaccess and config
This line, and those below, will be ignored--

M    config/server.ini
M    .htaccess
---

diff --git a/.htaccess b/.htaccess
index 075119b..17d264b 100644
--- a/.htaccess
+++ b/.htaccess
@@ -14,7 +14,7 @@ Deny from all
 RewriteEngine On
 AddDefaultCharset utf-8
 
-#RewriteBase /~ian/www.troutcreek.com/
+#RewriteBase /www.troutcreek.com/
 
 # Redirect non-www to www
 RewriteCond %{ENV:GLM_HOST_ID} PRODUCTION
diff --git a/config/server.ini b/config/server.ini
index 576c343..85116c2 100644
--- a/config/server.ini
+++ b/config/server.ini
@@ -180,7 +180,7 @@ error.display     = 1
 error.ident       = ""
 error.conf.path        = "/var/www/server/"
 
-database.params.host = "ds4"
+database.params.host = "devdb"
 
 development = On