commit d8473d93ab2c3a6fe1f2d602458543fc5fcaf007 from: Stefan Sperling date: Thu Aug 11 13:14:56 2022 UTC convert gotwebd.conf "bind interface IP/iface" to "listen on IP/iface" ok kn, tracey commit - bf80b15220f51490025e916633cdd70816113604 commit + d8473d93ab2c3a6fe1f2d602458543fc5fcaf007 blob - ecce1768fa5b41babe7ad5226f47933e94aeaf64 blob + b533dd484371ccaf0bb075196a1d7009d4058083 --- gotwebd/parse.y +++ gotwebd/parse.y @@ -115,7 +115,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 @@ -381,7 +381,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)) { @@ -409,7 +409,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)) { @@ -470,16 +470,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 },