Merge branch 'master' of git.assembla.com:nooku-server

nooku · Mar 4, 2013 · ad35705 · ad35705
2 parents 7e1ea3b + 405e597
commit ad35705
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/cookbooks/nginx-custom/templates/default/sites/nooku-server.erb b/cookbooks/nginx-custom/templates/default/sites/nooku-server.erb
@@ -36,8 +36,8 @@ server {
         alias $root/component/$1/resources/media/$2;
     }
 
-    location ~ /files/([_a-z-]+)/(.*)$ {
-        alias $root/sites/$1/files/$2;
+    location ~ /files/([_0-9a-zA-Z-]+)/(.*)$ {
+           alias $root/sites/$1/files/$2;
     }
 
     location ~* ^/application/(.*)/public/index.php$ {

diff --git a/cookbooks/nooku-server/templates/default/config.erb b/cookbooks/nooku-server/templates/default/config.erb
@@ -40,7 +40,6 @@ class JConfig
 
 	/* Debug Settings */
 	var $debug      = '0';
-	var $debug_db 	= '0';
 	var $debug_lang = '0';
 
 	/* SEO Settings */