Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #19568: Correct rudder bootchecks to match new structure #3731

Merged
merged 1 commit into from
Jul 26, 2021
+7 −14
Merged

Fixes #19568: Correct rudder bootchecks to match new structure #3731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/Constants.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ///////////////

/**
Expand Down
8 changes: 7 additions & 1 deletion webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/CheckDIT.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down