diff --git a/webapp/sources/api-doc/components/schemas/settings.yml b/webapp/sources/api-doc/components/schemas/settings.yml index 5e87cfb932..ea08f186f5 100644 --- a/webapp/sources/api-doc/components/schemas/settings.yml +++ b/webapp/sources/api-doc/components/schemas/settings.yml @@ -81,17 +81,6 @@ settings: - SYSLOG example: "HTTPS" description: Default reporting protocol used - syslog_protocol_disabled: - type: boolean - description: Completely disable syslog protocol - example: true - rsyslog_reporting_protocol: - type: string - enum: - - "TCP" - - "UDP" - example: "UDP" - description: Protocol used for syslog communication between node and server reporting_mode: type: string enum: diff --git a/webapp/sources/rudder/rudder-core/src/main/resources/ldap/bootstrap.ldif b/webapp/sources/rudder/rudder-core/src/main/resources/ldap/bootstrap.ldif index 8646e06dea..9b0d0df362 100644 --- a/webapp/sources/rudder/rudder-core/src/main/resources/ldap/bootstrap.ldif +++ b/webapp/sources/rudder/rudder-core/src/main/resources/ldap/bootstrap.ldif @@ -336,13 +336,6 @@ objectClass: organizationalUnit objectClass: top ou: Application Properties -dn: propertyName=rudder_syslog_protocol,ou=Application Properties,cn=rudder- - configuration -objectClass: property -objectClass: top -propertyName: rudder_syslog_protocol -propertyValue: UDP - dn: propertyName=api_compatibility_mode,ou=Application Properties,cn=rudder-configuration objectClass: property objectClass: top @@ -373,10 +366,4 @@ objectClass: top propertyName: rudder_report_protocol_default propertyValue: HTTPS -dn: propertyName=rudder_syslog_protocol_disabled,ou=Application Properties,c - n=rudder-configuration -objectClass: property -objectClass: top -propertyName: rudder_syslog_protocol_disabled -propertyValue: true diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/services/impl/SystemVariableSpecServiceImpl.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/services/impl/SystemVariableSpecServiceImpl.scala index aa9084f2fc..24fd5e66d2 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/services/impl/SystemVariableSpecServiceImpl.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/services/impl/SystemVariableSpecServiceImpl.scala @@ -115,11 +115,6 @@ class SystemVariableSpecServiceImpl extends SystemVariableSpecService { , multivalued = false , constraint = Constraint(mayBeEmpty=true) ) - , SystemVariableSpec( - "SYSLOGPORT" , "Port to use for rsyslog (used by reports)" - , multivalued = false - , constraint = Constraint(typeName = IntegerVType()) - ) , SystemVariableSpec( "CONFIGURATION_REPOSITORY_FOLDER" , "The path to the configuration repository folder" , multivalued = false @@ -352,15 +347,6 @@ class SystemVariableSpecServiceImpl extends SystemVariableSpecService { "REPORTING_PROTOCOL" , "Protocol used by agent to send reports (HTTPS or SYSLOG)" , multivalued = false ) - , SystemVariableSpec( - "RUDDER_SYSLOG_PROTOCOL" , "Protocol ued by syslog (TCP or UDP)" - , multivalued = false - ) - , SystemVariableSpec( - "SYSLOG_PROTOCOL_DISABLED" , "Syslog protocol totally disabled" - , multivalued = false - , constraint = Constraint(typeName = BooleanVType, default=Some("false")) - ) , SystemVariableSpec( "SERVER_VERSION" , "Version of rudder server webapp, as displayed in the UI (not the package version)" , multivalued = false diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/reports/ReportingConfiguration.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/reports/ReportingConfiguration.scala index ab15c4724b..9cdea073ee 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/reports/ReportingConfiguration.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/reports/ReportingConfiguration.scala @@ -158,41 +158,6 @@ class AgentRunIntervalServiceImpl ( import ca.mrvisser.sealerate.values -sealed trait SyslogProtocol { - def value : String -} - -object SyslogProtocol { - def apply(value: String): Box[SyslogProtocol] = { - value match { - case SyslogTCP.value => Full(SyslogTCP) - case SyslogUDP.value => Full(SyslogUDP) - case _ => Failure(s"Invalid syslog protocol: *{value}") - } - } - - def allProtocols: Set[SyslogProtocol] = values[SyslogProtocol] - - def parse(value: String): Either[RudderError, SyslogProtocol] = { - allProtocols.find { - _.value == value.toUpperCase() - } match { - case None => - Left(Unexpected(s"Unable to parse syslog protocol mame '${value}'. was expecting ${allProtocols.map(_.value).mkString("'", "' or '", "'")}.")) - case Some(protocol) => - Right(protocol) - } - } - -} - -final case object SyslogTCP extends SyslogProtocol { - val value = "TCP" -} - -final case object SyslogUDP extends SyslogProtocol { - val value = "UDP" -} sealed trait AgentReportingProtocol { def value : String @@ -202,15 +167,11 @@ final case object AgentReportingHTTPS extends AgentReportingProtocol { val value = "HTTPS" } -final case object AgentReportingSyslog extends AgentReportingProtocol { - val value = "SYSLOG" -} object AgentReportingProtocol { def apply(value: String): Box[AgentReportingProtocol] = { value match { case AgentReportingHTTPS.value => Full(AgentReportingHTTPS) - case AgentReportingSyslog.value => Full(AgentReportingSyslog) case _ => Failure(s"Invalid reporting protocol: *{value}") } } diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/SystemVariableService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/SystemVariableService.scala index 4c8393c255..fa4727a1f6 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/SystemVariableService.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/SystemVariableService.scala @@ -122,7 +122,6 @@ class SystemVariableServiceImpl( , webdavPassword : String , reportsDbUri : String , reportsDbUser : String - , syslogPort : Int , configurationRepository : String , serverRoles : Seq[RudderServerRole] , serverVersion : String @@ -137,8 +136,6 @@ class SystemVariableServiceImpl( , getCfengineOutputsTtl : () => Box[Int] , getStoreAllCentralizedLogsInFile: () => Box[Boolean] , getSendMetrics : () => Box[Option[SendMetrics]] - , getSyslogProtocol : () => Box[SyslogProtocol] - , getSyslogProtocolDisabled : () => Box[Boolean] , getReportProtocolDefault : () => Box[AgentReportingProtocol] , getRudderVerifyCertificates : () => Box[Boolean] ) extends SystemVariableService with Loggable { @@ -159,7 +156,6 @@ class SystemVariableServiceImpl( val varSharedFilesFolder = systemVariableSpecService.get("SHARED_FILES_FOLDER" ).toVariable(Seq(sharedFilesFolder)) val varPolicyDistribCfenginePort = systemVariableSpecService.get("COMMUNITYPORT" ).toVariable(Seq(policyDistribCfenginePort.toString)) val varPolicyDistribHttpsPort = systemVariableSpecService.get("HTTPS_POLICY_DISTRIBUTION_PORT" ).toVariable(Seq(policyDistribHttpsPort.toString)) - val syslogPortConfig = systemVariableSpecService.get("SYSLOGPORT" ).toVariable(Seq(syslogPort.toString)) val configurationRepositoryFolder = systemVariableSpecService.get("CONFIGURATION_REPOSITORY_FOLDER").toVariable(Seq(configurationRepository)) // Compute the values for rudderServerRoleLdap, rudderServerRoleDb and rudderServerRoleRelayTop @@ -185,14 +181,11 @@ class SystemVariableServiceImpl( val modifiedFilesTtl = getProp("MODIFIED_FILES_TTL" , getModifiedFilesTtl) val cfengineOutputsTtl = getProp("CFENGINE_OUTPUTS_TTL" , getCfengineOutputsTtl) - val reportProtocol = getProp("RUDDER_SYSLOG_PROTOCOL", () => getSyslogProtocol().map(_.value)) val relaySyncMethod = getProp("RELAY_SYNC_METHOD" , () => getSyncMethod().map(_.value)) val relaySyncPromises = getProp("RELAY_SYNC_PROMISES" , getSyncPromises) val relaySyncSharedFiles = getProp("RELAY_SYNC_SHAREDFILES", getSyncSharedFiles) - val syslogProtocolDisabled = getProp("SYSLOG_PROTOCOL_DISABLED", getSyslogProtocolDisabled) - val rudderVerifyCertificates = getProp("RUDDER_VERIFY_CERTIFICATES", getRudderVerifyCertificates) val varServerVersion = systemVariableSpecService.get("SERVER_VERSION").toVariable(Seq(serverVersion)) @@ -217,7 +210,6 @@ class SystemVariableServiceImpl( varPolicyDistribHttpsPort :: varWebdavUser :: varWebdavPassword :: - syslogPortConfig :: configurationRepositoryFolder :: denyBadClocks :: skipIdentify :: @@ -228,8 +220,6 @@ class SystemVariableServiceImpl( cfengineOutputsTtl :: storeAllCentralizedLogsInFile :: varSendMetrics :: - syslogProtocolDisabled :: - reportProtocol :: rudderVerifyCertificates :: varServerVersion :: Nil @@ -585,16 +575,14 @@ class SystemVariableServiceImpl( // - agent is DSC < 6.1 val onlySyslogSupported = nodeInfo.agentsName.find { agent => versionHasSyslogOnly(agent.version, agent.agentType) } - getSyslogProtocolDisabled().flatMap { syslogDisabled => (syslogDisabled, onlySyslogSupported) match { - case (true , Some(agentInfo) ) => + (onlySyslogSupported match { + case Some(agentInfo) => // If HTTPS is used on a node that does support it, we fails. // Also, special case root, because not having root cause strange things. - if(nodeInfo.id == Constants.ROOT_POLICY_SERVER_ID) getReportProtocolDefault() + if(nodeInfo.id == Constants.ROOT_POLICY_SERVER_ID) Full(AgentReportingHTTPS) else failure(nodeInfo, agentInfo) - case (true , None ) => Full(AgentReportingHTTPS) - case (false, Some(x)) => Full(AgentReportingSyslog) - case (false, None ) => getReportProtocolDefault() - } }.map { reportingProtocol => + case None => Full(AgentReportingHTTPS) + }).map { reportingProtocol => val v = systemVariableSpecService.get("REPORTING_PROTOCOL").toVariable(Seq(reportingProtocol.value)) (v.spec.name, v) } diff --git a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/node-cfe-with-500-directives/rules/cfengine-community/promises.cf b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/node-cfe-with-500-directives/rules/cfengine-community/promises.cf index c8e68aaa13..07c5dc556c 100644 --- a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/node-cfe-with-500-directives/rules/cfengine-community/promises.cf +++ b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/node-cfe-with-500-directives/rules/cfengine-community/promises.cf @@ -35,8 +35,7 @@ bundle common rudder_roles "reports_disabled_mode" expression => strcmp("full-compliance", "reports-disabled"); "changes_only" expression => "changes_only_mode.!force_full_compliance"; "reports_disabled" expression => "reports_disabled_mode.!force_full_compliance"; - "rudder_reporting_https" expression => strcmp("SYSLOG", "HTTPS"); - "rsyslog_disabled" expression => strcmp("false", "true"); + "rudder_reporting_https" expression => strcmp("HTTPS", "HTTPS"); "rudder_global_audit_mode" not => strcmp("audit", "enforce"); @@ -291,8 +290,6 @@ bundle agent check_log_system "syslog_ng_conf_proto" string => "${syslogng_rule_prefix}"; "syslog_ng_conf_start" string => "(\""; "syslog_ng_conf_port" string => "\" port ("; - "syslog_ng_conf_portno" string => "514"; - "syslog_ng_conf_suffix" string => "));};log {source(${syslog_ng_source});filter(f_local_rudder);destination(rudder_loghost);"; "syslog_ng_conf_final" string => "flags(final);};"; "syslog_ng_conf" string => concat("${syslog_conf_comment}", "${syslog_ng_conf_prefix}", "${syslog_ng_conf_proto}", "${syslog_ng_conf_start}", "${server_info.policy_server}", "${syslog_ng_conf_port}", "${syslog_ng_conf_portno}", "${syslog_ng_conf_suffix}", "${syslog_ng_conf_final}"); @@ -311,9 +308,6 @@ bundle agent check_log_system "syslogng_conffile_present" expression => fileexists("${syslogng_conffile}"), scope => "namespace"; "syslogd_conffile_present" expression => fileexists("${syslog_conffile}"), scope => "namespace"; - "use_udp" expression => strcmp("UDP", "UDP"); - "use_tcp" expression => strcmp("UDP", "TCP"); - "pass3" expression => "pass2"; "pass2" expression => "pass1"; "pass1" expression => "any"; diff --git a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/node-cfe-with-500-directives/rules/cfengine-community/rudder.json b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/node-cfe-with-500-directives/rules/cfengine-community/rudder.json index 1bc7d4bb43..96e80b752f 100644 --- a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/node-cfe-with-500-directives/rules/cfengine-community/rudder.json +++ b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/node-cfe-with-500-directives/rules/cfengine-community/rudder.json @@ -18,7 +18,7 @@ "RELAY_SYNC_METHOD":"classic", "RELAY_SYNC_PROMISES":"false", "RELAY_SYNC_SHAREDFILES":"false", - "REPORTING_PROTOCOL":"SYSLOG", + "REPORTING_PROTOCOL":"HTTPS", "RUDDER_COMPLIANCE_MODE":"audit", "RUDDER_DIRECTIVES_INPUTS":[ "\"copyGitFile/2_3_directive_copyGitFile107/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile465/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile117/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile450/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile200/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile106/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile352/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile38/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile233/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile398/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile309/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile222/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile184/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile244/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile190/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile61/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile78/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile476/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile387/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile218/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile341/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile360/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile207/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile49/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile211/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile479/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile438/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile9/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile195/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile89/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile50/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile427/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile31/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile42/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile363/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile434/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile4/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile68/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile268/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile209/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile241/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile270/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile255/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile468/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile279/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile371/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile24/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile57/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile374/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile423/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile316/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile121/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile305/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile132/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile348/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile498/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile337/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile446/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile229/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile417/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile208/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile35/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile84/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile64/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile457/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile173/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile420/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile326/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile258/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile16/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile46/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile240/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile219/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile162/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile251/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile73/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile280/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile359/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile301/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile71/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile487/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile431/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile13/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile247/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile155/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile375/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile53/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile144/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile330/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile406/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile312/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile296/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile110/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile278/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile93/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile394/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile27/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile291/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile260/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile20/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile149/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile494/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile413/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile225/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile461/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile454/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile267/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile128/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile94/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile203/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile139/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile285/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile188/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile402/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile199/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile60/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile271/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile443/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile383/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile214/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile472/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile236/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile483/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile119/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile366/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile43/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile377/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile428/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile408/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile182/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile293/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile286/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile327/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile419/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile221/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile124/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile405/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile135/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile388/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile370/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile338/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile344/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile259/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile10/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile464/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile32/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile439/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile171/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile399/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile108/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile21/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile160/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile424/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile232/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile297/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile90/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile169/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile196/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile469/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile103/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile185/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile88/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile141/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile226/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile237/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile317/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile77/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile159/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile5/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile355/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile148/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile152/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile167/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile254/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile114/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile74/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile276/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile243/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile306/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile85/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile70/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile486/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile367/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile458/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile497/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile412/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile145/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile142/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile380/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile95/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile189/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile264/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile313/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile3/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile120/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile302/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile430/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile289/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile204/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile125/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile136/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile58/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile275/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile447/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile156/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile349/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile210/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile272/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile471/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile163/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile290/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile69/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile442/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile99/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile482/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile113/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile102/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile282/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile333/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile401/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile177/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile322/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile323/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile193/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile453/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile19/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile416/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile493/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile378/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile395/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile475/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile356/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile261/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile384/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile166/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile215/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile54/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile340/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile460/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile80/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile6/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile345/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile435/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile65/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile334/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile248/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile174/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile343/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile36/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile477/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile197/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile76/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile425/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile134/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile466/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile181/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile318/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile287/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile410/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile485/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile389/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile496/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile444/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile91/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile499/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile376/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile186/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile459/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile250/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile335/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile298/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile328/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile192/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile28/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile351/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile115/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile365/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile354/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile409/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile220/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile47/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile11/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile253/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile242/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile123/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile429/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile158/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile52/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile87/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile474/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile362/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile153/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile385/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile373/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile131/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile488/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile381/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile97/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile238/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile44/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile396/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile104/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile231/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile22/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile109/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile463/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile448/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile17/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile227/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile339/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile147/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile55/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile81/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile63/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile273/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile205/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile137/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile96/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile18/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile157/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile300/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile400/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile98/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile303/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile2/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile30/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile216/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile41/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile391/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile33/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile265/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile392/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile178/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile262/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile66/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile126/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile29/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile411/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile481/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile470/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile311/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile39/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile59/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile283/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile7/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile332/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile314/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile170/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile112/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile441/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile368/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile249/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile146/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile14/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile404/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile436/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile492/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile357/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile346/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile150/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile452/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile415/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile324/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile379/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile321/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile25/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile164/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile350/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile101/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile175/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile455/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile294/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile308/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile83/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile386/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile353/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile217/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile127/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile342/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile445/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile176/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile165/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile212/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile437/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile245/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile116/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile8/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile478/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile256/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile426/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile484/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile48/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile206/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile281/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile92/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile194/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile467/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile105/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile234/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile456/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile490/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile223/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile235/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile319/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile133/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile372/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile449/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile462/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile130/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile12/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile489/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile433/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile397/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile473/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile51/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile347/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile382/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile34/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile82/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile422/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile364/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile45/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile111/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile361/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile299/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile288/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile358/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile122/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile62/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile37/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile269/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile180/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile191/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile329/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile1/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile198/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile168/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile23/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile246/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile75/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile257/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile154/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile252/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile491/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile393/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile15/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile274/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile310/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile26/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile263/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile432/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile480/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile56/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile179/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile320/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile325/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile500/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile295/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile284/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile86/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile143/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile187/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile407/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile451/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile336/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile40/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile100/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile228/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile390/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile418/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile79/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile201/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile304/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile172/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile421/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile307/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile138/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile72/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile202/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile118/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile67/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile213/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile277/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile161/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile151/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile440/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile140/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile369/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile230/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile495/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile414/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile129/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile331/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile266/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile403/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile315/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile292/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile239/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile224/copyFileFromSharedFolder.cf\",\n\"copyGitFile/2_3_directive_copyGitFile183/copyFileFromSharedFolder.cf\"," @@ -30,7 +30,6 @@ "RUDDER_NODE_GROUPS_VARS":"\"by_uuid[special:all_exceptPolicyServers]\" string => \"special:all_exceptPolicyServers\",\n meta => { \"inventory\", \"attribute_name=rudder_groups\" };\n\"by_uuid[special:all]\" string => \"special:all\",\n meta => { \"inventory\", \"attribute_name=rudder_groups\" };", "RUDDER_REPORT_MODE":"full-compliance", "RUDDER_SERVER_ROLES":"", - "RUDDER_SYSLOG_PROTOCOL":"UDP", "RUDDER_SYSTEM_DIRECTIVES_INPUTS":"\"common/1.0/common.cf\",\n\"common/1.0/cf-serverd.cf\",\n\"rudder-directives.cf\",\n\"rudder-system-directives.cf\",\n\"common/1.0/rudder-parameters.cf\",\n\"common/1.0/rudder-groups.cf\",\n\"common/1.0/hooks.cf\",\n\"common/1.0/cron-setup.cf\",\n\"common/1.0/site.cf\",\n\"common/1.0/update.cf\",\n\"common/1.0/monitoring.cf\",\n\"common/1.0/restart-services.cf\",\n\"common/1.0/internal-security.cf\",\n\"common/1.0/environment-variables.cf\",\n\"common/1.0/properties.cf\",\n\"common/1.0/reporting-http.cf\",\n\"inventory/1.0/fusionAgent.cf\",", "RUDDER_SYSTEM_DIRECTIVES_SEQUENCE":" \"Rudder system policy: daily inventory/Inventory\" usebundle => set_dry_run_mode(\"false\");\n \"Rudder system policy: daily inventory/Inventory\" usebundle => run_inventory_all;", "RUDDER_VERIFY_CERTIFICATES":"false", @@ -39,7 +38,5 @@ "SHARED_FILES_FOLDER":"/var/rudder/configuration-repository/shared-files", "SKIPIDENTIFY":"false", "STORE_ALL_CENTRALIZED_LOGS_IN_FILE":"true", - "SYSLOGPORT":"514", - "SYSLOG_PROTOCOL_DISABLED":"false", "TOOLS_FOLDER":"tools_folder" } diff --git a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/node-cfe-with-two-directives/rules/cfengine-community/promises.cf b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/node-cfe-with-two-directives/rules/cfengine-community/promises.cf index c8e68aaa13..07c5dc556c 100644 --- a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/node-cfe-with-two-directives/rules/cfengine-community/promises.cf +++ b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/node-cfe-with-two-directives/rules/cfengine-community/promises.cf @@ -35,8 +35,7 @@ bundle common rudder_roles "reports_disabled_mode" expression => strcmp("full-compliance", "reports-disabled"); "changes_only" expression => "changes_only_mode.!force_full_compliance"; "reports_disabled" expression => "reports_disabled_mode.!force_full_compliance"; - "rudder_reporting_https" expression => strcmp("SYSLOG", "HTTPS"); - "rsyslog_disabled" expression => strcmp("false", "true"); + "rudder_reporting_https" expression => strcmp("HTTPS", "HTTPS"); "rudder_global_audit_mode" not => strcmp("audit", "enforce"); @@ -291,8 +290,6 @@ bundle agent check_log_system "syslog_ng_conf_proto" string => "${syslogng_rule_prefix}"; "syslog_ng_conf_start" string => "(\""; "syslog_ng_conf_port" string => "\" port ("; - "syslog_ng_conf_portno" string => "514"; - "syslog_ng_conf_suffix" string => "));};log {source(${syslog_ng_source});filter(f_local_rudder);destination(rudder_loghost);"; "syslog_ng_conf_final" string => "flags(final);};"; "syslog_ng_conf" string => concat("${syslog_conf_comment}", "${syslog_ng_conf_prefix}", "${syslog_ng_conf_proto}", "${syslog_ng_conf_start}", "${server_info.policy_server}", "${syslog_ng_conf_port}", "${syslog_ng_conf_portno}", "${syslog_ng_conf_suffix}", "${syslog_ng_conf_final}"); @@ -311,9 +308,6 @@ bundle agent check_log_system "syslogng_conffile_present" expression => fileexists("${syslogng_conffile}"), scope => "namespace"; "syslogd_conffile_present" expression => fileexists("${syslog_conffile}"), scope => "namespace"; - "use_udp" expression => strcmp("UDP", "UDP"); - "use_tcp" expression => strcmp("UDP", "TCP"); - "pass3" expression => "pass2"; "pass2" expression => "pass1"; "pass1" expression => "any"; diff --git a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/node-cfe-with-two-directives/rules/cfengine-community/rudder.json b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/node-cfe-with-two-directives/rules/cfengine-community/rudder.json index 7274d26060..c177c0080e 100644 --- a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/node-cfe-with-two-directives/rules/cfengine-community/rudder.json +++ b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/node-cfe-with-two-directives/rules/cfengine-community/rudder.json @@ -18,7 +18,7 @@ "RELAY_SYNC_METHOD":"classic", "RELAY_SYNC_PROMISES":"false", "RELAY_SYNC_SHAREDFILES":"false", - "REPORTING_PROTOCOL":"SYSLOG", + "REPORTING_PROTOCOL":"HTTPS", "RUDDER_COMPLIANCE_MODE":"audit", "RUDDER_DIRECTIVES_INPUTS":[ "\"Create_file/1.0/rudder_reporting.cf\",\n\"Create_file/1.0/Create_file.cf\",\n\"packageManagement/1.0/packageManagement.cf\"," @@ -30,7 +30,6 @@ "RUDDER_NODE_GROUPS_VARS":"\"by_uuid[special:all_exceptPolicyServers]\" string => \"special:all_exceptPolicyServers\",\n meta => { \"inventory\", \"attribute_name=rudder_groups\" };\n\"by_uuid[special:all]\" string => \"special:all\",\n meta => { \"inventory\", \"attribute_name=rudder_groups\" };", "RUDDER_REPORT_MODE":"full-compliance", "RUDDER_SERVER_ROLES":"", - "RUDDER_SYSLOG_PROTOCOL":"UDP", "RUDDER_SYSTEM_DIRECTIVES_INPUTS":"\"common/1.0/common.cf\",\n\"common/1.0/cf-serverd.cf\",\n\"rudder-directives.cf\",\n\"rudder-system-directives.cf\",\n\"common/1.0/rudder-parameters.cf\",\n\"common/1.0/rudder-groups.cf\",\n\"common/1.0/hooks.cf\",\n\"common/1.0/cron-setup.cf\",\n\"common/1.0/site.cf\",\n\"common/1.0/update.cf\",\n\"common/1.0/monitoring.cf\",\n\"common/1.0/restart-services.cf\",\n\"common/1.0/internal-security.cf\",\n\"common/1.0/environment-variables.cf\",\n\"common/1.0/properties.cf\",\n\"common/1.0/reporting-http.cf\",\n\"inventory/1.0/fusionAgent.cf\",", "RUDDER_SYSTEM_DIRECTIVES_SEQUENCE":" \"Rudder system policy: daily inventory/Inventory\" usebundle => set_dry_run_mode(\"false\");\n \"Rudder system policy: daily inventory/Inventory\" usebundle => run_inventory_all;", "RUDDER_VERIFY_CERTIFICATES":"false", @@ -39,7 +38,5 @@ "SHARED_FILES_FOLDER":"/var/rudder/configuration-repository/shared-files", "SKIPIDENTIFY":"false", "STORE_ALL_CENTRALIZED_LOGS_IN_FILE":"true", - "SYSLOGPORT":"514", - "SYSLOG_PROTOCOL_DISABLED":"false", "TOOLS_FOLDER":"tools_folder" } diff --git a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/node-gen-var-def-override/rules/cfengine-community/promises.cf b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/node-gen-var-def-override/rules/cfengine-community/promises.cf index c8e68aaa13..07c5dc556c 100644 --- a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/node-gen-var-def-override/rules/cfengine-community/promises.cf +++ b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/node-gen-var-def-override/rules/cfengine-community/promises.cf @@ -35,8 +35,7 @@ bundle common rudder_roles "reports_disabled_mode" expression => strcmp("full-compliance", "reports-disabled"); "changes_only" expression => "changes_only_mode.!force_full_compliance"; "reports_disabled" expression => "reports_disabled_mode.!force_full_compliance"; - "rudder_reporting_https" expression => strcmp("SYSLOG", "HTTPS"); - "rsyslog_disabled" expression => strcmp("false", "true"); + "rudder_reporting_https" expression => strcmp("HTTPS", "HTTPS"); "rudder_global_audit_mode" not => strcmp("audit", "enforce"); @@ -291,8 +290,6 @@ bundle agent check_log_system "syslog_ng_conf_proto" string => "${syslogng_rule_prefix}"; "syslog_ng_conf_start" string => "(\""; "syslog_ng_conf_port" string => "\" port ("; - "syslog_ng_conf_portno" string => "514"; - "syslog_ng_conf_suffix" string => "));};log {source(${syslog_ng_source});filter(f_local_rudder);destination(rudder_loghost);"; "syslog_ng_conf_final" string => "flags(final);};"; "syslog_ng_conf" string => concat("${syslog_conf_comment}", "${syslog_ng_conf_prefix}", "${syslog_ng_conf_proto}", "${syslog_ng_conf_start}", "${server_info.policy_server}", "${syslog_ng_conf_port}", "${syslog_ng_conf_portno}", "${syslog_ng_conf_suffix}", "${syslog_ng_conf_final}"); @@ -311,9 +308,6 @@ bundle agent check_log_system "syslogng_conffile_present" expression => fileexists("${syslogng_conffile}"), scope => "namespace"; "syslogd_conffile_present" expression => fileexists("${syslog_conffile}"), scope => "namespace"; - "use_udp" expression => strcmp("UDP", "UDP"); - "use_tcp" expression => strcmp("UDP", "TCP"); - "pass3" expression => "pass2"; "pass2" expression => "pass1"; "pass1" expression => "any"; diff --git a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/node-gen-var-def-override/rules/cfengine-community/rudder.json b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/node-gen-var-def-override/rules/cfengine-community/rudder.json index 1d939613a1..0987e67444 100644 --- a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/node-gen-var-def-override/rules/cfengine-community/rudder.json +++ b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/node-gen-var-def-override/rules/cfengine-community/rudder.json @@ -18,7 +18,7 @@ "RELAY_SYNC_METHOD":"classic", "RELAY_SYNC_PROMISES":"false", "RELAY_SYNC_SHAREDFILES":"false", - "REPORTING_PROTOCOL":"SYSLOG", + "REPORTING_PROTOCOL":"HTTPS", "RUDDER_COMPLIANCE_MODE":"audit", "RUDDER_DIRECTIVES_INPUTS":[ "\"genericVariableDefinition/2.0/genericVariableDefinition.cf\"," @@ -30,7 +30,6 @@ "RUDDER_NODE_GROUPS_VARS":"\"by_uuid[special:all_exceptPolicyServers]\" string => \"special:all_exceptPolicyServers\",\n meta => { \"inventory\", \"attribute_name=rudder_groups\" };\n\"by_uuid[special:all]\" string => \"special:all\",\n meta => { \"inventory\", \"attribute_name=rudder_groups\" };", "RUDDER_REPORT_MODE":"full-compliance", "RUDDER_SERVER_ROLES":"", - "RUDDER_SYSLOG_PROTOCOL":"UDP", "RUDDER_SYSTEM_DIRECTIVES_INPUTS":"\"common/1.0/common.cf\",\n\"common/1.0/cf-serverd.cf\",\n\"rudder-directives.cf\",\n\"rudder-system-directives.cf\",\n\"common/1.0/rudder-parameters.cf\",\n\"common/1.0/rudder-groups.cf\",\n\"common/1.0/hooks.cf\",\n\"common/1.0/cron-setup.cf\",\n\"common/1.0/site.cf\",\n\"common/1.0/update.cf\",\n\"common/1.0/monitoring.cf\",\n\"common/1.0/restart-services.cf\",\n\"common/1.0/internal-security.cf\",\n\"common/1.0/environment-variables.cf\",\n\"common/1.0/properties.cf\",\n\"common/1.0/reporting-http.cf\",\n\"inventory/1.0/fusionAgent.cf\",", "RUDDER_SYSTEM_DIRECTIVES_SEQUENCE":" \"Rudder system policy: daily inventory/Inventory\" usebundle => set_dry_run_mode(\"false\");\n \"Rudder system policy: daily inventory/Inventory\" usebundle => run_inventory_all;", "RUDDER_VERIFY_CERTIFICATES":"false", @@ -39,7 +38,5 @@ "SHARED_FILES_FOLDER":"/var/rudder/configuration-repository/shared-files", "SKIPIDENTIFY":"false", "STORE_ALL_CENTRALIZED_LOGS_IN_FILE":"true", - "SYSLOGPORT":"514", - "SYSLOG_PROTOCOL_DISABLED":"false", "TOOLS_FOLDER":"tools_folder" } diff --git a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/root-default-install/promises.cf b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/root-default-install/promises.cf index 39f18c76ab..1ce86ad0fb 100644 --- a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/root-default-install/promises.cf +++ b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/root-default-install/promises.cf @@ -35,8 +35,7 @@ bundle common rudder_roles "reports_disabled_mode" expression => strcmp("full-compliance", "reports-disabled"); "changes_only" expression => "changes_only_mode.!force_full_compliance"; "reports_disabled" expression => "reports_disabled_mode.!force_full_compliance"; - "rudder_reporting_https" expression => strcmp("SYSLOG", "HTTPS"); - "rsyslog_disabled" expression => strcmp("false", "true"); + "rudder_reporting_https" expression => strcmp("HTTPS", "HTTPS"); "rudder_global_audit_mode" not => strcmp("enforce", "enforce"); @@ -301,8 +300,6 @@ bundle agent check_log_system "syslog_ng_conf_proto" string => "${syslogng_rule_prefix}"; "syslog_ng_conf_start" string => "(\""; "syslog_ng_conf_port" string => "\" port ("; - "syslog_ng_conf_portno" string => "514"; - "syslog_ng_conf_suffix" string => "));};log {source(${syslog_ng_source});filter(f_local_rudder);destination(rudder_loghost);"; "syslog_ng_conf_final" string => "flags(final);};"; "syslog_ng_conf" string => concat("${syslog_conf_comment}", "${syslog_ng_conf_prefix}", "${syslog_ng_conf_proto}", "${syslog_ng_conf_start}", "${server_info.policy_server}", "${syslog_ng_conf_port}", "${syslog_ng_conf_portno}", "${syslog_ng_conf_suffix}", "${syslog_ng_conf_final}"); @@ -321,9 +318,6 @@ bundle agent check_log_system "syslogng_conffile_present" expression => fileexists("${syslogng_conffile}"), scope => "namespace"; "syslogd_conffile_present" expression => fileexists("${syslog_conffile}"), scope => "namespace"; - "use_udp" expression => strcmp("UDP", "UDP"); - "use_tcp" expression => strcmp("UDP", "TCP"); - "pass3" expression => "pass2"; "pass2" expression => "pass1"; "pass1" expression => "any"; diff --git a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/root-default-install/rudder.json b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/root-default-install/rudder.json index 9b71e09a0c..c2a69cd7cd 100644 --- a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/root-default-install/rudder.json +++ b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/root-default-install/rudder.json @@ -22,7 +22,7 @@ "RELAY_SYNC_METHOD":"classic", "RELAY_SYNC_PROMISES":"false", "RELAY_SYNC_SHAREDFILES":"false", - "REPORTING_PROTOCOL":"SYSLOG", + "REPORTING_PROTOCOL":"HTTPS", "RUDDER_COMPLIANCE_MODE":"enforce", "RUDDER_DIRECTIVES_INPUTS":[ "" @@ -36,7 +36,6 @@ "RUDDER_REPORTS_DB_USER":"rudder", "RUDDER_REPORT_MODE":"full-compliance", "RUDDER_SERVER_ROLES":"rudder-ldap:rudder.server-roles.ldap\nrudder-inventory-endpoint:rudder.server-roles.inventory-endpoint\nrudder-db:rudder.server-roles.db\nrudder-relay-top:rudder.server-roles.relay-top\nrudder-web:rudder.server-roles.web\nrudder-relay-promises-only:rudder.server-roles.relay-promises-only\nrudder-cfengine-mission-portal:rudder.server-roles.cfengine-mission-portal\n", - "RUDDER_SYSLOG_PROTOCOL":"UDP", "RUDDER_SYSTEM_DIRECTIVES_INPUTS":"\"distributePolicy/1.0/common.cf\",\n\"distributePolicy/1.0/rsyslogConf.cf\",\n\"distributePolicy/1.0/propagatePromises.cf\",\n\"distributePolicy/1.0/apache-acl.cf\",\n\"common/1.0/common.cf\",\n\"common/1.0/cf-serverd.cf\",\n\"rudder-directives.cf\",\n\"rudder-system-directives.cf\",\n\"common/1.0/rudder-parameters.cf\",\n\"common/1.0/rudder-groups.cf\",\n\"common/1.0/hooks.cf\",\n\"common/1.0/cron-setup.cf\",\n\"common/1.0/site.cf\",\n\"common/1.0/update.cf\",\n\"common/1.0/monitoring.cf\",\n\"common/1.0/restart-services.cf\",\n\"common/1.0/internal-security.cf\",\n\"common/1.0/environment-variables.cf\",\n\"common/1.0/properties.cf\",\n\"common/1.0/reporting-http.cf\",\n\"inventory/1.0/fusionAgent.cf\",\n\"server-roles/1.0/common.cf\",\n\"server-roles/1.0/metrics-reporting.cf\",\n\"server-roles/1.0/component-check.cf\",\n\"server-roles/1.0/alive-check.cf\",\n\"server-roles/1.0/service-check.cf\",\n\"server-roles/1.0/integrity-check.cf\",\n\"server-roles/1.0/network-check.cf\",\n\"server-roles/1.0/password-check.cf\",\n\"server-roles/1.0/postgres-check.cf\",\n\"server-roles/1.0/logrotate-check.cf\",\n\"server-roles/1.0/technique-reload.cf\",\n\"server-roles/1.0/compress-webapp-log.cf\",\n\"server-roles/1.0/compress-ldap-backups.cf\",\n\"server-roles/1.0/servers-by-role.cf\",\n\"server-roles/1.0/relayd.cf\",", "RUDDER_SYSTEM_DIRECTIVES_SEQUENCE":" \"distributePolicy/Distribute Policy\" usebundle => set_dry_run_mode(\"false\");\n \"distributePolicy/Distribute Policy\" usebundle => run_root_distributePolicy;\n \"Rudder system policy: daily inventory/Inventory\" usebundle => set_dry_run_mode(\"false\");\n \"Rudder system policy: daily inventory/Inventory\" usebundle => run_inventory_all;\n \"Rudder system policy: Server roles/Server Roles\" usebundle => set_dry_run_mode(\"false\");\n \"Rudder system policy: Server roles/Server Roles\" usebundle => run_server_roles_directive;", "RUDDER_VERIFY_CERTIFICATES":"false", @@ -45,7 +44,5 @@ "SHARED_FILES_FOLDER":"/var/rudder/configuration-repository/shared-files", "SKIPIDENTIFY":"false", "STORE_ALL_CENTRALIZED_LOGS_IN_FILE":"true", - "SYSLOGPORT":"514", - "SYSLOG_PROTOCOL_DISABLED":"false", "TOOLS_FOLDER":"tools_folder" } diff --git a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/root-sys-var-false/promises.cf b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/root-sys-var-false/promises.cf index 39f18c76ab..1ce86ad0fb 100644 --- a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/root-sys-var-false/promises.cf +++ b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/root-sys-var-false/promises.cf @@ -35,8 +35,7 @@ bundle common rudder_roles "reports_disabled_mode" expression => strcmp("full-compliance", "reports-disabled"); "changes_only" expression => "changes_only_mode.!force_full_compliance"; "reports_disabled" expression => "reports_disabled_mode.!force_full_compliance"; - "rudder_reporting_https" expression => strcmp("SYSLOG", "HTTPS"); - "rsyslog_disabled" expression => strcmp("false", "true"); + "rudder_reporting_https" expression => strcmp("HTTPS", "HTTPS"); "rudder_global_audit_mode" not => strcmp("enforce", "enforce"); @@ -301,8 +300,6 @@ bundle agent check_log_system "syslog_ng_conf_proto" string => "${syslogng_rule_prefix}"; "syslog_ng_conf_start" string => "(\""; "syslog_ng_conf_port" string => "\" port ("; - "syslog_ng_conf_portno" string => "514"; - "syslog_ng_conf_suffix" string => "));};log {source(${syslog_ng_source});filter(f_local_rudder);destination(rudder_loghost);"; "syslog_ng_conf_final" string => "flags(final);};"; "syslog_ng_conf" string => concat("${syslog_conf_comment}", "${syslog_ng_conf_prefix}", "${syslog_ng_conf_proto}", "${syslog_ng_conf_start}", "${server_info.policy_server}", "${syslog_ng_conf_port}", "${syslog_ng_conf_portno}", "${syslog_ng_conf_suffix}", "${syslog_ng_conf_final}"); @@ -321,9 +318,6 @@ bundle agent check_log_system "syslogng_conffile_present" expression => fileexists("${syslogng_conffile}"), scope => "namespace"; "syslogd_conffile_present" expression => fileexists("${syslog_conffile}"), scope => "namespace"; - "use_udp" expression => strcmp("UDP", "UDP"); - "use_tcp" expression => strcmp("UDP", "TCP"); - "pass3" expression => "pass2"; "pass2" expression => "pass1"; "pass1" expression => "any"; diff --git a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/root-sys-var-false/rudder.json b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/root-sys-var-false/rudder.json index 0a99f4521d..e27ef7d571 100644 --- a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/root-sys-var-false/rudder.json +++ b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/root-sys-var-false/rudder.json @@ -22,7 +22,7 @@ "RELAY_SYNC_METHOD":"classic", "RELAY_SYNC_PROMISES":"false", "RELAY_SYNC_SHAREDFILES":"false", - "REPORTING_PROTOCOL":"SYSLOG", + "REPORTING_PROTOCOL":"HTTPS", "RUDDER_COMPLIANCE_MODE":"enforce", "RUDDER_DIRECTIVES_INPUTS":[ "" @@ -36,7 +36,6 @@ "RUDDER_REPORTS_DB_USER":"rudder", "RUDDER_REPORT_MODE":"full-compliance", "RUDDER_SERVER_ROLES":"rudder-ldap:rudder.server-roles.ldap\nrudder-inventory-endpoint:rudder.server-roles.inventory-endpoint\nrudder-db:rudder.server-roles.db\nrudder-relay-top:rudder.server-roles.relay-top\nrudder-web:rudder.server-roles.web\nrudder-relay-promises-only:rudder.server-roles.relay-promises-only\nrudder-cfengine-mission-portal:rudder.server-roles.cfengine-mission-portal\n", - "RUDDER_SYSLOG_PROTOCOL":"UDP", "RUDDER_SYSTEM_DIRECTIVES_INPUTS":"\"distributePolicy/1.0/common.cf\",\n\"distributePolicy/1.0/rsyslogConf.cf\",\n\"distributePolicy/1.0/propagatePromises.cf\",\n\"distributePolicy/1.0/apache-acl.cf\",\n\"common/1.0/common.cf\",\n\"common/1.0/cf-serverd.cf\",\n\"rudder-directives.cf\",\n\"rudder-system-directives.cf\",\n\"common/1.0/rudder-parameters.cf\",\n\"common/1.0/rudder-groups.cf\",\n\"common/1.0/hooks.cf\",\n\"common/1.0/cron-setup.cf\",\n\"common/1.0/site.cf\",\n\"common/1.0/update.cf\",\n\"common/1.0/monitoring.cf\",\n\"common/1.0/restart-services.cf\",\n\"common/1.0/internal-security.cf\",\n\"common/1.0/environment-variables.cf\",\n\"common/1.0/properties.cf\",\n\"common/1.0/reporting-http.cf\",\n\"inventory/1.0/fusionAgent.cf\",\n\"server-roles/1.0/common.cf\",\n\"server-roles/1.0/metrics-reporting.cf\",\n\"server-roles/1.0/component-check.cf\",\n\"server-roles/1.0/alive-check.cf\",\n\"server-roles/1.0/service-check.cf\",\n\"server-roles/1.0/integrity-check.cf\",\n\"server-roles/1.0/network-check.cf\",\n\"server-roles/1.0/password-check.cf\",\n\"server-roles/1.0/postgres-check.cf\",\n\"server-roles/1.0/logrotate-check.cf\",\n\"server-roles/1.0/technique-reload.cf\",\n\"server-roles/1.0/compress-webapp-log.cf\",\n\"server-roles/1.0/compress-ldap-backups.cf\",\n\"server-roles/1.0/servers-by-role.cf\",\n\"server-roles/1.0/relayd.cf\",", "RUDDER_SYSTEM_DIRECTIVES_SEQUENCE":" \"distributePolicy/Distribute Policy\" usebundle => set_dry_run_mode(\"false\");\n \"distributePolicy/Distribute Policy\" usebundle => run_root_distributePolicy;\n \"Rudder system policy: daily inventory/Inventory\" usebundle => set_dry_run_mode(\"false\");\n \"Rudder system policy: daily inventory/Inventory\" usebundle => run_inventory_all;\n \"Rudder system policy: Server roles/Server Roles\" usebundle => set_dry_run_mode(\"false\");\n \"Rudder system policy: Server roles/Server Roles\" usebundle => run_server_roles_directive;", "RUDDER_VERIFY_CERTIFICATES":"false", @@ -45,7 +44,5 @@ "SHARED_FILES_FOLDER":"/var/rudder/configuration-repository/shared-files", "SKIPIDENTIFY":"false", "STORE_ALL_CENTRALIZED_LOGS_IN_FILE":"false", - "SYSLOGPORT":"514", - "SYSLOG_PROTOCOL_DISABLED":"false", "TOOLS_FOLDER":"tools_folder" } diff --git a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/root-with-one-multipolicy/promises.cf b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/root-with-one-multipolicy/promises.cf index 39f18c76ab..1ce86ad0fb 100644 --- a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/root-with-one-multipolicy/promises.cf +++ b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/root-with-one-multipolicy/promises.cf @@ -35,8 +35,7 @@ bundle common rudder_roles "reports_disabled_mode" expression => strcmp("full-compliance", "reports-disabled"); "changes_only" expression => "changes_only_mode.!force_full_compliance"; "reports_disabled" expression => "reports_disabled_mode.!force_full_compliance"; - "rudder_reporting_https" expression => strcmp("SYSLOG", "HTTPS"); - "rsyslog_disabled" expression => strcmp("false", "true"); + "rudder_reporting_https" expression => strcmp("HTTPS", "HTTPS"); "rudder_global_audit_mode" not => strcmp("enforce", "enforce"); @@ -301,8 +300,6 @@ bundle agent check_log_system "syslog_ng_conf_proto" string => "${syslogng_rule_prefix}"; "syslog_ng_conf_start" string => "(\""; "syslog_ng_conf_port" string => "\" port ("; - "syslog_ng_conf_portno" string => "514"; - "syslog_ng_conf_suffix" string => "));};log {source(${syslog_ng_source});filter(f_local_rudder);destination(rudder_loghost);"; "syslog_ng_conf_final" string => "flags(final);};"; "syslog_ng_conf" string => concat("${syslog_conf_comment}", "${syslog_ng_conf_prefix}", "${syslog_ng_conf_proto}", "${syslog_ng_conf_start}", "${server_info.policy_server}", "${syslog_ng_conf_port}", "${syslog_ng_conf_portno}", "${syslog_ng_conf_suffix}", "${syslog_ng_conf_final}"); @@ -321,9 +318,6 @@ bundle agent check_log_system "syslogng_conffile_present" expression => fileexists("${syslogng_conffile}"), scope => "namespace"; "syslogd_conffile_present" expression => fileexists("${syslog_conffile}"), scope => "namespace"; - "use_udp" expression => strcmp("UDP", "UDP"); - "use_tcp" expression => strcmp("UDP", "TCP"); - "pass3" expression => "pass2"; "pass2" expression => "pass1"; "pass1" expression => "any"; diff --git a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/root-with-one-multipolicy/rudder.json b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/root-with-one-multipolicy/rudder.json index 55f3df2cbf..e707d3544c 100644 --- a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/root-with-one-multipolicy/rudder.json +++ b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/root-with-one-multipolicy/rudder.json @@ -22,7 +22,7 @@ "RELAY_SYNC_METHOD":"classic", "RELAY_SYNC_PROMISES":"false", "RELAY_SYNC_SHAREDFILES":"false", - "REPORTING_PROTOCOL":"SYSLOG", + "REPORTING_PROTOCOL":"HTTPS", "RUDDER_COMPLIANCE_MODE":"enforce", "RUDDER_DIRECTIVES_INPUTS":[ "\"fileTemplate/1_0_e9a1a909_2490_4fc9_95c3_9d0aa01717c9/fileTemplate.cf\",\n\"fileTemplate/1_0_99f4ef91_537b_4e03_97bc_e65b447514cc/fileTemplate.cf\"," @@ -36,7 +36,6 @@ "RUDDER_REPORTS_DB_USER":"rudder", "RUDDER_REPORT_MODE":"full-compliance", "RUDDER_SERVER_ROLES":"rudder-ldap:rudder.server-roles.ldap\nrudder-inventory-endpoint:rudder.server-roles.inventory-endpoint\nrudder-db:rudder.server-roles.db\nrudder-relay-top:rudder.server-roles.relay-top\nrudder-web:rudder.server-roles.web\nrudder-relay-promises-only:rudder.server-roles.relay-promises-only\nrudder-cfengine-mission-portal:rudder.server-roles.cfengine-mission-portal\n", - "RUDDER_SYSLOG_PROTOCOL":"UDP", "RUDDER_SYSTEM_DIRECTIVES_INPUTS":"\"distributePolicy/1.0/common.cf\",\n\"distributePolicy/1.0/rsyslogConf.cf\",\n\"distributePolicy/1.0/propagatePromises.cf\",\n\"distributePolicy/1.0/apache-acl.cf\",\n\"common/1.0/common.cf\",\n\"common/1.0/cf-serverd.cf\",\n\"rudder-directives.cf\",\n\"rudder-system-directives.cf\",\n\"common/1.0/rudder-parameters.cf\",\n\"common/1.0/rudder-groups.cf\",\n\"common/1.0/hooks.cf\",\n\"common/1.0/cron-setup.cf\",\n\"common/1.0/site.cf\",\n\"common/1.0/update.cf\",\n\"common/1.0/monitoring.cf\",\n\"common/1.0/restart-services.cf\",\n\"common/1.0/internal-security.cf\",\n\"common/1.0/environment-variables.cf\",\n\"common/1.0/properties.cf\",\n\"common/1.0/reporting-http.cf\",\n\"inventory/1.0/fusionAgent.cf\",\n\"server-roles/1.0/common.cf\",\n\"server-roles/1.0/metrics-reporting.cf\",\n\"server-roles/1.0/component-check.cf\",\n\"server-roles/1.0/alive-check.cf\",\n\"server-roles/1.0/service-check.cf\",\n\"server-roles/1.0/integrity-check.cf\",\n\"server-roles/1.0/network-check.cf\",\n\"server-roles/1.0/password-check.cf\",\n\"server-roles/1.0/postgres-check.cf\",\n\"server-roles/1.0/logrotate-check.cf\",\n\"server-roles/1.0/technique-reload.cf\",\n\"server-roles/1.0/compress-webapp-log.cf\",\n\"server-roles/1.0/compress-ldap-backups.cf\",\n\"server-roles/1.0/servers-by-role.cf\",\n\"server-roles/1.0/relayd.cf\",", "RUDDER_SYSTEM_DIRECTIVES_SEQUENCE":" \"distributePolicy/Distribute Policy\" usebundle => set_dry_run_mode(\"false\");\n \"distributePolicy/Distribute Policy\" usebundle => run_root_distributePolicy;\n \"Rudder system policy: daily inventory/Inventory\" usebundle => set_dry_run_mode(\"false\");\n \"Rudder system policy: daily inventory/Inventory\" usebundle => run_inventory_all;\n \"Rudder system policy: Server roles/Server Roles\" usebundle => set_dry_run_mode(\"false\");\n \"Rudder system policy: Server roles/Server Roles\" usebundle => run_server_roles_directive;", "RUDDER_VERIFY_CERTIFICATES":"false", @@ -45,7 +44,5 @@ "SHARED_FILES_FOLDER":"/var/rudder/configuration-repository/shared-files", "SKIPIDENTIFY":"false", "STORE_ALL_CENTRALIZED_LOGS_IN_FILE":"true", - "SYSLOGPORT":"514", - "SYSLOG_PROTOCOL_DISABLED":"false", "TOOLS_FOLDER":"tools_folder" } diff --git a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/root-with-two-directives/promises.cf b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/root-with-two-directives/promises.cf index 39f18c76ab..1ce86ad0fb 100644 --- a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/root-with-two-directives/promises.cf +++ b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/root-with-two-directives/promises.cf @@ -35,8 +35,7 @@ bundle common rudder_roles "reports_disabled_mode" expression => strcmp("full-compliance", "reports-disabled"); "changes_only" expression => "changes_only_mode.!force_full_compliance"; "reports_disabled" expression => "reports_disabled_mode.!force_full_compliance"; - "rudder_reporting_https" expression => strcmp("SYSLOG", "HTTPS"); - "rsyslog_disabled" expression => strcmp("false", "true"); + "rudder_reporting_https" expression => strcmp("HTTPS", "HTTPS"); "rudder_global_audit_mode" not => strcmp("enforce", "enforce"); @@ -301,8 +300,6 @@ bundle agent check_log_system "syslog_ng_conf_proto" string => "${syslogng_rule_prefix}"; "syslog_ng_conf_start" string => "(\""; "syslog_ng_conf_port" string => "\" port ("; - "syslog_ng_conf_portno" string => "514"; - "syslog_ng_conf_suffix" string => "));};log {source(${syslog_ng_source});filter(f_local_rudder);destination(rudder_loghost);"; "syslog_ng_conf_final" string => "flags(final);};"; "syslog_ng_conf" string => concat("${syslog_conf_comment}", "${syslog_ng_conf_prefix}", "${syslog_ng_conf_proto}", "${syslog_ng_conf_start}", "${server_info.policy_server}", "${syslog_ng_conf_port}", "${syslog_ng_conf_portno}", "${syslog_ng_conf_suffix}", "${syslog_ng_conf_final}"); @@ -321,9 +318,6 @@ bundle agent check_log_system "syslogng_conffile_present" expression => fileexists("${syslogng_conffile}"), scope => "namespace"; "syslogd_conffile_present" expression => fileexists("${syslog_conffile}"), scope => "namespace"; - "use_udp" expression => strcmp("UDP", "UDP"); - "use_tcp" expression => strcmp("UDP", "TCP"); - "pass3" expression => "pass2"; "pass2" expression => "pass1"; "pass1" expression => "any"; diff --git a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/root-with-two-directives/rudder.json b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/root-with-two-directives/rudder.json index 34bcc13ef3..6e224d7a49 100644 --- a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/root-with-two-directives/rudder.json +++ b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/root-with-two-directives/rudder.json @@ -22,7 +22,7 @@ "RELAY_SYNC_METHOD":"classic", "RELAY_SYNC_PROMISES":"false", "RELAY_SYNC_SHAREDFILES":"false", - "REPORTING_PROTOCOL":"SYSLOG", + "REPORTING_PROTOCOL":"HTTPS", "RUDDER_COMPLIANCE_MODE":"enforce", "RUDDER_DIRECTIVES_INPUTS":[ "\"clockConfiguration/3.0/clockConfiguration.cf\",\n\"rpmPackageInstallation/7.0/rpmPackageInstallation.cf\"," @@ -36,7 +36,6 @@ "RUDDER_REPORTS_DB_USER":"rudder", "RUDDER_REPORT_MODE":"full-compliance", "RUDDER_SERVER_ROLES":"rudder-ldap:rudder.server-roles.ldap\nrudder-inventory-endpoint:rudder.server-roles.inventory-endpoint\nrudder-db:rudder.server-roles.db\nrudder-relay-top:rudder.server-roles.relay-top\nrudder-web:rudder.server-roles.web\nrudder-relay-promises-only:rudder.server-roles.relay-promises-only\nrudder-cfengine-mission-portal:rudder.server-roles.cfengine-mission-portal\n", - "RUDDER_SYSLOG_PROTOCOL":"UDP", "RUDDER_SYSTEM_DIRECTIVES_INPUTS":"\"distributePolicy/1.0/common.cf\",\n\"distributePolicy/1.0/rsyslogConf.cf\",\n\"distributePolicy/1.0/propagatePromises.cf\",\n\"distributePolicy/1.0/apache-acl.cf\",\n\"common/1.0/common.cf\",\n\"common/1.0/cf-serverd.cf\",\n\"rudder-directives.cf\",\n\"rudder-system-directives.cf\",\n\"common/1.0/rudder-parameters.cf\",\n\"common/1.0/rudder-groups.cf\",\n\"common/1.0/hooks.cf\",\n\"common/1.0/cron-setup.cf\",\n\"common/1.0/site.cf\",\n\"common/1.0/update.cf\",\n\"common/1.0/monitoring.cf\",\n\"common/1.0/restart-services.cf\",\n\"common/1.0/internal-security.cf\",\n\"common/1.0/environment-variables.cf\",\n\"common/1.0/properties.cf\",\n\"common/1.0/reporting-http.cf\",\n\"inventory/1.0/fusionAgent.cf\",\n\"server-roles/1.0/common.cf\",\n\"server-roles/1.0/metrics-reporting.cf\",\n\"server-roles/1.0/component-check.cf\",\n\"server-roles/1.0/alive-check.cf\",\n\"server-roles/1.0/service-check.cf\",\n\"server-roles/1.0/integrity-check.cf\",\n\"server-roles/1.0/network-check.cf\",\n\"server-roles/1.0/password-check.cf\",\n\"server-roles/1.0/postgres-check.cf\",\n\"server-roles/1.0/logrotate-check.cf\",\n\"server-roles/1.0/technique-reload.cf\",\n\"server-roles/1.0/compress-webapp-log.cf\",\n\"server-roles/1.0/compress-ldap-backups.cf\",\n\"server-roles/1.0/servers-by-role.cf\",\n\"server-roles/1.0/relayd.cf\",", "RUDDER_SYSTEM_DIRECTIVES_SEQUENCE":" \"distributePolicy/Distribute Policy\" usebundle => set_dry_run_mode(\"false\");\n \"distributePolicy/Distribute Policy\" usebundle => run_root_distributePolicy;\n \"Rudder system policy: daily inventory/Inventory\" usebundle => set_dry_run_mode(\"false\");\n \"Rudder system policy: daily inventory/Inventory\" usebundle => run_inventory_all;\n \"Rudder system policy: Server roles/Server Roles\" usebundle => set_dry_run_mode(\"false\");\n \"Rudder system policy: Server roles/Server Roles\" usebundle => run_server_roles_directive;", "RUDDER_VERIFY_CERTIFICATES":"false", @@ -45,7 +44,5 @@ "SHARED_FILES_FOLDER":"/var/rudder/configuration-repository/shared-files", "SKIPIDENTIFY":"false", "STORE_ALL_CENTRALIZED_LOGS_IN_FILE":"true", - "SYSLOGPORT":"514", - "SYSLOG_PROTOCOL_DISABLED":"false", "TOOLS_FOLDER":"tools_folder" } diff --git a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/techniques/system/common/1.0/metadata.xml b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/techniques/system/common/1.0/metadata.xml index 556d8d36e0..26b01101b7 100644 --- a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/techniques/system/common/1.0/metadata.xml +++ b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/techniques/system/common/1.0/metadata.xml @@ -110,7 +110,6 @@ along with this program. If not, see . SHARED_FILES_FOLDER DAVUSER DAVPASSWORD - SYSLOGPORT MANAGED_NODES_NAME MANAGED_NODES_ID MANAGED_NODES_KEY @@ -125,11 +124,9 @@ along with this program. If not, see . RUDDER_REPORT_MODE RUDDER_HEARTBEAT_INTERVAL CONFIGURATION_REPOSITORY_FOLDER - RUDDER_SYSLOG_PROTOCOL RUDDER_NODE_GROUPS_VARS RUDDER_NODE_GROUPS_CLASSES REPORTING_PROTOCOL - SYSLOG_PROTOCOL_DISABLED RUDDER_INVENTORY_VARS RUDDER_COMPLIANCE_MODE diff --git a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/techniques/system/common/1.0/promises.st b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/techniques/system/common/1.0/promises.st index 97cba3b4fa..b6181b9045 100644 --- a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/techniques/system/common/1.0/promises.st +++ b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/techniques/system/common/1.0/promises.st @@ -36,7 +36,6 @@ bundle common rudder_roles "changes_only" expression => "changes_only_mode.!force_full_compliance"; "reports_disabled" expression => "reports_disabled_mode.!force_full_compliance"; "rudder_reporting_https" expression => strcmp("&REPORTING_PROTOCOL&", "HTTPS"); - "rsyslog_disabled" expression => strcmp("&SYSLOG_PROTOCOL_DISABLED&", "true"); "rudder_global_audit_mode" not => strcmp("&RUDDER_COMPLIANCE_MODE&", "enforce"); @@ -322,8 +321,6 @@ bundle agent check_log_system "syslog_ng_conf_proto" string => "${syslogng_rule_prefix}"; "syslog_ng_conf_start" string => "(\""; "syslog_ng_conf_port" string => "\" port ("; - "syslog_ng_conf_portno" string => "&SYSLOGPORT&"; - "syslog_ng_conf_suffix" string => "));};log {source(${syslog_ng_source});filter(f_local_rudder);destination(rudder_loghost);"; "syslog_ng_conf_final" string => "flags(final);};"; "syslog_ng_conf" string => concat("${syslog_conf_comment}", "${syslog_ng_conf_prefix}", "${syslog_ng_conf_proto}", "${syslog_ng_conf_start}", "${server_info.policy_server}", "${syslog_ng_conf_port}", "${syslog_ng_conf_portno}", "${syslog_ng_conf_suffix}", "${syslog_ng_conf_final}"); @@ -342,9 +339,6 @@ bundle agent check_log_system "syslogng_conffile_present" expression => fileexists("${syslogng_conffile}"), scope => "namespace"; "syslogd_conffile_present" expression => fileexists("${syslog_conffile}"), scope => "namespace"; - "use_udp" expression => strcmp("&RUDDER_SYSLOG_PROTOCOL&", "UDP"); - "use_tcp" expression => strcmp("&RUDDER_SYSLOG_PROTOCOL&", "TCP"); - "pass3" expression => "pass2"; "pass2" expression => "pass1"; "pass1" expression => "any"; @@ -362,7 +356,7 @@ bundle agent check_log_system (rsyslog_version_5_6_4_ok|rsyslog_version_5_6_4_not_ok).rsyslogd_conffile_present.!policy_server:: "${rsyslog_rudder_conffile}" - edit_line => append_if_no_lines("#Rudder log system${const.n}${rsyslogd_message_reduction}${const.n}if $syslogfacility-text == 'local6' and $programname startswith 'rudder' then ${rsyslog_rule_prefix}${server_info.policy_server}:&SYSLOGPORT&${const.n}if $syslogfacility-text == 'local6' and $programname startswith 'rudder' then ~${const.n}if $syslogfacility-text == 'local6' and $programname startswith 'cf-agent' then ${rsyslog_rule_prefix}${server_info.policy_server}:&SYSLOGPORT&${const.n}if $syslogfacility-text == 'local6' and $programname startswith 'cf-agent' then ~"), + edit_line => append_if_no_lines("#Rudder log system${const.n}${rsyslogd_message_reduction}${const.n}if $syslogfacility-text == 'local6' and $programname startswith 'rudder' then ${rsyslog_rule_prefix}${server_info.policy_server}:514${const.n}if $syslogfacility-text == 'local6' and $programname startswith 'rudder' then ~${const.n}if $syslogfacility-text == 'local6' and $programname startswith 'cf-agent' then ${rsyslog_rule_prefix}${server_info.policy_server}:514${const.n}if $syslogfacility-text == 'local6' and $programname startswith 'cf-agent' then ~"), create => "true", edit_defaults => empty_backup, classes => classes_generic("rsyslog"); diff --git a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/techniques/system/distributePolicy/1.0/metadata.xml b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/techniques/system/distributePolicy/1.0/metadata.xml index 360693d729..89d2a6b168 100644 --- a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/techniques/system/distributePolicy/1.0/metadata.xml +++ b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/techniques/system/distributePolicy/1.0/metadata.xml @@ -68,7 +68,6 @@ along with this program. If not, see . CLIENTSFOLDERS - SYSLOGPORT SHARED_FILES_FOLDER STORE_ALL_CENTRALIZED_LOGS_IN_FILE MANAGED_NODES_IP diff --git a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/techniques/system/distributePolicy/1.0/rudder-rsyslog-relay.st b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/techniques/system/distributePolicy/1.0/rudder-rsyslog-relay.st index b776610395..954f29ff6d 100644 --- a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/techniques/system/distributePolicy/1.0/rudder-rsyslog-relay.st +++ b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/techniques/system/distributePolicy/1.0/rudder-rsyslog-relay.st @@ -23,11 +23,11 @@ $RepeatedMsgReduction off # Provides TCP syslog reception $ModLoad imtcp -$InputTCPServerRun &SYSLOGPORT& +$InputTCPServerRun 514 # Provide udp for snare and compatibility with older syslog $ModLoad imudp -$UDPServerRun &SYSLOGPORT& +$UDPServerRun 514 # for Snare client $EscapeControlCharactersOnReceive off @@ -58,7 +58,7 @@ if $fromhost-ip == "127.0.0.1" then { # # 1 - Send every matching report to the root server -:msg, ereregex, "(R: )?@@[ a-zA-Z0-9_\-]+?@@[a-zA-Z0-9_\-]{1,64}?@@[a-zA-Z0-9\-]+@@[a-zA-Z0-9\-]+?@@[0-9]+?@@.*?@@.*?@@[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}[+-][0-9]{1,2}:[0-9]{2}##[a-zA-Z0-9\-]+?@#.*" {{vars.check_log_system.rsyslog_rule_prefix}}{{vars.server_info.policy_server}}:&SYSLOGPORT& +:msg, ereregex, "(R: )?@@[ a-zA-Z0-9_\-]+?@@[a-zA-Z0-9_\-]{1,64}?@@[a-zA-Z0-9\-]+@@[a-zA-Z0-9\-]+?@@[0-9]+?@@.*?@@.*?@@[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}[+-][0-9]{1,2}:[0-9]{2}##[a-zA-Z0-9\-]+?@#.*" {{vars.check_log_system.rsyslog_rule_prefix}}{{vars.server_info.policy_server}}:514 # 2 - Drop the remaining rudder logs to prevent local storage cluttering diff --git a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/techniques/system/distributePolicy/1.0/rudder-rsyslog-root.st b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/techniques/system/distributePolicy/1.0/rudder-rsyslog-root.st index 71dd573fa8..54412c322e 100644 --- a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/techniques/system/distributePolicy/1.0/rudder-rsyslog-root.st +++ b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/techniques/system/distributePolicy/1.0/rudder-rsyslog-root.st @@ -23,11 +23,11 @@ $RepeatedMsgReduction off # Provides TCP syslog reception $ModLoad imtcp -$InputTCPServerRun &SYSLOGPORT& +$InputTCPServerRun 514 # Provide udp for snare and compatibility with older syslog $ModLoad imudp -$UDPServerRun &SYSLOGPORT& +$UDPServerRun 514 # Load postgres module $ModLoad ompgsql diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/NodeConfigData.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/NodeConfigData.scala index d820e6e282..e5e2a109be 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/NodeConfigData.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/NodeConfigData.scala @@ -265,7 +265,7 @@ ootapja6lKOaIpqp0kmmYN7gFIhp , List("192.168.0.10") , DateTime.now , UndefinedKey - , Seq(AgentInfo(CfeCommunity, Some(AgentVersion("4.0.0")), PublicKey(PUBKEY), Set())) + , Seq(AgentInfo(CfeCommunity, Some(AgentVersion("6.0.0")), PublicKey(PUBKEY), Set())) , rootId , admin1 , Set() @@ -331,7 +331,7 @@ ootapja6lKOaIpqp0kmmYN7gFIhp , List("192.168.0.5") , DateTime.now , UndefinedKey - , Seq(AgentInfo(AgentType.Dsc, Some(AgentVersion("5.0.0")), Certificate("windows-node-dsc-certificate"), Set())) + , Seq(AgentInfo(AgentType.Dsc, Some(AgentVersion("7.0.0")), Certificate("windows-node-dsc-certificate"), Set())) , rootId , admin1 , Set() @@ -611,7 +611,6 @@ class TestNodeConfiguration(prefixTestResources: String = "") { , webdavPassword = "rudder" , reportsDbUri = "rudder" , reportsDbUser = "rudder" - , syslogPort = 514 , configurationRepository = configurationRepositoryRoot.getAbsolutePath , serverRoles = Seq( RudderServerRole("rudder-ldap" , "rudder.server-roles.ldap") @@ -633,9 +632,7 @@ class TestNodeConfiguration(prefixTestResources: String = "") { , getCfengineOutputsTtl = () => Full(7) , getStoreAllCentralizedLogsInFile= () => Full(true) , getSendMetrics = () => Full(None) - , getSyslogProtocol = () => Full(SyslogUDP) - , getSyslogProtocolDisabled = () => Full(false) - , getReportProtocolDefault = () => Full(AgentReportingSyslog) + , getReportProtocolDefault = () => Full(AgentReportingHTTPS) , getRudderVerifyCertificates = () => Full(false) ) diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/queries/TestQueryProcessor.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/queries/TestQueryProcessor.scala index d61d7470d9..b9ff268fb1 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/queries/TestQueryProcessor.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/queries/TestQueryProcessor.scala @@ -150,7 +150,7 @@ class TestQueryProcessor extends Loggable { res.size }).runNow - val expected = 43+38 //bootstrap + inventory-sample + val expected = 41+38 //bootstrap + inventory-sample assert(expected == s, s"Not found the expected number of entries in test LDAP directory [expected: ${expected}, found: ${s}], perhaps the demo entries where not correctly loaded") } diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/appconfig/ConfigService.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/appconfig/ConfigService.scala index bae40d22da..8e9d2b4490 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/appconfig/ConfigService.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/appconfig/ConfigService.scala @@ -70,7 +70,6 @@ import com.normation.rudder.services.servers.RelaySynchronizationMethod._ import com.normation.rudder.services.servers.RelaySynchronizationMethod import com.normation.rudder.services.workflows.WorkflowLevelService import com.normation.errors._ -import com.normation.rudder.domain.eventlog.ModifyRudderSyslogProtocolEventType import com.normation.rudder.domain.eventlog.ModifyRudderVerifyCertificates import com.normation.rudder.services.policies.SendMetrics import zio._ @@ -173,16 +172,6 @@ trait ReadConfigService { */ def send_server_metrics(): IOResult[Option[SendMetrics]] - /** - * Report protocol - */ - def rudder_syslog_protocol(): IOResult[SyslogProtocol] - - /** - * Report protocol - */ - def rudder_syslog_protocol_disabled(): IOResult[Boolean] - /** * default reporting protocol */ @@ -318,10 +307,6 @@ trait UpdateConfigService { /** * Report protocol */ - def set_rudder_syslog_protocol(value : SyslogProtocol, actor : EventActor, reason: Option[String]): IOResult[Unit] - - def set_rudder_syslog_protocol_disabled(value : Boolean, actor : EventActor, reason: Option[String]): IOResult[Unit] - def set_rudder_report_protocol_default(value : AgentReportingProtocol): IOResult[Unit] /** @@ -495,16 +480,8 @@ class GenericConfigService( } private[this] implicit def serBoolean(x: Boolean): String = if(x) "true" else "false" - - private[this] implicit def toSyslogProtocol(p: RudderWebProperty): SyslogProtocol = p.value match { - case SyslogTCP.value => // value is TCP - SyslogTCP - case _ => SyslogUDP - } - // default is HTTPS, in particular for "" private[this] implicit def toReportProtocol(p: RudderWebProperty): AgentReportingProtocol = p.value match { - case AgentReportingSyslog.value => AgentReportingSyslog case _ => AgentReportingHTTPS } @@ -706,21 +683,6 @@ class GenericConfigService( save("send_server_metrics",value,Some(info)) } - /** - * Report protocol - */ - def rudder_syslog_protocol(): IOResult[SyslogProtocol] = get("rudder_syslog_protocol_transport") - def set_rudder_syslog_protocol(protocol : SyslogProtocol, actor : EventActor, reason: Option[String]): IOResult[Unit] = { - val info = ModifyGlobalPropertyInfo(ModifyRudderSyslogProtocolEventType,actor,reason) - save("rudder_syslog_protocol_transport", protocol.value, Some(info)) - } - - def rudder_syslog_protocol_disabled(): IOResult[Boolean] = get("rudder_syslog_protocol_disabled") - def set_rudder_syslog_protocol_disabled(disabled : Boolean, actor : EventActor, reason: Option[String]): IOResult[Unit] = { - val info = ModifyGlobalPropertyInfo(ModifyRudderSyslogProtocolEventType,actor,reason) - save("rudder_syslog_protocol_disabled", disabled, Some(info)) - } - def rudder_report_protocol_default() : IOResult[AgentReportingProtocol] = get("rudder_report_protocol_default") def set_rudder_report_protocol_default(value: AgentReportingProtocol): IOResult[Unit] = save("rudder_report_protocol_default", value.value) /** diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/SettingsApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/SettingsApi.scala index ea0debc247..a7c7b1dd33 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/SettingsApi.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/SettingsApi.scala @@ -102,7 +102,6 @@ class SettingsApi( RestRelaySyncMethod :: RestRelaySynchronizePolicies :: RestRelaySynchronizeSharedFiles :: - RestReportingProtocol :: RestReportingMode :: RestHeartbeat :: RestLogAllReports :: @@ -132,7 +131,7 @@ class SettingsApi( RestComputeDynGroupMaxParallelism :: Nil - val allSettings_v12 = RestReportProtocolDefault :: RestSyslogProtocolDisabled :: allSettings_v10 + val allSettings_v12 = RestReportProtocolDefault :: allSettings_v10 def allSettings(version: ApiVersion) = { if (version.value <= 10) { @@ -543,32 +542,6 @@ final case object RestRelaySynchronizeSharedFiles extends RestBooleanSetting { def get = configService.relay_server_syncsharedfiles() def set = (value : Boolean, _, _) => configService.set_relay_server_syncsharedfiles(value) } -final case object RestReportingProtocol extends RestSetting[SyslogProtocol] { - val key = "rsyslog_reporting_protocol" - val startPolicyGeneration = true - def get = configService.rudder_syslog_protocol() - def set = configService.set_rudder_syslog_protocol _ - def toJson(value : SyslogProtocol) : JValue = value.value - def parseJson(json: JValue) = { - json match { - case JString(value) => parseParam(value.toUpperCase()) - case x => Failure("Invalid value "+x) - } - } - def parseParam(param : String) = { - param.toUpperCase() match { - case SyslogTCP.value => Full(SyslogTCP) - case SyslogUDP.value => Full(SyslogUDP) - case _ => Failure(s"Invalid value '${param}' for syslog protocol") - } - } - } -final case object RestSyslogProtocolDisabled extends RestBooleanSetting { - val key = "syslog_protocol_disabled" - val startPolicyGeneration = true - def get = configService.rudder_syslog_protocol_disabled() - def set = (value : Boolean, actor : EventActor, reason : Option[String]) => configService.set_rudder_syslog_protocol_disabled(value, actor, reason) -} final case object RestReportProtocolDefault extends RestSetting[AgentReportingProtocol] { var key = "rudder_report_protocol_default" @@ -585,7 +558,6 @@ final case object RestReportProtocolDefault extends RestSetting[AgentReportingPr def parseParam(param : String) = { param.toUpperCase() match { case AgentReportingHTTPS.value => Full(AgentReportingHTTPS) - case AgentReportingSyslog.value => Full(AgentReportingSyslog) case _ => Failure(s"Invalid value '${param}' for default reporting method") } } diff --git a/webapp/sources/rudder/rudder-rest/src/test/resources/api/api_settings.yml b/webapp/sources/rudder/rudder-rest/src/test/resources/api/api_settings.yml index 71be37414f..2ca0b5e521 100644 --- a/webapp/sources/rudder/rudder-rest/src/test/resources/api/api_settings.yml +++ b/webapp/sources/rudder/rudder-rest/src/test/resources/api/api_settings.yml @@ -48,7 +48,6 @@ response: "relay_server_synchronize_shared_files":true, "reporting_mode":"full-compliance", "require_time_synchronization":true, - "rsyslog_reporting_protocol":"UDP", "rudder_compute_changes":true, "rudder_compute_dyngroups_max_parallelism":"1", "rudder_generation_compute_dyngroups":true, @@ -57,13 +56,12 @@ response: "rudder_generation_js_timeout":30, "rudder_generation_max_parallelism":"x0.5", "rudder_generation_policy":"all", - "rudder_report_protocol_default":"SYSLOG", + "rudder_report_protocol_default":"HTTPS", "rudder_save_db_compliance_details":false, "rudder_save_db_compliance_levels":true, "run_frequency":5, "send_metrics":"not defined", "splay_time":4, - "syslog_protocol_disabled":false, "unexpected_allows_duplicate":true, "unexpected_unbound_var_values":true } diff --git a/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/MockServices.scala b/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/MockServices.scala index eac31bbaa4..59e190c0f2 100644 --- a/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/MockServices.scala +++ b/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/MockServices.scala @@ -210,7 +210,6 @@ class MockTechniques(configurationRepositoryRoot: File, gitRepo: GitRepositoryPr , webdavPassword = "rudder" , reportsDbUri = "rudder" , reportsDbUser = "rudder" - , syslogPort = 514 , configurationRepository = configurationRepositoryRoot.getAbsolutePath , serverRoles = Seq( RudderServerRole("rudder-ldap" , "rudder.server-roles.ldap") @@ -232,9 +231,7 @@ class MockTechniques(configurationRepositoryRoot: File, gitRepo: GitRepositoryPr , getCfengineOutputsTtl = () => Full(7) , getStoreAllCentralizedLogsInFile= () => Full(true) , getSendMetrics = () => Full(None) - , getSyslogProtocol = () => Full(SyslogUDP) - , getSyslogProtocolDisabled = () => Full(false) - , getReportProtocolDefault = () => Full(AgentReportingSyslog) + , getReportProtocolDefault = () => Full(AgentReportingHTTPS) , getRudderVerifyCertificates = () => Full(false) ) diff --git a/webapp/sources/rudder/rudder-templates-cli/src/test/resources/templates1/expected/promises b/webapp/sources/rudder/rudder-templates-cli/src/test/resources/templates1/expected/promises index 27d446be3a..332e446c30 100644 --- a/webapp/sources/rudder/rudder-templates-cli/src/test/resources/templates1/expected/promises +++ b/webapp/sources/rudder/rudder-templates-cli/src/test/resources/templates1/expected/promises @@ -3,7 +3,7 @@ body common control android:: # if native syslog is not available, use cfengine implementation (eg: android) syslog_host => "${server_info.cfserved}"; - syslog_port => "4242"; + syslog_port => "514"; } diff --git a/webapp/sources/rudder/rudder-templates-cli/src/test/resources/templates1/promises.st b/webapp/sources/rudder/rudder-templates-cli/src/test/resources/templates1/promises.st index bea2f20793..bb1848a110 100644 --- a/webapp/sources/rudder/rudder-templates-cli/src/test/resources/templates1/promises.st +++ b/webapp/sources/rudder/rudder-templates-cli/src/test/resources/templates1/promises.st @@ -3,7 +3,7 @@ body common control android:: # if native syslog is not available, use cfengine implementation (eg: android) syslog_host => "${server_info.cfserved}"; - syslog_port => "&SYSLOGPORT&"; + syslog_port => "514"; } diff --git a/webapp/sources/rudder/rudder-templates-cli/src/test/resources/templates1/variables.json b/webapp/sources/rudder/rudder-templates-cli/src/test/resources/templates1/variables.json index 56074cc83e..ea1d182678 100644 --- a/webapp/sources/rudder/rudder-templates-cli/src/test/resources/templates1/variables.json +++ b/webapp/sources/rudder/rudder-templates-cli/src/test/resources/templates1/variables.json @@ -1,5 +1,5 @@ { - "SYSLOGPORT": "4242" + "SYSLOGPORT": "514" , "RUDDER_REPORT_MODE": "changes-only" , "NOVA": true , "UUID": "695031f3-4123-4c2a-bded-0c6b56d7cf0f" diff --git a/webapp/sources/rudder/rudder-web/src/main/resources/configuration.properties.sample b/webapp/sources/rudder/rudder-web/src/main/resources/configuration.properties.sample index 0256849395..7c8f188f61 100644 --- a/webapp/sources/rudder/rudder-web/src/main/resources/configuration.properties.sample +++ b/webapp/sources/rudder/rudder-web/src/main/resources/configuration.properties.sample @@ -58,15 +58,6 @@ rudder.dir.lock=/var/rudder/lock/ # rudder.server.relay.api=https://localhost/rudder/relay-api -# -# The port used by the rsyslog server on the Rudder root server. -# Default port number is 514, but in some cases this may need to be changed. -# For example, on Ubuntu version >= 12.04 rsyslog runs as a non-root user, -# so using port 514 is not permitted, thus we must use a port higher than 1024. -# (see: https://bugs.launchpad.net/ubuntu/+source/rsyslog/+bug/789174) -# -rudder.syslog.port=514 - ################## # LDAP properties ################################################################### ################## diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/RudderConfig.scala b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/RudderConfig.scala index 882d4fd54d..20813ade81 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/RudderConfig.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/RudderConfig.scala @@ -371,7 +371,6 @@ object RudderConfig extends Loggable { val RUDDER_TECHNIQUELIBRARY_GIT_REFS_PATH = "refs/heads/master" // THIS ONE IS STILL USED FOR USERS USING GIT REPLICATION val RUDDER_AUTOARCHIVEITEMS = config.getBoolean("rudder.autoArchiveItems") //true - val RUDDER_SYSLOG_PORT = config.getInt("rudder.syslog.port") //514 val RUDDER_REPORTS_EXECUTION_MAX_DAYS = config.getInt("rudder.batch.storeAgentRunTimes.maxDays") // In days : 0 val RUDDER_REPORTS_EXECUTION_MAX_MINUTES = { // Tis is handled at the object creation, days and minutes = 0 => 30 minutes try { @@ -1883,7 +1882,6 @@ object RudderConfig extends Loggable { , RUDDER_WEBDAV_PASSWORD , RUDDER_JDBC_URL , RUDDER_JDBC_USERNAME - , RUDDER_SYSLOG_PORT , RUDDER_DIR_GITROOT , RUDDER_SERVER_ROLES , rudderFullVersion @@ -1895,8 +1893,6 @@ object RudderConfig extends Loggable { , () => configService.cfengine_outputs_ttl().toBox , () => configService.rudder_store_all_centralized_logs_in_file().toBox , () => configService.send_server_metrics().toBox - , () => configService.rudder_syslog_protocol().toBox - , () => configService.rudder_syslog_protocol_disabled().toBox , () => configService.rudder_report_protocol_default().toBox , () => configService.rudder_verify_certificates().toBox ) diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/PropertiesManagement.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/PropertiesManagement.scala index a103f236d3..974c81dbc4 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/PropertiesManagement.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/PropertiesManagement.scala @@ -56,9 +56,6 @@ import com.normation.rudder.web.model.CurrentUser import com.normation.rudder.web.components.AgentScheduleEditForm import com.normation.rudder.reports.AgentRunInterval import com.normation.rudder.web.components.ComplianceModeEditForm -import com.normation.rudder.reports.SyslogUDP -import com.normation.rudder.reports.SyslogTCP -import com.normation.rudder.reports.SyslogProtocol import com.normation.rudder.reports.GlobalComplianceMode import com.normation.rudder.web.components.AgentPolicyModeEditForm import com.normation.rudder.AuthorizationType @@ -67,9 +64,6 @@ import com.normation.rudder.domain.policies.PolicyMode import com.normation.rudder.services.servers.RelaySynchronizationMethod._ import com.normation.rudder.services.servers.RelaySynchronizationMethod import com.normation.box._ -import com.normation.rudder.reports.AgentReportingHTTPS -import com.normation.rudder.reports.AgentReportingProtocol -import com.normation.rudder.reports.AgentReportingSyslog import com.normation.rudder.services.policies.SendMetrics import scala.xml.Text @@ -112,7 +106,6 @@ class PropertiesManagement extends DispatchSnippet with Loggable { case "cfengineGlobalProps" => cfengineGlobalProps case "loggingConfiguration" => loggingConfiguration case "sendMetricsConfiguration" => sendMetricsConfiguration - case "reportProtocolSection" => reportProtocolSection case "displayGraphsConfiguration" => displayGraphsConfiguration case "directiveScriptEngineConfiguration" => directiveScriptEngineConfiguration case "unexpectedReportInterpretation" => unexpectedReportInterpretation @@ -506,186 +499,6 @@ class PropertiesManagement extends DispatchSnippet with Loggable { } - def reportProtocolSection = { xml: NodeSeq => - // initial values, updated on successful submit - var initSyslogProtocol = configService.rudder_syslog_protocol().toBox - var initReportProtocol = configService.rudder_report_protocol_default().toBox - var initDisabledSyslog = configService.rudder_syslog_protocol_disabled().toBox - - // form values - var syslogProtocol = initSyslogProtocol.getOrElse(SyslogUDP) - var reportProtocol = initReportProtocol.getOrElse(AgentReportingHTTPS) - var disabledSyslog = initDisabledSyslog.getOrElse(true) - - def noModif = ( - for { - initSyslog <- initSyslogProtocol - initProtocol <- initReportProtocol - initDisabled <- initDisabledSyslog - } yield { - initSyslog == syslogProtocol && - initProtocol == reportProtocol && - initDisabled == disabledSyslog - } - ).getOrElse(false) - - def check() = { - Run( s""" $$("#reportProtocolSubmit").prop('disabled', ${noModif});""".stripMargin) - } - - def submit() = { - val actor = CurrentUser.actor - configService.set_rudder_report_protocol_default(reportProtocol).toBox.foreach(updateOk => initReportProtocol = Full(reportProtocol)) - configService.set_rudder_syslog_protocol(syslogProtocol, actor, None).toBox.foreach(updateOk => initSyslogProtocol = Full(syslogProtocol)) - configService.set_rudder_syslog_protocol_disabled(disabledSyslog, actor, None).toBox.foreach(updateOk => initDisabledSyslog = Full(disabledSyslog)) - - // start a promise generation, Since we check if there is change to save, if we got there it mean that we need to redeploy - startNewPolicyGeneration() - check() & JsRaw("""createSuccessNotification("Reporting protocol correctly updated")""") - } - - val httpsLegacySupport = "HttpsWithLegacy" - - def checkSyslogProtocol(input : String) : JsCmd = { - SyslogProtocol.parse(input).toBox match { - case Full(newValue) => - syslogProtocol = newValue - Noop - case eb: EmptyBox => - Noop - } - } - - def displayDisableSyslogSectionJS(input: String): JsCmd = { - if (input == httpsLegacySupport) { - reportProtocol = AgentReportingHTTPS - disabledSyslog = false - JsRaw(""" $('#syslogProtocol').show(); """) - } else { - AgentReportingProtocol.parse(input).toBox match { - case Full(protocol) => - reportProtocol = protocol - protocol match { - case AgentReportingHTTPS => - disabledSyslog = true - JsRaw(""" $('#syslogProtocol').hide(); """) - case AgentReportingSyslog => - disabledSyslog = false - JsRaw(""" $('#syslogProtocol').show(); """) - } - case eb: EmptyBox => - Noop - } - } - } - - val reportRadioInitialState : Box[(AgentReportingProtocol,Boolean)] = (initReportProtocol,initDisabledSyslog) match { - case (Full(a),Full(b)) => - Full((a,b)) - case (eb1 : EmptyBox, eb2: EmptyBox) => - val fail1 = eb1 ?~! "Error when getting reporting protocol" - val fail2 = eb2 ?~! "Error when getting disabled syslog protocol" - Failure(s"Error when fetch reporting protocol options: ${fail1.messageChain} - ${fail2.messageChain}") - case (eb1 : EmptyBox, _) => - eb1 ?~! "Error when getting reporting protocol" - case (_, eb2 : EmptyBox) => - eb2 ?~! "Error when getting disabled syslog protocol" - } - - - def labelAndValue(protocol : AgentReportingProtocol, disabledSyslog : Boolean) = - protocol match { - case AgentReportingHTTPS if ! disabledSyslog => - ( protocol.value +" with syslog support for migration purpose (old agent or legacy systems)", httpsLegacySupport) - case _ => ( protocol.value + " only", protocol.value) - } - - ( - "#reportProtocol" #> { - reportRadioInitialState match { - case Full((initReport, initDisabled)) => - val (_,initValue) = labelAndValue(initReport,initDisabled) - def radioHtml(protocol : AgentReportingProtocol, disabledSyslog : Boolean): NodeSeq = { - val (label,value) = labelAndValue(protocol,disabledSyslog) - val inputId = value + "-id" - val ajaxCall = SHtml.ajaxCall(Str(""), _ => displayDisableSyslogSectionJS(value) & check())._2.toJsCmd - val inputCheck = if (initReport == protocol && initDisabled == disabledSyslog) { - - } else { - - } -
  • -
    - - -
    -
    • - } - -
      - {((AgentReportingHTTPS, true) :: (AgentReportingHTTPS, false) :: (AgentReportingSyslog, false) :: Nil).map((radioHtml _).tupled)} -
    ++ Script(OnLoad(displayDisableSyslogSectionJS(initValue) & check())) - case eb: EmptyBox => - val fail = eb ?~ "there was an error while fetching value of reporting protocol' " -
    - {fail.msg} -
    - } - - }& - "#reportProtocolSubmit " #> { - SHtml.ajaxSubmit("Save changes", submit _ , ("class","btn btn-success")) - } - & - "#syslogProtocol" #> { - initSyslogProtocol match { - case Full(initSyslog) => - def radioHtml(syslogProtocol: SyslogProtocol): NodeSeq = { - val value = syslogProtocol.value - val inputId = value + "-id" - val ajaxCall = SHtml.ajaxCall(Str(""), _ => checkSyslogProtocol(value) & check())._2.toJsCmd - val inputCheck = if (initSyslog == syslogProtocol) { - - } else { - - } -
  • -
    - - -
    -
    • - } - -
      - {(SyslogUDP :: SyslogTCP :: Nil).map(radioHtml)} -
    - case eb: EmptyBox => - val fail = eb ?~ "there was an error while fetching value of reporting protocol' " -
    - {fail.msg} -
    - } - - } - ).apply (xml) - - } - val agentScheduleEditForm = new AgentScheduleEditForm( () => getSchedule() , saveSchedule diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/secure/administration/policyServerManagement.html b/webapp/sources/rudder/rudder-web/src/main/webapp/secure/administration/policyServerManagement.html index d1dcedf221..835d1ea593 100644 --- a/webapp/sources/rudder/rudder-web/src/main/webapp/secure/administration/policyServerManagement.html +++ b/webapp/sources/rudder/rudder-web/src/main/webapp/secure/administration/policyServerManagement.html @@ -229,34 +229,6 @@

    Relay synchronization

    -
    -

    Reporting protocol

    -
    -
    - -
    - Choose reporting protocol used by nodes to send compliance back to Rudder server: -
      -
    • HTTPS (default): Secure, fast and optimised reporting protocol, you should switch as soon as possible to it
      • -
    • Syslog: Rudder legacy reporting protocol (deprecated). It will be removed in a future version (7.0), it is set on upgrade from 5.0 to keep your reporting working as before -
        -
      • UDP (default): the syslog never stalls an a non responsive connection, which could also stale other services on the node which use the same syslog, but packets could be lost.
        • -
      • TCP: Reports and the resulting compliance errors wil be never lost.
        • -
      -
      • -
    -
    -
    -
    -
    -
    - - - -
    -
    -
    -