Moved access.index to config/files.index

metarhia · Feb 14, 2015 · 8eeaaf7 · j-martyn · Mar 4, 2015 · 8eeaaf7
1 parent cf22c3f
commit 8eeaaf7
Show file tree

Hide file tree

Showing 21 changed files with 7 additions and 25 deletions.
diff --git a/examples/exampleApplication/applications/example/app/access.js b/examples/exampleApplication/applications/example/app/access.js
@@ -4,6 +4,5 @@ module.exports = {
   http:   true,
   https:  true,
   intro:  false,
-  index:  true,
   groups: []
 };
diff --git a/examples/exampleApplication/applications/example/app/api/access.js b/examples/exampleApplication/applications/example/app/api/access.js
@@ -4,6 +4,5 @@ module.exports = {
   http:   true,
   https:  true,
   intro:  true,
-  index:  false,
   groups: []
 };
diff --git a/examples/exampleApplication/applications/example/app/api/auth/access.js b/examples/exampleApplication/applications/example/app/api/auth/access.js
@@ -4,6 +4,5 @@ module.exports = {
   http:   true,
   https:  true,
   intro:  false,
-  index:  false,
   groups: []
 };
diff --git a/examples/exampleApplication/applications/example/app/examples/access.js b/examples/exampleApplication/applications/example/app/examples/access.js
@@ -4,6 +4,5 @@ module.exports = {
   http:   true,
   https:  true,
   intro:  true,
-  index:  false,
   groups: []
 };
diff --git a/examples/exampleApplication/applications/example/app/examples/auth/access.js b/examples/exampleApplication/applications/example/app/examples/auth/access.js
@@ -4,6 +4,5 @@ module.exports = {
   http:   true,
   https:  true,
   intro:  false,
-  index:  false,
   groups: []
 };
diff --git a/examples/exampleApplication/applications/example/app/examples/cache/apiMethod.json/access.js b/examples/exampleApplication/applications/example/app/examples/cache/apiMethod.json/access.js
@@ -1,4 +1,3 @@
 module.exports = {
-  intro:  false,
-  index:  false
+  intro:  false
 };
diff --git a/examples/exampleApplication/applications/example/app/examples/cache/htmlPage.ajax/access.js b/examples/exampleApplication/applications/example/app/examples/cache/htmlPage.ajax/access.js
@@ -1,4 +1,3 @@
 module.exports = {
-  intro:  false,
-  index:  false
+  intro:  false
 };
diff --git a/examples/exampleApplication/applications/example/app/examples/override/access.js b/examples/exampleApplication/applications/example/app/examples/override/access.js
@@ -1,4 +1,3 @@
 module.exports = {
-  intro:  false,
-  index:  false
+  intro:  false
 };
diff --git a/examples/exampleApplication/applications/example/app/examples/rest/access.js b/examples/exampleApplication/applications/example/app/examples/rest/access.js
@@ -4,7 +4,6 @@
   http:    true,
   https:   true,
   intro:   true,
-  index:   true,
   virtual: true,
   groups:  []
 };
diff --git a/...es/exampleApplication/applications/example/app/examples/simple/virtualPath.json/access.js b/...es/exampleApplication/applications/example/app/examples/simple/virtualPath.json/access.js
@@ -4,7 +4,6 @@ module.exports = {
   http:    true,
   https:   true,
   intro:   true,
-  index:   false,
   virtual: true,
   groups: []
 };
diff --git a/examples/exampleApplication/applications/example/static/js/access.js b/examples/exampleApplication/applications/example/static/js/access.js
@@ -4,6 +4,5 @@ module.exports = {
   http:   true,
   https:  true,
   intro:  false,
-  index:  true,
   groups: []
 };
diff --git a/examples/impressCloudController/instanceC0/applications/example/app/access.js b/examples/impressCloudController/instanceC0/applications/example/app/access.js
@@ -4,6 +4,5 @@ module.exports = {
   http:   true,
   https:  true,
   intro:  false,
-  index:  true,
   groups: []
 };
diff --git a/examples/impressCloudController/instanceC1/applications/example/app/access.js b/examples/impressCloudController/instanceC1/applications/example/app/access.js
@@ -4,6 +4,5 @@ module.exports = {
   http:   true,
   https:  true,
   intro:  false,
-  index:  true,
   groups: []
 };
diff --git a/examples/impressCloudController/instanceC2/applications/example/app/access.js b/examples/impressCloudController/instanceC2/applications/example/app/access.js
@@ -4,6 +4,5 @@ module.exports = {
   http:   true,
   https:  true,
   intro:  false,
-  index:  true,
   groups: []
 };
diff --git a/examples/minimalApplication/applications/example/app/access.js b/examples/minimalApplication/applications/example/app/access.js
@@ -4,6 +4,5 @@ module.exports = {
   http:   true,
   https:  true,
   intro:  false,
-  index:  true,
   groups: []
 };
diff --git a/examples/sseTestApp/applications/example/app/access.js b/examples/sseTestApp/applications/example/app/access.js
@@ -4,6 +4,5 @@ module.exports = {
   http:   true,
   https:  true,
   intro:  false,
-  index:  true,
   groups: []
 };
diff --git a/examples/sseTestApp/applications/example/app/api/access.js b/examples/sseTestApp/applications/example/app/api/access.js
@@ -4,6 +4,5 @@ module.exports = {
   http:   true,
   https:  true,
   intro:  true,
-  index:  true,
   groups: []
 };
diff --git a/lib/impress.application.js b/lib/impress.application.js
@@ -99,7 +99,7 @@ impress.mixinApplication = function(application) {
     }
   }
 
-  // Chacke system templates
+  // Check system templates
   //
   if (application !== impress) {
     application.systemTemplates = {};

diff --git a/lib/impress.constants.js b/lib/impress.constants.js
@@ -67,7 +67,6 @@ impress.DEFAULT_ACCESS = {
   http:    true,  // allow via HTTP 
   https:   true,  // allow via HTTPS
   intro:   false, // allow API introspection
-  index:   false, // allow directory index
   virtual: false, // allow virtual folders if true or reply 404 if false
   groups:  []     // allow access for certain groups (ampty list allows to all)
 };

diff --git a/lib/impress.index.js b/lib/impress.index.js
@@ -9,7 +9,7 @@ Client.prototype.index = function(indexPath) {
   client.execPath = client.realPath;
   client.execPathDir = client.realPathDir;
   client.fileHandler('access', false, function() {
-    if (client.access.index) {
+    if (application.config.files.index) {
       if (!client.res.headersSent) client.res.setHeader('Content-Type', impress.MIME_TYPES['html']);
       var files = [], dirs = [], dirPath = '';
       client.url.split('/').forEach(function(dir) {

diff --git a/schemas/config.application.definition.js b/schemas/config.application.definition.js
@@ -27,11 +27,11 @@ module.exports = {
 
   files: {
     minify:           'false:boolean',
-    static:           '[array]',
     cacheSize:        '100mb:size',
     cacheMaxFileSize: '1mb:size',
     gzip:             'true:boolean',
-    preprocess:       '[array]'
+    preprocess:       '[array]',
+    index:            'false:boolean'
   },
 
   log: {