Fixes #16527: Set HTTPS mode to pure HTTPS for install, rather than H…

…TTPS+syslogcompat
Normation · Jan 13, 2020 · 9b1076f · 9b1076f
1 parent 0adbd32
commit 9b1076f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
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
@@ -374,3 +374,11 @@ objectClass: top
 propertyName: rudder_report_protocol_default
 propertyValue: HTTPS
 
+dn: propertyName=rudder_syslog_protocol_disabled,ou=Application Properties,c
+ n=rudder-configuration
+propertyName: rudder_syslog_protocol_disabled
+objectClass: property
+objectClass: top
+structuralObjectClass: property
+propertyValue: true
+
diff --git a/...rudder-core/src/test/scala/com/normation/rudder/services/queries/TestQueryProcessor.scala b/...rudder-core/src/test/scala/com/normation/rudder/services/queries/TestQueryProcessor.scala
@@ -145,7 +145,7 @@ class TestQueryProcessor extends Loggable {
       res.size
     }).runNow
 
-    val expected = 42+38  //bootstrap + inventory-sample
+    val expected = 43+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")
   }