change _properties to .properties in minifi.properties.d

Author: fgerlits

README.md

@@ -465,8 +465,8 @@ The files conf/minifi.properties, conf/minifi-log.properties and conf/minifi-uid
 these are the default settings supplied by the latest MiNiFi version. If you would like to modify these, you should create a corresponding
 .d directory (e.g. conf/minifi.properties.d) and put your settings in a new file inside this directory. These files are read and applied
 in lexicographic order, after the default settings file.
-The Windows installer creates a conf/minifi.properties.d/10_installer_properties file, which contains C2 connection settings.
-If C2 is enabled and settings are added/modified from the C2 server, these will be saved in conf/minifi.properties.d/90_c2_properties.
+The Windows installer creates a conf/minifi.properties.d/10_installer.properties file, which contains C2 connection settings.
+If C2 is enabled and settings are added/modified from the C2 server, these will be saved in conf/minifi.properties.d/90_c2.properties.
 
 The conf/config.yml file contains the flow definition (i.e. the layout of processors, controller services etc). When you start MiNiFi for
 the first time, the flow will be fetched from the C2 server (if available), or a file containing an empty flow will be created by MiNiFi.

libminifi/include/properties/Properties.h

@@ -47,7 +47,7 @@ class PropertiesImpl : public virtual Properties {
 
   ~PropertiesImpl() override = default;
 
-  static constexpr std::string_view C2PropertiesFileName = "90_c2_properties";
+  static constexpr std::string_view C2PropertiesFileName = "90_c2.properties";
 
   const std::string& getName() const override {
     return name_;

packaging/msi/WixWin.wsi.in

@@ -305,13 +305,13 @@ ${WIX_EXTRA_FEATURES}
               <Directory Id="MINIFIPROP.D" Name="minifi.properties.d">
                 <Component Id="UpdateConfig" Guid="87658309-0339-425c-8633-f54ffaaa4945" Permanent="yes">
                   <CreateFolder />
-                  <IniFile Id="ConfigFileA" Action="addLine" Name="10_installer_properties" Directory="MINIFIPROP.D" Section="c2props" Key="nifi.c2.agent.class" Value="[AGENT_CLASS]" />
-                  <IniFile Id="ConfigFileI" Action="addLine" Name="10_installer_properties" Directory="MINIFIPROP.D" Section="c2props" Key="nifi.c2.agent.identifier" Value="[AGENT_IDENTIFIER]" />
-                  <IniFile Id="ConfigFileE" Action="addLine" Name="10_installer_properties" Directory="MINIFIPROP.D" Section="c2props" Key="nifi.c2.enable" Value="true" />
-                  <IniFile Id="ConfigFileT" Action="addLine" Name="10_installer_properties" Directory="MINIFIPROP.D" Section="c2props" Key="nifi.c2.agent.heartbeat.period" Value="[AGENT_HEARTBEAT]" />
-                  <IniFile Id="ConfigFileS" Action="addLine" Name="10_installer_properties" Directory="MINIFIPROP.D" Section="c2props" Key="nifi.c2.rest.path.base" Value="[SERVER_PATH_BASE]" />
-                  <IniFile Id="ConfigFileH" Action="addLine" Name="10_installer_properties" Directory="MINIFIPROP.D" Section="c2props" Key="nifi.c2.rest.url" Value="[SERVER_HEARTBEAT]" />
-                  <IniFile Id="ConfigFileAck" Action="addLine" Name="10_installer_properties" Directory="MINIFIPROP.D" Section="c2props" Key="nifi.c2.rest.url.ack" Value="[SERVER_ACK]" />
+                  <IniFile Id="ConfigFileA" Action="addLine" Name="10_installer.properties" Directory="MINIFIPROP.D" Section="c2props" Key="nifi.c2.agent.class" Value="[AGENT_CLASS]" />
+                  <IniFile Id="ConfigFileI" Action="addLine" Name="10_installer.properties" Directory="MINIFIPROP.D" Section="c2props" Key="nifi.c2.agent.identifier" Value="[AGENT_IDENTIFIER]" />
+                  <IniFile Id="ConfigFileE" Action="addLine" Name="10_installer.properties" Directory="MINIFIPROP.D" Section="c2props" Key="nifi.c2.enable" Value="true" />
+                  <IniFile Id="ConfigFileT" Action="addLine" Name="10_installer.properties" Directory="MINIFIPROP.D" Section="c2props" Key="nifi.c2.agent.heartbeat.period" Value="[AGENT_HEARTBEAT]" />
+                  <IniFile Id="ConfigFileS" Action="addLine" Name="10_installer.properties" Directory="MINIFIPROP.D" Section="c2props" Key="nifi.c2.rest.path.base" Value="[SERVER_PATH_BASE]" />
+                  <IniFile Id="ConfigFileH" Action="addLine" Name="10_installer.properties" Directory="MINIFIPROP.D" Section="c2props" Key="nifi.c2.rest.url" Value="[SERVER_HEARTBEAT]" />
+                  <IniFile Id="ConfigFileAck" Action="addLine" Name="10_installer.properties" Directory="MINIFIPROP.D" Section="c2props" Key="nifi.c2.rest.url.ack" Value="[SERVER_ACK]" />
                   <Condition><![CDATA[ENABLEC2="1"]]></Condition>
                 </Component>
               </Directory>