Fixes #14193: Remove ncf.conf usage

Makefile

@@ -55,7 +55,6 @@ all: rudder-templates-cli.jar test
 	java -jar rudder-templates-cli.jar --outext .cf --outdir initial-promises/node-server/distributePolicy/1.0/ techniques/system/distributePolicy/1.0/*.st
 	cp techniques/system/distributePolicy/1.0/*.cf initial-promises/node-server/distributePolicy/1.0/ || true
 	mkdir -p initial-promises/node-server/distributePolicy/ncf
-	cp techniques/system/distributePolicy/1.0/rudder-ncf-conf initial-promises/node-server/distributePolicy/ncf/ncf.conf
 	mkdir -p initial-promises/node-server/distributePolicy/rsyslog.conf
 	mv initial-promises/node-server/distributePolicy/1.0/rudder-rsyslog-root.cf initial-promises/node-server/distributePolicy/rsyslog.conf/rudder-rsyslog-root.conf
 	mv initial-promises/node-server/distributePolicy/1.0/rudder-rsyslog-relay.cf initial-promises/node-server/distributePolicy/rsyslog.conf/rudder-rsyslog-relay.conf

techniques/system/common/1.0/promises.st

@@ -170,6 +170,9 @@ bundle common va
       "SUSE" expression => "sles";
       "SuSE" expression => "sles";
       "suse" expression => "sles";
+
+    # We are inside Rudder policies
+      "rudder_policies" => "any";
 
     # I don't know why, but these classes are not evaluated if they are in rudder_roles
       # Policy Server is a machine which delivers promises

techniques/system/common/1.0/site.cf

@@ -122,8 +122,3 @@ bundle common g
     "role_rudder_cfengine_mission_portal"  expression => fileexists("${rudder_base}/etc/server-roles.d/rudder-cfengine-mission-portal");
 }
 
-# defines the path to the ncf configuration file
-bundle common ncf_configuration {
-  vars:
-    "ncf_configuration_file" string => "${g.rudder_ncf}/local/ncf.conf";
-}

techniques/system/distributePolicy/1.0/metadata.xml

@@ -61,10 +61,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     <FILE name="apache-acl.cf">
       <INCLUDED>true</INCLUDED>
     </FILE>
-    <FILE name="rudder-ncf-conf">
-      <OUTPATH>distributePolicy/ncf/ncf.conf</OUTPATH>
-      <INCLUDED>false</INCLUDED>
-    </FILE>
     <FILE name="send-clean.sh">
       <INCLUDED>false</INCLUDED>
     </FILE>
@@ -99,7 +95,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     <SECTION name="Synchronize files" component="true"/>
     <SECTION name="Synchronize resources" component="true"/>
     <SECTION name="Send inventories to Rudder server" component="true"/>
-    <SECTION name="Configure ncf" component="true"/>
     <SECTION name="Configure apache ACL" component="true"/>
   </SECTIONS>
 </TECHNIQUE>

techniques/system/distributePolicy/1.0/propagatePromises.cf

@@ -64,16 +64,7 @@ bundle agent propagatePromises
 
 
   files:
-
-    root_server::
-
-      "${g.rudder_ncf_origin_local}/ncf.conf"
-        copy_from    => copy_digest_without_perms("${sys.workdir}/inputs/distributePolicy/ncf/ncf.conf"),
-        comment      => "Enforce the ncf configuration file",
-        classes      => classes_generic("configure_ncf_config");
-
     (policy_server|role_rudder_relay_promises_only).!root_server.!disable_classic_promises::
-
       "${client_data}"  #that's a loop on each files in client_inputs
         copy_from    => remote("${server_info.policy_server}","${server_data}"),
         depth_search => recurse_visible("inf"),
@@ -143,12 +134,6 @@ bundle agent propagatePromises
         classes => if_else("nodeslist_copied", "could_not_copy_nodeslist");
 
   methods:
-    root_server::
-      "any" usebundle => rudder_common_reports_generic("DistributePolicy", "configure_ncf_config", "${distribute_policy_common.directiveId}", "Configure ncf", "None", "Configure configuration library");
-
-    !root_server::
-      "any" usebundle => rudder_common_report("DistributePolicy", "result_na", "${distribute_policy_common.directiveId}", "Configure ncf", "None", "Configuration of configuration library is not necessary on non root servers");
-
     # Success if resources are updated or not changed (kept or repaired).
     # root server have only nodelist to be updated
     # relays have ncf, masterfiles nodelist and shared_files folder to be updated.