diff --git a/src/config/iisnode_schema.xml b/src/config/iisnode_schema.xml index 578cea4..7aaa322 100644 --- a/src/config/iisnode_schema.xml +++ b/src/config/iisnode_schema.xml @@ -50,9 +50,9 @@ Details at http://learn.iis.net/page.aspx/241/configuration-extensibility/ - + - + diff --git a/src/config/iisnode_schema_x64.xml b/src/config/iisnode_schema_x64.xml index 87b4578..64997e0 100644 --- a/src/config/iisnode_schema_x64.xml +++ b/src/config/iisnode_schema_x64.xml @@ -50,9 +50,9 @@ Details at http://learn.iis.net/page.aspx/241/configuration-extensibility/ - + - + diff --git a/src/iisnode/cfilewatcher.cpp b/src/iisnode/cfilewatcher.cpp index 51ab3d2..e6b3b14 100644 --- a/src/iisnode/cfilewatcher.cpp +++ b/src/iisnode/cfilewatcher.cpp @@ -555,7 +555,7 @@ BOOL CFileWatcher::ScanDirectory(WatchedDirectory* directory, BOOL unc) { if (file->yamlConfig) { - // the node.config file has changed + // the iisnode.yml file has changed // invalidate the configuration such that on next message it will be re-created CModuleConfiguration::Invalidate(); diff --git a/src/iisnode/cprotocolbridge.cpp b/src/iisnode/cprotocolbridge.cpp index 00ba33b..6368a5d 100644 --- a/src/iisnode/cprotocolbridge.cpp +++ b/src/iisnode/cprotocolbridge.cpp @@ -74,9 +74,9 @@ BOOL CProtocolBridge::SendIisnodeError(IHttpContext* httpCtx, HRESULT hr) "OK", hr, TRUE, - "iisnode was unable to read the configuration file node.config. Make sure the node.config file syntax is correct. For reference, check " - " " - "the sample node.config file. The property names recognized in the node.config file of your version of iisnode are stored in the " + "iisnode was unable to read the configuration file iisnode.yml. Make sure the iisnode.yml file syntax is correct. For reference, check " + " " + "the sample iisnode.yml file. The property names recognized in the iisnode.yml file of your version of iisnode are stored in the " "%systemroot%\\system32\\inetsrv\\config\\schema\\iisnode_schema.xml file."); break; }; diff --git a/src/iisnode/iisnode.vcxproj b/src/iisnode/iisnode.vcxproj index 858cdd6..2860ea3 100644 --- a/src/iisnode/iisnode.vcxproj +++ b/src/iisnode/iisnode.vcxproj @@ -320,7 +320,7 @@ copy /y $(ProjectDir)\..\config\* $(ProjectDir)\..\..\build\$(Configuration)\$(P - + @@ -338,7 +338,7 @@ copy /y $(ProjectDir)\..\config\* $(ProjectDir)\..\..\build\$(Configuration)\$(P - + true diff --git a/src/iisnode/iisnode.vcxproj.filters b/src/iisnode/iisnode.vcxproj.filters index 79def18..dcfff5b 100644 --- a/src/iisnode/iisnode.vcxproj.filters +++ b/src/iisnode/iisnode.vcxproj.filters @@ -609,15 +609,9 @@ Tests\functional\tests - - Samples\configuration - Tests\functional\www\124_node_config_override - - Tests\functional\www\124_node_config_override - Tests\functional\www\124_node_config_override @@ -648,6 +642,12 @@ Tests\functional\tests + + Samples\configuration + + + Tests\functional\www\124_node_config_override + diff --git a/src/samples/configuration/node.config b/src/samples/configuration/iisnode.yml similarity index 98% rename from src/samples/configuration/node.config rename to src/samples/configuration/iisnode.yml index 3716a6d..a1a0f06 100644 --- a/src/samples/configuration/node.config +++ b/src/samples/configuration/iisnode.yml @@ -1,4 +1,4 @@ -# The optional node.config file provides overrides of the iisnode configuration settings specified in web.config. +# The optional iisnode.yml file provides overrides of the iisnode configuration settings specified in web.config. # node_env - determines the environment (production, development, staging, ...) in which # child node processes run; if nonempty, is propagated to the child node processes as their NODE_ENV @@ -59,7 +59,7 @@ maxRequestBufferSize: 65536 # each entry consists of an optional directory name plus required file name which are relative to the directory where the main application entry point # is located; wild cards are allowed in the file name portion only; for example: "*.js;node_modules\foo\lib\options.json;app_data\*.config.json" -watchedFiles: *.js;node.config +watchedFiles: *.js;iisnode.yml # uncFileChangesPollingInterval - applications are recycled when the underlying *.js file is modified; if the file resides # on a UNC share, the only reliable way to detect such modifications is to periodically poll for them; this setting diff --git a/src/samples/configuration/readme.htm b/src/samples/configuration/readme.htm index 073044f..63ccd76 100644 --- a/src/samples/configuration/readme.htm +++ b/src/samples/configuration/readme.htm @@ -13,7 +13,7 @@ configuration

There are several configuration options that can be controlled from the system.webServer/iisnode - section of the web.config configuration file or the node.config file. Review web.config or node.config below for detailed description + section of the web.config configuration file or the iisnode.yml file. Review web.config or iisnode.yml below for detailed description of them.

visit the node.js endpoint at hello.js
visit the logs at logs (only available after you @@ -134,7 +134,7 @@ console.log('Application started at location ' + process.env.PORT); * configOverrides - optional file name containing overrides of configuration settings of the iisnode section of web.config; the format of the file is a small subset of YAML: each setting is represented as a <key>: <value> on a separate line and comments start with # until the end of the line, e.g. - # This is a sample node.config file + # This is a sample iisnode.yml file nodeProcessCountPerApplication: 2 maxRequestBufferSize: 8192 # increasing from the default # maxConcurrentRequestsPerProcess: 512 - commented out setting @@ -182,8 +182,8 @@ console.log('Application started at location ' + process.env.PORT); </system.webServer> </configuration>

- node.config

- 
# The optional node.config file provides overrides of the iisnode configuration settings specified in web.config.
+        iisnode.yml

+    
# The optional iisnode.yml file provides overrides of the iisnode configuration settings specified in web.config.
 
 # node_env - determines the environment (production, development, staging, ...) in which
 # child node processes run; if nonempty, is propagated to the child node processes as their NODE_ENV
@@ -244,7 +244,7 @@ maxRequestBufferSize: 65536
 # each entry consists of an optional directory name plus required file name which are relative to the directory where the main application entry point
 # is located; wild cards are allowed in the file name portion only; for example: "*.js;node_modules\foo\lib\options.json;app_data\*.config.json"
 
-watchedFiles: *.js;node.config
+watchedFiles: *.js;iisnode.yml
 
 # uncFileChangesPollingInterval - applications are recycled when the underlying *.js file is modified; if the file resides
 # on a UNC share, the only reliable way to detect such modifications is to periodically poll for them; this setting
diff --git a/src/samples/configuration/web.config b/src/samples/configuration/web.config
index 6041289..c612560 100644
--- a/src/samples/configuration/web.config
+++ b/src/samples/configuration/web.config
@@ -99,7 +99,7 @@
     * configOverrides - optional file name containing overrides of configuration settings of the iisnode section of web.config; 
       the format of the file is a small subset of YAML: each setting is represented as a :  on a separate line 
       and comments start with # until the end of the line, e.g. 
-            # This is a sample node.config file
+            # This is a sample iisnode.yml file
             nodeProcessCountPerApplication: 2
             maxRequestBufferSize: 8192 # increasing from the default
             # maxConcurrentRequestsPerProcess: 512 - commented out setting
@@ -117,7 +117,7 @@
       asyncCompletionThreadCount="0"
       initialRequestBufferSize="4096"
       maxRequestBufferSize="65536"
-      watchedFiles="*.js;node.config"
+      watchedFiles="*.js;iisnode.yml"
       uncFileChangesPollingInterval="5000"      
       gracefulShutdownTimeout="60000"
       loggingEnabled="true"
@@ -132,7 +132,7 @@
       flushResponse="false"      
       enableXFF="false"
       promoteServerVars=""
-      configOverrides="node.config"
+      configOverrides="iisnode.yml"
      />