Commit Diff

Commit:
a0037b737b86335c1550c8e88771ba4c9eed36fc
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
make gotwebd start up without a config file ok tracey
Actions:
Patch | Tree
commit - f8c2e76ae39f8ef7f3fdb22bb583cb5cd7ad8a98
commit + a0037b737b86335c1550c8e88771ba4c9eed36fc
blob - e624bc6b2182b136d6389e4baad9c214e8c5c4fd
blob + ecce1768fa5b41babe7ad5226f47933e94aeaf64
--- gotwebd/parse.y
+++ gotwebd/parse.y
@@ -815,20 +815,30 @@ closefile(struct file *xfile)
 	free(xfile);
 }
 
+static void
+add_default_server(void)
+{
+	new_srv = conf_new_server(D_SITENAME);
+	log_debug("%s: adding default server %s", __func__, D_SITENAME);
+}
+
 int
 parse_config(const char *filename, struct gotwebd *env)
 {
 	struct sym *sym, *next;
 
-	file = newfile(filename, 0);
-	if (file == NULL)
-		/* just return, as we don't require a conf file */
-		return (0);
-
 	if (config_init(env) == -1)
 		fatalx("failed to initialize configuration");
 
 	gotwebd = env;
+
+	file = newfile(filename, 0);
+	if (file == NULL) {
+		add_default_server();
+		sockets_parse_sockets(env);
+		/* just return, as we don't require a conf file */
+		return (0);
+	}
 
 	yyparse();
 	errors = file->errors;
@@ -851,10 +861,8 @@ parse_config(const char *filename, struct gotwebd *env
 		return (-1);
 
 	/* just add default server if no config specified */
-	if (gotwebd->server_cnt == 0) {
-		new_srv = conf_new_server(D_SITENAME);
-		log_debug("%s: adding default server %s", __func__, D_SITENAME);
-	}
+	if (gotwebd->server_cnt == 0)
+		add_default_server();
 
 	/* setup our listening sockets */
 	sockets_parse_sockets(env);