Commit Diff

Commit:
c24a47af52b39b747392e71487cf59ca2ce4cdb8
From:
Stefan Sperling <stsp@stsp.name>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
Message:
convert gotwebd.conf "bind interface IP/iface" to "listen on IP/iface" ok kn, tracey
Actions:
Patch | Tree
commit - 56935ae74ff53a448ab002397a77471568b4ce20
commit + c24a47af52b39b747392e71487cf59ca2ce4cdb8
blob - eac39b8465707782b70f9dae8bcc409643b2dd57
blob + 545e6aba57b1fc2b355c42173b79f6085fc5132c
--- gotwebd/parse.y
+++ gotwebd/parse.y
@@ -114,7 +114,7 @@ typedef struct {
 
 %}
 
-%token	BIND INTERFACE WWW_PATH MAX_REPOS SITE_NAME SITE_OWNER SITE_LINK LOGO
+%token	LISTEN WWW_PATH MAX_REPOS SITE_NAME SITE_OWNER SITE_LINK LOGO
 %token	LOGO_URL SHOW_REPO_OWNER SHOW_REPO_AGE SHOW_REPO_DESCRIPTION
 %token	MAX_REPOS_DISPLAY REPOS_PATH MAX_COMMITS_DISPLAY ON ERROR
 %token	SHOW_SITE_OWNER SHOW_REPO_CLONEURL PORT PREFORK FCGI_SOCKET
@@ -380,7 +380,7 @@ serveropts2	: serveropts2 serveropts1 nl
 		| serveropts1 optnl
 		;
 
-socketopts1	: BIND INTERFACE STRING {
+socketopts1	: LISTEN ON STRING {
 			n = strlcpy(new_srv->fcgi_socket_bind, $3,
 			    sizeof(new_srv->fcgi_socket_bind));
 			if (n >= sizeof(new_srv->fcgi_socket_bind)) {
@@ -408,7 +408,7 @@ socketopts2	: socketopts2 socketopts1 nl
 		| socketopts1 optnl
 		;
 
-socketopts3	: BIND INTERFACE STRING {
+socketopts3	: LISTEN ON STRING {
 			n = strlcpy(gotwebd->fcgi_socket_bind, $3,
 			    sizeof(gotwebd->fcgi_socket_bind));
 			if (n >= sizeof(gotwebd->fcgi_socket_bind)) {
@@ -469,16 +469,16 @@ lookup(char *s)
 {
 	/* This has to be sorted always. */
 	static const struct keywords keywords[] = {
-		{ "bind",			BIND },
 		{ "chroot",			CHROOT },
 		{ "custom_css",			CUSTOM_CSS },
 		{ "fcgi_socket",		FCGI_SOCKET },
-		{ "interface",			INTERFACE },
+		{ "listen",			LISTEN },
 		{ "logo",			LOGO },
 		{ "logo_url"	,		LOGO_URL },
 		{ "max_commits_display",	MAX_COMMITS_DISPLAY },
 		{ "max_repos",			MAX_REPOS },
 		{ "max_repos_display",		MAX_REPOS_DISPLAY },
+		{ "on",				ON },
 		{ "port",			PORT },
 		{ "prefork",			PREFORK },
 		{ "repos_path",			REPOS_PATH },