change ikev1/xauth scenarios to modern notation

This commit is contained in:
Andreas Steffen
2012-06-18 21:22:01 +02:00
parent 6d3702ed61
commit 7a892288fb
17 changed files with 51 additions and 24 deletions
@@ -8,15 +8,17 @@ conn %default
rekeymargin=3m
keyingtries=1
keyexchange=ikev1
authby=xauthpsk
conn home
left=PH_IP_CAROL
leftid=PH_IP_CAROL
leftsourceip=%config
leftauth=psk
leftauth2=xauth
leftfirewall=yes
right=PH_IP_MOON
[email protected]
rightsubnet=10.1.0.0/16
rightauth=psk
xauth_identity=carol
auto=add
@@ -8,15 +8,17 @@ conn %default
rekeymargin=3m
keyingtries=1
keyexchange=ikev1
authby=xauthpsk
conn home
left=PH_IP_DAVE
leftid=PH_IP_DAVE
leftsourceip=%config
leftauth=psk
leftauth2=xauth
leftfirewall=yes
right=PH_IP_MOON
[email protected]
rightsubnet=10.1.0.0/16
rightauth=psk
xauth_identity=dave
auto=add
@@ -8,14 +8,15 @@ conn %default
rekeymargin=3m
keyingtries=1
keyexchange=ikev1
authby=xauthpsk
xauth=server
conn rw
left=PH_IP_MOON
[email protected]
leftsubnet=10.1.0.0/16
leftauth=psk
leftfirewall=yes
right=%any
rightsourceip=10.3.0.0/24
rightauth=psk
rightauth2=xauth
auto=add
@@ -8,15 +8,17 @@ conn %default
rekeymargin=3m
keyingtries=1
keyexchange=ikev1
authby=xauthrsasig
conn home
left=PH_IP_CAROL
leftcert=carolCert.pem
[email protected]
leftauth=rsasig
leftauth2=xauth
leftfirewall=yes
right=PH_IP_MOON
rightsubnet=10.1.0.0/16
[email protected]
rightauth=rsasig
xauth_identity=carol
auto=add
@@ -8,15 +8,17 @@ conn %default
rekeymargin=3m
keyingtries=1
keyexchange=ikev1
authby=xauthrsasig
conn home
left=PH_IP_DAVE
leftcert=daveCert.pem
[email protected]
leftauth=rsasig
leftauth2=xauth
leftfirewall=yes
right=PH_IP_MOON
rightsubnet=10.1.0.0/16
[email protected]
rightauth=rsasig
xauth_identity=dave
auto=add
@@ -8,14 +8,15 @@ conn %default
rekeymargin=3m
keyingtries=1
keyexchange=ikev1
authby=xauthrsasig
xauth=server
conn rw
left=PH_IP_MOON
leftcert=moonCert.pem
[email protected]
leftsubnet=10.1.0.0/16
leftauth=rsasig
leftfirewall=yes
right=%any
rightauth=rsasig
rightauth2=xauth
auto=add
@@ -8,13 +8,15 @@ conn %default
rekeymargin=3m
keyingtries=1
keyexchange=ikev1
authby=xauthpsk
conn home
left=PH_IP_CAROL
[email protected]
leftauth=psk
leftauth2=xauth
leftfirewall=yes
right=PH_IP_MOON
rightsubnet=10.1.0.0/16
[email protected]
rightauth=psk
auto=add
@@ -8,13 +8,15 @@ conn %default
rekeymargin=3m
keyingtries=1
keyexchange=ikev1
authby=xauthpsk
conn home
left=PH_IP_DAVE
[email protected]
leftfirewall=yes
leftauth=psk
leftauth2=xauth
right=PH_IP_MOON
rightsubnet=10.1.0.0/16
[email protected]
rightauth=psk
auto=add
@@ -8,13 +8,14 @@ conn %default
rekeymargin=3m
keyingtries=1
keyexchange=ikev1
authby=xauthpsk
xauth=server
conn rw
left=PH_IP_MOON
[email protected]
leftsubnet=10.1.0.0/16
leftauth=psk
leftfirewall=yes
right=%any
rightauth=psk
rightauth2=xauth
auto=add
@@ -8,15 +8,17 @@ conn %default
rekeymargin=3m
keyingtries=1
keyexchange=ikev1
authby=xauthrsasig
conn home
left=PH_IP_CAROL
leftsourceip=%config
leftcert=carolCert.pem
[email protected]
leftauth=rsasig
leftauth2=xauth
leftfirewall=yes
right=PH_IP_MOON
rightsubnet=10.1.0.0/16
[email protected]
rightauth=rsasig
auto=add
@@ -8,15 +8,17 @@ conn %default
rekeymargin=3m
keyingtries=1
keyexchange=ikev1
authby=xauthrsasig
conn home
left=PH_IP_DAVE
leftsourceip=%config
leftcert=daveCert.pem
[email protected]
leftauth=rsasig
leftauth2=xauth
leftfirewall=yes
right=PH_IP_MOON
rightsubnet=10.1.0.0/16
[email protected]
rightauth=rsasig
auto=add
@@ -8,14 +8,15 @@ conn %default
rekeymargin=3m
keyingtries=1
keyexchange=ikev1
authby=xauthrsasig
xauth=server
left=PH_IP_MOON
leftcert=moonCert.pem
[email protected]
leftsubnet=10.1.0.0/16
leftauth=rsasig
leftfirewall=yes
right=%any
rightauth=rsasig
rightauth2=xauth
auto=add
conn rw-carol
@@ -25,4 +26,3 @@ conn rw-carol
conn rw-dave
[email protected]
rightsourceip=PH_IP_DAVE1
@@ -8,14 +8,16 @@ conn %default
rekeymargin=3m
keyingtries=1
keyexchange=ikev1
authby=xauthrsasig
conn home
left=PH_IP_CAROL
leftcert=carolCert.pem
[email protected]
leftauth=rsasig
leftauth2=xauth
leftfirewall=yes
right=PH_IP_MOON
rightsubnet=10.1.0.0/16
[email protected]
rightauth=rsasig
auto=add
@@ -8,14 +8,15 @@ conn %default
rekeymargin=3m
keyingtries=1
keyexchange=ikev1
authby=xauthrsasig
xauth=server
conn rw
left=PH_IP_MOON
leftsubnet=10.1.0.0/16
[email protected]
leftcert=moonCert.pem
leftauth=rsasig
leftfirewall=yes
right=%any
rightauth=rsasig
rightauth2=xauth
auto=add
@@ -8,14 +8,16 @@ conn %default
rekeymargin=3m
keyingtries=1
keyexchange=ikev1
authby=xauthrsasig
conn home
left=PH_IP_CAROL
leftcert=carolCert.pem
[email protected]
leftauth=rsasig
leftauth2=xauth
leftfirewall=yes
right=PH_IP_MOON
rightsubnet=10.1.0.0/16
[email protected]
rightauth=rsasig
auto=add
@@ -8,14 +8,16 @@ conn %default
rekeymargin=3m
keyingtries=1
keyexchange=ikev1
authby=xauthrsasig
conn home
left=PH_IP_DAVE
leftcert=daveCert.pem
[email protected]
leftauth=rsasig
leftauth2=xauth
leftfirewall=yes
right=PH_IP_MOON
rightsubnet=10.1.0.0/16
[email protected]
rightauth=rsasig
auto=add
@@ -8,14 +8,15 @@ conn %default
rekeymargin=3m
keyingtries=1
keyexchange=ikev1
authby=xauthrsasig
xauth=server
conn rw
left=PH_IP_MOON
leftcert=moonCert.pem
[email protected]
leftsubnet=10.1.0.0/16
leftauth=rsasig
leftfirewall=yes
right=%any
rightauth=rsasig
rightauth2=xauth
auto=add