From 232156a7f9e24ce96c240eca5ea0b410a027f132 Mon Sep 17 00:00:00 2001
From: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date: Sun, 5 Jul 2015 15:43:41 +0200
Subject: [PATCH] enhance config...

---
 README.md                   | 11 +++++++++--
 web/serverconfig.sample.php |  3 +--
 web/yaamp/config.php        |  6 ------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index f9f2c2c..6ee0f46 100755
--- a/README.md
+++ b/README.md
@@ -4,6 +4,7 @@ Required:
 
 	linux, mysql, php, memcached
 
+
 Config for nginx:
 
 	location / {
@@ -20,22 +21,27 @@ Config for nginx:
 		include fastcgi_params;
 	}
 
-If you use apache, it should be something like (already set in web/.htaccess):
+
+If you use apache, it should be something like that (already set in web/.htaccess):
 
 	RewriteEngine on
 
 	RewriteCond %{REQUEST_FILENAME} !-f
 	RewriteRule ^(.*) index.php?r=$1 [QSA]
 
+
 If you use lighttpd, use the following config:
 
 	$HTTP["host"] =~ "yiimp.ccminer.org" {
 	        server.document-root = "/var/yaamp/web"
 	        url.rewrite-if-not-file = (
-	                "^(.*)\?(.*)" => "index.php?r=$1&$2",
+			"^(.*)/([0-9]+)$" => "index.php?r=$1&id=$2",
+			"^(.*)\?(.*)" => "index.php?r=$1&$2",
 	                "^(.*)" => "index.php?r=$1",
 	                "." => "index.php"
 	        )
+
+		url.access-deny = ( "~", ".dat", ".log" )
 	}
 
 
@@ -47,6 +53,7 @@ Add your exchange API keys in:
 
 	web/yaamp/core/exchange/*
 
+
 Look at web/yaamp/core/trading/ there are a few place where there're hardcoded withdraw BTC address (cryptsy, bittrex and bleutrade).
 
 Edit web/serverconfig.php
diff --git a/web/serverconfig.sample.php b/web/serverconfig.sample.php
index 5d61a0b..b9a46e5 100644
--- a/web/serverconfig.sample.php
+++ b/web/serverconfig.sample.php
@@ -1,6 +1,6 @@
 <?php
 
-ini_set('date.timezone', 'Canada/Eastern');
+ini_set('date.timezone', 'UTC');
 
 define('YAAMP_LOGS', '/var/log/yaamp');
 define('YAAMP_HTDOCS', '/var/web');
@@ -27,4 +27,3 @@ $cold_wallet_table = array(
 	'1C23KmLeCaQSLLyKVykHEUse1R7jRDv9j9' => 0.10,
 );
 
-
diff --git a/web/yaamp/config.php b/web/yaamp/config.php
index d03f2fd..e20b364 100644
--- a/web/yaamp/config.php
+++ b/web/yaamp/config.php
@@ -13,7 +13,6 @@ return array(
 
 	'preload'=>array('log'),
 	'import'=>array('application.components.*'),
-//	'params'=>require("siteconfig.php"),
 
 	'components'=>array(
 
@@ -22,11 +21,6 @@ return array(
 			'showScriptName'=>false,
 			'appendParams'=>false,
 			'caseSensitive'=>false,
-			'rules'=>array(
-				'<controller:\w+>/<id:\d+>'=>'<controller>/view',
-				'<controller:\w+>/<action:\w+>/<id:\d+>'=>'<controller>/<action>',
-				'<controller:\w+>/<action:\w+>'=>'<controller>/<action>',
-			),
 		),
 
 		'assetManager'=>array(