Merge remote-tracking branch 'origin/master' into ticket

[stg.git] / projects / sgconf / main.cpp

diff --git a/projects/sgconf/main.cpp b/projects/sgconf/main.cpp
index 0667e2590f09a3662144853811c44bb156664c21..979081953464c40316b60c8b9708bef2098499a5 100644 (file)
--- a/projects/sgconf/main.cpp
+++ b/projects/sgconf/main.cpp
@@ -25,6 +25,7 @@
 #include "users.h"
 #include "services.h"
 #include "corps.h"
+#include "info.h"
 
 #include "api_action.h"
 #include "options.h"
@@ -257,8 +258,9 @@ SGCONF::OPTION_BLOCK & block = blocks.Add("Connection options")
       .Add("w", "userpass", SGCONF::MakeParamAction(config.userPass, "<password>"), "\tpassword for the administrative login")
       .Add("a", "address", SGCONF::MakeParamAction(config, "<connection string>"), "connection params as a single string in format: <login>:<password>@<host>:<port>");
 blocks.Add("Debug options")
-      .Add("show-config", SGCONF::MakeParamAction(config.showConfig), "\t\tshow config and exit");
+      .Add("show-config", SGCONF::MakeParamAction(config.showConfig), "\tshow config and exit");
 SGCONF::AppendXMLOptionBlock(commands, blocks);
+SGCONF::AppendServerInfoBlock(commands, blocks);
 SGCONF::AppendAdminsOptionBlock(commands, blocks);
 SGCONF::AppendTariffsOptionBlock(commands, blocks);
 SGCONF::AppendUsersOptionBlock(commands, blocks);