Merge branch '65-orchestrator-format-of-the-orchestrator-conf-updates' into 'dev'

Resolve "[Orchestrator] - Format of the orchestrator.conf updates"

See merge request !67

contrib/orchestrator.conf

@@ -4,11 +4,23 @@
 
 #Information related to LDAP
 FD_LDAP_MASTER_URL="ldaps://ldap.fusiondirectory.org"
+LDAP_BASE="dc=fusiondirectory,dc=org"
 LDAP_ADMIN="cn=admin,dc=fusiondirectory,dc=org"
 LDAP_PWD="<ldap_pass>"
+
+#Information related to the DSA login. Required by the fusiondirectory-orchestrator-client.
 #Only DSA authentication is allowed
 LDAP_OU_DSA="ou=dsa,dc=fusiondirectory,dc=org"
-LDAP_BASE="dc=fusiondirectory,dc=org"
+DSA_LOGIN="<dsa_login>"
+DSA_PASS="<dsa_pass>"
+
+#Information related to the webservice of FusionDirectory. Required to call FusionDirectory webservice.
+FUSION_DIRECTORY_API_URL="https://fd.fusiondirectory.org/rest.php/v1"
+WEB_LOGIN="weblogin_username"
+WEB_PASS="weblogin_password"
+
+#Information related to the FusionDirectory Orchestrator Endpoint used by the client
+ORCHESTRATOR_API_URL="https://fd.fusiondirectory.org/orchestrator"
 
 #Information related to Token management
 #SECRET_KEY a 256 bit WEB keys required
@@ -27,13 +39,3 @@ MAIL_SEC_VERIFY="TRUE"
 # If mail sec verify is set to true, mail_sec is required
 MAIL_SEC="<ssl/tls>"
 MAIL_PORT="25"
-
-#Information related to the DSA login. Required by the fusiondirectory-orchestrator-client.
-DSA_LOGIN="<dsa_login>"
-DSA_PASS="<dsa_pass>"
-ORCHESTRATOR_API_URL="https://fd.fusiondirectory.org/orchestrator"
-
-#Information related to the webservice library of Orchestrator. Required to call FD webservice.
-FUSION_DIRECTORY_API_URL="https://fd.fusiondirectory.org/rest.php/v1"
-WEB_LOGIN="weblogin_username"
-WEB_PASS="weblogin_password"
\ No newline at end of file