Fixes #11871: rudder_reporting file is invalid on nodes if it contain…

…s '&&' in one of its parameter
Normation · Dec 12, 2017 · d72e2db · d72e2db
1 parent b8bc6e9
commit d72e2db
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/rudder-core/src/main/scala/com/normation/rudder/ncf/TechniqueWriter.scala b/rudder-core/src/main/scala/com/normation/rudder/ncf/TechniqueWriter.scala
@@ -226,15 +226,15 @@ class ClassicTechniqueWriter extends AgentSpecificTechniqueWriter {
         <NAME>{technique.bundleName.value}</NAME>
         {if (needReportingBundle) <NAME>{technique.bundleName.value}_rudder_reporting</NAME>}
       </BUNDLES>
-      { if (needReportingBundle)
-        <TMLS>
-          <TML name="rudder_reporting"/>
-        </TMLS>
-      }
       <FILES>
         <FILE name={s"RUDDER_CONFIGURATION_REPOSITORY/ncf/50_techniques/${technique.bundleName.value}/${technique.bundleName.value}.cf"}>
           <INCLUDED>true</INCLUDED>
         </FILE>
+        { if (needReportingBundle)
+          <FILE name={s"RUDDER_CONFIGURATION_REPOSITORY/techniques/ncf_techniques/${technique.bundleName.value}/${technique.version.value}/rudder_reporting.cf"}>
+            <INCLUDED>true</INCLUDED>
+          </FILE>
+        }
       </FILES>
     </AGENT>
     Right(xml)

diff --git a/...s/configuration-repository/techniques/ncf_techniques/technique_by_Rudder/1.0/metadata.xml b/...s/configuration-repository/techniques/ncf_techniques/technique_by_Rudder/1.0/metadata.xml
@@ -5,13 +5,13 @@
       <NAME>technique_by_Rudder</NAME>
       <NAME>technique_by_Rudder_rudder_reporting</NAME>
     </BUNDLES>
-    <TMLS>
-      <TML name="rudder_reporting"/>
-    </TMLS>
     <FILES>
       <FILE name="RUDDER_CONFIGURATION_REPOSITORY/ncf/50_techniques/technique_by_Rudder/technique_by_Rudder.cf">
         <INCLUDED>true</INCLUDED>
       </FILE>
+      <FILE name="RUDDER_CONFIGURATION_REPOSITORY/techniques/ncf_techniques/technique_by_Rudder/1.0/rudder_reporting.cf">
+        <INCLUDED>true</INCLUDED>
+      </FILE>
     </FILES>
   </AGENT>
   <AGENT type="dsc">