diff options
| author | Pierre-Yves Ritschard <pyr@cvs.openbsd.org> | 2007-02-26 13:03:31 +0000 |
|---|---|---|
| committer | Pierre-Yves Ritschard <pyr@cvs.openbsd.org> | 2007-02-26 13:03:31 +0000 |
| commit | f4b985259c0511c54c31e98650e7ec3af4ad6275 (patch) | |
| tree | 56cb947c040e667ee2dd0f35f927974fcbcdbd41 /usr.sbin/hoststated | |
| parent | 8a4859246c291b899368592841f48cbf00333f98 (diff) | |
Change the ``virtual ip'' directive to ``virtual host''.
You will need to update your configuration files accordingly.
"just do it", reyk@
Diffstat (limited to 'usr.sbin/hoststated')
| -rw-r--r-- | usr.sbin/hoststated/hoststated.conf.5 | 8 | ||||
| -rw-r--r-- | usr.sbin/hoststated/parse.y | 7 |
2 files changed, 7 insertions, 8 deletions
diff --git a/usr.sbin/hoststated/hoststated.conf.5 b/usr.sbin/hoststated/hoststated.conf.5 index 58720f97327..252ee5bf573 100644 --- a/usr.sbin/hoststated/hoststated.conf.5 +++ b/usr.sbin/hoststated/hoststated.conf.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: hoststated.conf.5,v 1.28 2007/02/26 11:59:48 reyk Exp $ +.\" $OpenBSD: hoststated.conf.5,v 1.29 2007/02/26 13:03:30 pyr Exp $ .\" .\" Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org> .\" @@ -284,7 +284,7 @@ Automatically tag packets passing through the .Xr pf 4 rdr rule with the name supplied. This allows simpler filter rules. -.It Ic virtual ip Ar address Ic port Ar port +.It Ic virtual host Ar address Ic port Ar port Specify an .Ar address and a @@ -629,8 +629,8 @@ table sorryhost { } service www { - virtual ip www.example.com port 8080 interface trunk0 - virtual ip www6.example.com port 80 interface trunk0 + virtual host www.example.com port 8080 interface trunk0 + virtual host www6.example.com port 80 interface trunk0 tag HOSTSTATED table phphosts diff --git a/usr.sbin/hoststated/parse.y b/usr.sbin/hoststated/parse.y index a14e6bb9a5a..4450e8c1c08 100644 --- a/usr.sbin/hoststated/parse.y +++ b/usr.sbin/hoststated/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.27 2007/02/24 00:22:32 reyk Exp $ */ +/* $OpenBSD: parse.y,v 1.28 2007/02/26 13:03:30 pyr Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org> @@ -106,7 +106,7 @@ typedef struct { %token SERVICE TABLE BACKUP HOST REAL %token CHECK HTTP HTTPS TCP ICMP EXTERNAL %token TIMEOUT CODE DIGEST PORT TAG INTERFACE -%token VIRTUAL IP INTERVAL DISABLE STICKYADDR BACKLOG +%token VIRTUAL INTERVAL DISABLE STICKYADDR BACKLOG %token SEND EXPECT NOTHING USE SSL LOADBALANCE ROUNDROBIN CIPHERS %token RELAY LISTEN ON FORWARD TO NAT LOOKUP PREFORK NO MARK MARKED %token PROTO SESSION CACHE APPEND CHANGE REMOVE FROM FILTER HASH @@ -346,7 +346,7 @@ serviceoptsl : TABLE STRING { free($3); } } - | VIRTUAL IP STRING port interface { + | VIRTUAL HOST STRING port interface { if (host($3, &service->virts, SRV_MAX_VIRTS, $4, $5) <= 0) { yyerror("invalid virtual ip: %s", $3); @@ -1065,7 +1065,6 @@ lookup(char *s) { "icmp", ICMP }, { "interface", INTERFACE }, { "interval", INTERVAL }, - { "ip", IP }, { "listen", LISTEN }, { "loadbalance", LOADBALANCE }, { "log", LOG }, |