summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReyk Floeter <reyk@cvs.openbsd.org>2007-02-26 20:43:33 +0000
committerReyk Floeter <reyk@cvs.openbsd.org>2007-02-26 20:43:33 +0000
commit41f00086fb8d0157ab67db01f1c49827e7e10073 (patch)
tree354b792d97796ec467240ca8725cdeef4cde94cf
parentc5391d0ed8f8a70995a6a8a5499d6f4486cfeb68 (diff)
use a variable $ext_addr instead of the hard-coded 192.168.1.1. this
will make it easier for testing (just run hoststated -Dext_addr=X.X.X.X).
-rw-r--r--etc/hoststated.conf7
-rw-r--r--etc/relayd.conf7
2 files changed, 8 insertions, 6 deletions
diff --git a/etc/hoststated.conf b/etc/hoststated.conf
index e5bfc8d134b..bba797b77a5 100644
--- a/etc/hoststated.conf
+++ b/etc/hoststated.conf
@@ -1,7 +1,8 @@
-# $OpenBSD: hoststated.conf,v 1.5 2007/02/26 19:25:25 reyk Exp $
+# $OpenBSD: hoststated.conf,v 1.6 2007/02/26 20:43:32 reyk Exp $
#
# Macros
#
+ext_addr="192.168.1.1"
webhost1="10.0.0.1"
webhost2="10.0.0.2"
@@ -32,7 +33,7 @@ table fallback {
# Services will be mapped to a rdr rule.
#
service www {
- virtual host 192.168.1.1 port http interface trunk0
+ virtual host $ext_addr port http interface trunk0
# tag every packet that goes thru the rdr rule with HOSTSTATED
tag HOSTSTATED
@@ -59,7 +60,7 @@ protocol httpssl {
relay wwwssl {
# Run as a SSL accelerator
- listen on 192.168.1.1 port 443 ssl
+ listen on $ext_addr port 443 ssl
protocol httpssl
# Forward to hosts in the webhosts table using a src/dst hash
diff --git a/etc/relayd.conf b/etc/relayd.conf
index f0a20e8096d..ff12fe36cb2 100644
--- a/etc/relayd.conf
+++ b/etc/relayd.conf
@@ -1,7 +1,8 @@
-# $OpenBSD: relayd.conf,v 1.5 2007/02/26 19:25:25 reyk Exp $
+# $OpenBSD: relayd.conf,v 1.6 2007/02/26 20:43:32 reyk Exp $
#
# Macros
#
+ext_addr="192.168.1.1"
webhost1="10.0.0.1"
webhost2="10.0.0.2"
@@ -32,7 +33,7 @@ table fallback {
# Services will be mapped to a rdr rule.
#
service www {
- virtual host 192.168.1.1 port http interface trunk0
+ virtual host $ext_addr port http interface trunk0
# tag every packet that goes thru the rdr rule with HOSTSTATED
tag HOSTSTATED
@@ -59,7 +60,7 @@ protocol httpssl {
relay wwwssl {
# Run as a SSL accelerator
- listen on 192.168.1.1 port 443 ssl
+ listen on $ext_addr port 443 ssl
protocol httpssl
# Forward to hosts in the webhosts table using a src/dst hash