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 (file)
--- 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 (file)
--- 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