#988 remove legacy configuration

Use og_server_cfg everywhere. Convert port to string to make it easy for the
dbi API since it expects a string. Remove legacy example configuration file.

1 files changed, 1 insertions, 15 deletions

diff --git a/src/cfg.c b/src/cfg.c
index 42da3a5..6ac2f2d 100644
--- a/src/cfg.c
+++ b/src/cfg.c
@@ -58,8 +58,7 @@ static int parse_json_db(struct og_server_cfg *cfg, json_t *element)
 			if (og_json_parse_string(value, &cfg->db.name) < 0)
 				return -1;
 		} else if (!strcmp(key, "port")) {
-			if (og_json_parse_uint(value, &cfg->db.port) < 0 ||
-			    cfg->db.port > UINT16_MAX)
+			if (og_json_parse_string(value, &cfg->db.port) < 0)
 				return -1;
 		} else {
 			syslog(LOG_ERR, "unknown key `%s' in db\n", key);
@@ -188,16 +187,3 @@ int parse_json_config(const char *filename, struct og_server_cfg *cfg)
 
 	return ret;
 }
-
-void from_json_to_legacy(struct og_server_cfg *cfg)
-{
-	snprintf(servidoradm, sizeof(servidoradm), "%s", cfg->rest.ip);
-	snprintf(puerto, sizeof(puerto), "%s", cfg->rest.port);
-	snprintf(usuario, sizeof(usuario), "%s", cfg->db.user);
-	snprintf(pasguor, sizeof(pasguor), "%s", cfg->db.pass);
-	snprintf(datasource, sizeof(datasource), "%s", cfg->db.ip);
-	snprintf(catalog, sizeof(catalog), "%s", cfg->db.name);
-	snprintf(interface, sizeof(interface), "%s", cfg->wol.interface);
-	snprintf(auth_token, sizeof(auth_token), "%s", cfg->rest.api_token);
-	snprintf(db_port, sizeof(db_port), "%u", cfg->db.port);
-}