diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/Constants.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/Constants.scala index 9e2ac59c212..2898ce6a571 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/Constants.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/Constants.scala @@ -38,25 +38,12 @@ package com.normation.rudder.domain import com.normation.inventory.domain.NodeId -import com.normation.rudder.domain.policies.DirectiveId -import com.normation.rudder.domain.nodes.NodeGroupId object Constants { - //non random Directive Id - def buildHasPolicyServerGroupId(policyServerId:NodeId) = - NodeGroupId("hasPolicyServer-" + policyServerId.value ) - val ROOT_POLICY_SERVER_ID = NodeId("root") - /** - * For the given policy server, what is the ID of its - * "distributePolicy" instance ? - */ - def buildCommonDirectiveId(policyServerId:NodeId) = - DirectiveId("common-" + policyServerId.value) - /////////// PATH for generated promises /////////////// /** diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/CheckDIT.scala b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/CheckDIT.scala index a17e90f0895..0f0f88e70f6 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/CheckDIT.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/CheckDIT.scala @@ -132,8 +132,14 @@ class CheckDIT( , "nodeId=root,ou=Nodes,ou=Accepted Inventories,ou=Inventories,cn=rudder-configuration" , "nodeGroupId=hasPolicyServer-root,groupCategoryId=SystemGroups,groupCategoryId=GroupRoot,ou=Rudder,cn=rudder-configuration" , "ruleTarget=policyServer:root,groupCategoryId=SystemGroups,groupCategoryId=GroupRoot,ou=Rudder,cn=rudder-configuration" - , "directiveId=root-distributePolicy,activeTechniqueId=distributePolicy,techniqueCategoryId=Rudder Internal,techniqueCategoryId=Active Techniques,ou=Rudder,cn=rudder-configuration" , "directiveId=common-root,activeTechniqueId=common,techniqueCategoryId=Rudder Internal,techniqueCategoryId=Active Techniques,ou=Rudder,cn=rudder-configuration" + , "directiveId=inventory-all,activeTechniqueId=inventory,techniqueCategoryId=Rudder Internal,techniqueCategoryId=Active Techniques,ou=Rudder,cn=rudder-configuration" + , "directiveId=root-rudderApache,activeTechniqueId=rudderApache,techniqueCategoryId=Rudder Internal,techniqueCategoryId=Active Techniques,ou=Rudder,cn=rudder-configuration" + , "directiveId=root-rudderPostgresql,activeTechniqueId=rudderPostgresql,techniqueCategoryId=Rudder Internal,techniqueCategoryId=Active Techniques,ou=Rudder,cn=rudder-configuration" + , "directiveId=root-rudderRelay,activeTechniqueId=rudderRelay,techniqueCategoryId=Rudder Internal,techniqueCategoryId=Active Techniques,ou=Rudder,cn=rudder-configuration" + , "directiveId=root-rudderSlapd,activeTechniqueId=rudderSlapd,techniqueCategoryId=Rudder Internal,techniqueCategoryId=Active Techniques,ou=Rudder,cn=rudder-configuration" + , "directiveId=root-rudderWebapp,activeTechniqueId=rudderWebapp,techniqueCategoryId=Rudder Internal,techniqueCategoryId=Active Techniques,ou=Rudder,cn=rudder-configuration" + , "directiveId=root-serverCommon,activeTechniqueId=serverCommon,techniqueCategoryId=Rudder Internal,techniqueCategoryId=Active Techniques,ou=Rudder,cn=rudder-configuration" , "ruleId=root-DP,ou=Rules,ou=Rudder,cn=rudder-configuration" , "ruleId=hasPolicyServer-root,ou=Rules,ou=Rudder,cn=rudder-configuration" ).map(s => new DN(s))