change ikev1/xauth scenarios to modern notation
This commit is contained in:
parent
6d3702ed61
commit
7a892288fb
|
@ -8,15 +8,17 @@ conn %default
|
||||||
rekeymargin=3m
|
rekeymargin=3m
|
||||||
keyingtries=1
|
keyingtries=1
|
||||||
keyexchange=ikev1
|
keyexchange=ikev1
|
||||||
authby=xauthpsk
|
|
||||||
|
|
||||||
conn home
|
conn home
|
||||||
left=PH_IP_CAROL
|
left=PH_IP_CAROL
|
||||||
leftid=PH_IP_CAROL
|
leftid=PH_IP_CAROL
|
||||||
leftsourceip=%config
|
leftsourceip=%config
|
||||||
|
leftauth=psk
|
||||||
|
leftauth2=xauth
|
||||||
leftfirewall=yes
|
leftfirewall=yes
|
||||||
right=PH_IP_MOON
|
right=PH_IP_MOON
|
||||||
rightid=@moon.strongswan.org
|
rightid=@moon.strongswan.org
|
||||||
rightsubnet=10.1.0.0/16
|
rightsubnet=10.1.0.0/16
|
||||||
|
rightauth=psk
|
||||||
xauth_identity=carol
|
xauth_identity=carol
|
||||||
auto=add
|
auto=add
|
||||||
|
|
|
@ -8,15 +8,17 @@ conn %default
|
||||||
rekeymargin=3m
|
rekeymargin=3m
|
||||||
keyingtries=1
|
keyingtries=1
|
||||||
keyexchange=ikev1
|
keyexchange=ikev1
|
||||||
authby=xauthpsk
|
|
||||||
|
|
||||||
conn home
|
conn home
|
||||||
left=PH_IP_DAVE
|
left=PH_IP_DAVE
|
||||||
leftid=PH_IP_DAVE
|
leftid=PH_IP_DAVE
|
||||||
leftsourceip=%config
|
leftsourceip=%config
|
||||||
|
leftauth=psk
|
||||||
|
leftauth2=xauth
|
||||||
leftfirewall=yes
|
leftfirewall=yes
|
||||||
right=PH_IP_MOON
|
right=PH_IP_MOON
|
||||||
rightid=@moon.strongswan.org
|
rightid=@moon.strongswan.org
|
||||||
rightsubnet=10.1.0.0/16
|
rightsubnet=10.1.0.0/16
|
||||||
|
rightauth=psk
|
||||||
xauth_identity=dave
|
xauth_identity=dave
|
||||||
auto=add
|
auto=add
|
||||||
|
|
|
@ -8,14 +8,15 @@ conn %default
|
||||||
rekeymargin=3m
|
rekeymargin=3m
|
||||||
keyingtries=1
|
keyingtries=1
|
||||||
keyexchange=ikev1
|
keyexchange=ikev1
|
||||||
authby=xauthpsk
|
|
||||||
xauth=server
|
|
||||||
|
|
||||||
conn rw
|
conn rw
|
||||||
left=PH_IP_MOON
|
left=PH_IP_MOON
|
||||||
leftid=@moon.strongswan.org
|
leftid=@moon.strongswan.org
|
||||||
leftsubnet=10.1.0.0/16
|
leftsubnet=10.1.0.0/16
|
||||||
|
leftauth=psk
|
||||||
leftfirewall=yes
|
leftfirewall=yes
|
||||||
right=%any
|
right=%any
|
||||||
rightsourceip=10.3.0.0/24
|
rightsourceip=10.3.0.0/24
|
||||||
|
rightauth=psk
|
||||||
|
rightauth2=xauth
|
||||||
auto=add
|
auto=add
|
||||||
|
|
|
@ -8,15 +8,17 @@ conn %default
|
||||||
rekeymargin=3m
|
rekeymargin=3m
|
||||||
keyingtries=1
|
keyingtries=1
|
||||||
keyexchange=ikev1
|
keyexchange=ikev1
|
||||||
authby=xauthrsasig
|
|
||||||
|
|
||||||
conn home
|
conn home
|
||||||
left=PH_IP_CAROL
|
left=PH_IP_CAROL
|
||||||
leftcert=carolCert.pem
|
leftcert=carolCert.pem
|
||||||
leftid=carol@strongswan.org
|
leftid=carol@strongswan.org
|
||||||
|
leftauth=rsasig
|
||||||
|
leftauth2=xauth
|
||||||
leftfirewall=yes
|
leftfirewall=yes
|
||||||
right=PH_IP_MOON
|
right=PH_IP_MOON
|
||||||
rightsubnet=10.1.0.0/16
|
rightsubnet=10.1.0.0/16
|
||||||
rightid=@moon.strongswan.org
|
rightid=@moon.strongswan.org
|
||||||
|
rightauth=rsasig
|
||||||
xauth_identity=carol
|
xauth_identity=carol
|
||||||
auto=add
|
auto=add
|
||||||
|
|
|
@ -8,15 +8,17 @@ conn %default
|
||||||
rekeymargin=3m
|
rekeymargin=3m
|
||||||
keyingtries=1
|
keyingtries=1
|
||||||
keyexchange=ikev1
|
keyexchange=ikev1
|
||||||
authby=xauthrsasig
|
|
||||||
|
|
||||||
conn home
|
conn home
|
||||||
left=PH_IP_DAVE
|
left=PH_IP_DAVE
|
||||||
leftcert=daveCert.pem
|
leftcert=daveCert.pem
|
||||||
leftid=dave@strongswan.org
|
leftid=dave@strongswan.org
|
||||||
|
leftauth=rsasig
|
||||||
|
leftauth2=xauth
|
||||||
leftfirewall=yes
|
leftfirewall=yes
|
||||||
right=PH_IP_MOON
|
right=PH_IP_MOON
|
||||||
rightsubnet=10.1.0.0/16
|
rightsubnet=10.1.0.0/16
|
||||||
rightid=@moon.strongswan.org
|
rightid=@moon.strongswan.org
|
||||||
|
rightauth=rsasig
|
||||||
xauth_identity=dave
|
xauth_identity=dave
|
||||||
auto=add
|
auto=add
|
||||||
|
|
|
@ -8,14 +8,15 @@ conn %default
|
||||||
rekeymargin=3m
|
rekeymargin=3m
|
||||||
keyingtries=1
|
keyingtries=1
|
||||||
keyexchange=ikev1
|
keyexchange=ikev1
|
||||||
authby=xauthrsasig
|
|
||||||
xauth=server
|
|
||||||
|
|
||||||
conn rw
|
conn rw
|
||||||
left=PH_IP_MOON
|
left=PH_IP_MOON
|
||||||
leftcert=moonCert.pem
|
leftcert=moonCert.pem
|
||||||
leftid=@moon.strongswan.org
|
leftid=@moon.strongswan.org
|
||||||
leftsubnet=10.1.0.0/16
|
leftsubnet=10.1.0.0/16
|
||||||
|
leftauth=rsasig
|
||||||
leftfirewall=yes
|
leftfirewall=yes
|
||||||
right=%any
|
right=%any
|
||||||
|
rightauth=rsasig
|
||||||
|
rightauth2=xauth
|
||||||
auto=add
|
auto=add
|
||||||
|
|
|
@ -8,13 +8,15 @@ conn %default
|
||||||
rekeymargin=3m
|
rekeymargin=3m
|
||||||
keyingtries=1
|
keyingtries=1
|
||||||
keyexchange=ikev1
|
keyexchange=ikev1
|
||||||
authby=xauthpsk
|
|
||||||
|
|
||||||
conn home
|
conn home
|
||||||
left=PH_IP_CAROL
|
left=PH_IP_CAROL
|
||||||
leftid=carol@strongswan.org
|
leftid=carol@strongswan.org
|
||||||
|
leftauth=psk
|
||||||
|
leftauth2=xauth
|
||||||
leftfirewall=yes
|
leftfirewall=yes
|
||||||
right=PH_IP_MOON
|
right=PH_IP_MOON
|
||||||
rightsubnet=10.1.0.0/16
|
rightsubnet=10.1.0.0/16
|
||||||
rightid=@moon.strongswan.org
|
rightid=@moon.strongswan.org
|
||||||
|
rightauth=psk
|
||||||
auto=add
|
auto=add
|
||||||
|
|
|
@ -8,13 +8,15 @@ conn %default
|
||||||
rekeymargin=3m
|
rekeymargin=3m
|
||||||
keyingtries=1
|
keyingtries=1
|
||||||
keyexchange=ikev1
|
keyexchange=ikev1
|
||||||
authby=xauthpsk
|
|
||||||
|
|
||||||
conn home
|
conn home
|
||||||
left=PH_IP_DAVE
|
left=PH_IP_DAVE
|
||||||
leftid=dave@strongswan.org
|
leftid=dave@strongswan.org
|
||||||
leftfirewall=yes
|
leftfirewall=yes
|
||||||
|
leftauth=psk
|
||||||
|
leftauth2=xauth
|
||||||
right=PH_IP_MOON
|
right=PH_IP_MOON
|
||||||
rightsubnet=10.1.0.0/16
|
rightsubnet=10.1.0.0/16
|
||||||
rightid=@moon.strongswan.org
|
rightid=@moon.strongswan.org
|
||||||
|
rightauth=psk
|
||||||
auto=add
|
auto=add
|
||||||
|
|
|
@ -8,13 +8,14 @@ conn %default
|
||||||
rekeymargin=3m
|
rekeymargin=3m
|
||||||
keyingtries=1
|
keyingtries=1
|
||||||
keyexchange=ikev1
|
keyexchange=ikev1
|
||||||
authby=xauthpsk
|
|
||||||
xauth=server
|
|
||||||
|
|
||||||
conn rw
|
conn rw
|
||||||
left=PH_IP_MOON
|
left=PH_IP_MOON
|
||||||
leftid=@moon.strongswan.org
|
leftid=@moon.strongswan.org
|
||||||
leftsubnet=10.1.0.0/16
|
leftsubnet=10.1.0.0/16
|
||||||
|
leftauth=psk
|
||||||
leftfirewall=yes
|
leftfirewall=yes
|
||||||
right=%any
|
right=%any
|
||||||
|
rightauth=psk
|
||||||
|
rightauth2=xauth
|
||||||
auto=add
|
auto=add
|
||||||
|
|
|
@ -8,15 +8,17 @@ conn %default
|
||||||
rekeymargin=3m
|
rekeymargin=3m
|
||||||
keyingtries=1
|
keyingtries=1
|
||||||
keyexchange=ikev1
|
keyexchange=ikev1
|
||||||
authby=xauthrsasig
|
|
||||||
|
|
||||||
conn home
|
conn home
|
||||||
left=PH_IP_CAROL
|
left=PH_IP_CAROL
|
||||||
leftsourceip=%config
|
leftsourceip=%config
|
||||||
leftcert=carolCert.pem
|
leftcert=carolCert.pem
|
||||||
leftid=carol@strongswan.org
|
leftid=carol@strongswan.org
|
||||||
|
leftauth=rsasig
|
||||||
|
leftauth2=xauth
|
||||||
leftfirewall=yes
|
leftfirewall=yes
|
||||||
right=PH_IP_MOON
|
right=PH_IP_MOON
|
||||||
rightsubnet=10.1.0.0/16
|
rightsubnet=10.1.0.0/16
|
||||||
rightid=@moon.strongswan.org
|
rightid=@moon.strongswan.org
|
||||||
|
rightauth=rsasig
|
||||||
auto=add
|
auto=add
|
||||||
|
|
|
@ -8,15 +8,17 @@ conn %default
|
||||||
rekeymargin=3m
|
rekeymargin=3m
|
||||||
keyingtries=1
|
keyingtries=1
|
||||||
keyexchange=ikev1
|
keyexchange=ikev1
|
||||||
authby=xauthrsasig
|
|
||||||
|
|
||||||
conn home
|
conn home
|
||||||
left=PH_IP_DAVE
|
left=PH_IP_DAVE
|
||||||
leftsourceip=%config
|
leftsourceip=%config
|
||||||
leftcert=daveCert.pem
|
leftcert=daveCert.pem
|
||||||
leftid=dave@strongswan.org
|
leftid=dave@strongswan.org
|
||||||
|
leftauth=rsasig
|
||||||
|
leftauth2=xauth
|
||||||
leftfirewall=yes
|
leftfirewall=yes
|
||||||
right=PH_IP_MOON
|
right=PH_IP_MOON
|
||||||
rightsubnet=10.1.0.0/16
|
rightsubnet=10.1.0.0/16
|
||||||
rightid=@moon.strongswan.org
|
rightid=@moon.strongswan.org
|
||||||
|
rightauth=rsasig
|
||||||
auto=add
|
auto=add
|
||||||
|
|
|
@ -8,14 +8,15 @@ conn %default
|
||||||
rekeymargin=3m
|
rekeymargin=3m
|
||||||
keyingtries=1
|
keyingtries=1
|
||||||
keyexchange=ikev1
|
keyexchange=ikev1
|
||||||
authby=xauthrsasig
|
|
||||||
xauth=server
|
|
||||||
left=PH_IP_MOON
|
left=PH_IP_MOON
|
||||||
leftcert=moonCert.pem
|
leftcert=moonCert.pem
|
||||||
leftid=@moon.strongswan.org
|
leftid=@moon.strongswan.org
|
||||||
leftsubnet=10.1.0.0/16
|
leftsubnet=10.1.0.0/16
|
||||||
|
leftauth=rsasig
|
||||||
leftfirewall=yes
|
leftfirewall=yes
|
||||||
right=%any
|
right=%any
|
||||||
|
rightauth=rsasig
|
||||||
|
rightauth2=xauth
|
||||||
auto=add
|
auto=add
|
||||||
|
|
||||||
conn rw-carol
|
conn rw-carol
|
||||||
|
@ -25,4 +26,3 @@ conn rw-carol
|
||||||
conn rw-dave
|
conn rw-dave
|
||||||
rightid=dave@strongswan.org
|
rightid=dave@strongswan.org
|
||||||
rightsourceip=PH_IP_DAVE1
|
rightsourceip=PH_IP_DAVE1
|
||||||
|
|
||||||
|
|
|
@ -8,14 +8,16 @@ conn %default
|
||||||
rekeymargin=3m
|
rekeymargin=3m
|
||||||
keyingtries=1
|
keyingtries=1
|
||||||
keyexchange=ikev1
|
keyexchange=ikev1
|
||||||
authby=xauthrsasig
|
|
||||||
|
|
||||||
conn home
|
conn home
|
||||||
left=PH_IP_CAROL
|
left=PH_IP_CAROL
|
||||||
leftcert=carolCert.pem
|
leftcert=carolCert.pem
|
||||||
leftid=carol@strongswan.org
|
leftid=carol@strongswan.org
|
||||||
|
leftauth=rsasig
|
||||||
|
leftauth2=xauth
|
||||||
leftfirewall=yes
|
leftfirewall=yes
|
||||||
right=PH_IP_MOON
|
right=PH_IP_MOON
|
||||||
rightsubnet=10.1.0.0/16
|
rightsubnet=10.1.0.0/16
|
||||||
rightid=@moon.strongswan.org
|
rightid=@moon.strongswan.org
|
||||||
|
rightauth=rsasig
|
||||||
auto=add
|
auto=add
|
||||||
|
|
|
@ -8,14 +8,15 @@ conn %default
|
||||||
rekeymargin=3m
|
rekeymargin=3m
|
||||||
keyingtries=1
|
keyingtries=1
|
||||||
keyexchange=ikev1
|
keyexchange=ikev1
|
||||||
authby=xauthrsasig
|
|
||||||
xauth=server
|
|
||||||
|
|
||||||
conn rw
|
conn rw
|
||||||
left=PH_IP_MOON
|
left=PH_IP_MOON
|
||||||
leftsubnet=10.1.0.0/16
|
leftsubnet=10.1.0.0/16
|
||||||
leftid=@moon.strongswan.org
|
leftid=@moon.strongswan.org
|
||||||
leftcert=moonCert.pem
|
leftcert=moonCert.pem
|
||||||
|
leftauth=rsasig
|
||||||
leftfirewall=yes
|
leftfirewall=yes
|
||||||
right=%any
|
right=%any
|
||||||
|
rightauth=rsasig
|
||||||
|
rightauth2=xauth
|
||||||
auto=add
|
auto=add
|
||||||
|
|
|
@ -8,14 +8,16 @@ conn %default
|
||||||
rekeymargin=3m
|
rekeymargin=3m
|
||||||
keyingtries=1
|
keyingtries=1
|
||||||
keyexchange=ikev1
|
keyexchange=ikev1
|
||||||
authby=xauthrsasig
|
|
||||||
|
|
||||||
conn home
|
conn home
|
||||||
left=PH_IP_CAROL
|
left=PH_IP_CAROL
|
||||||
leftcert=carolCert.pem
|
leftcert=carolCert.pem
|
||||||
leftid=carol@strongswan.org
|
leftid=carol@strongswan.org
|
||||||
|
leftauth=rsasig
|
||||||
|
leftauth2=xauth
|
||||||
leftfirewall=yes
|
leftfirewall=yes
|
||||||
right=PH_IP_MOON
|
right=PH_IP_MOON
|
||||||
rightsubnet=10.1.0.0/16
|
rightsubnet=10.1.0.0/16
|
||||||
rightid=@moon.strongswan.org
|
rightid=@moon.strongswan.org
|
||||||
|
rightauth=rsasig
|
||||||
auto=add
|
auto=add
|
||||||
|
|
|
@ -8,14 +8,16 @@ conn %default
|
||||||
rekeymargin=3m
|
rekeymargin=3m
|
||||||
keyingtries=1
|
keyingtries=1
|
||||||
keyexchange=ikev1
|
keyexchange=ikev1
|
||||||
authby=xauthrsasig
|
|
||||||
|
|
||||||
conn home
|
conn home
|
||||||
left=PH_IP_DAVE
|
left=PH_IP_DAVE
|
||||||
leftcert=daveCert.pem
|
leftcert=daveCert.pem
|
||||||
leftid=dave@strongswan.org
|
leftid=dave@strongswan.org
|
||||||
|
leftauth=rsasig
|
||||||
|
leftauth2=xauth
|
||||||
leftfirewall=yes
|
leftfirewall=yes
|
||||||
right=PH_IP_MOON
|
right=PH_IP_MOON
|
||||||
rightsubnet=10.1.0.0/16
|
rightsubnet=10.1.0.0/16
|
||||||
rightid=@moon.strongswan.org
|
rightid=@moon.strongswan.org
|
||||||
|
rightauth=rsasig
|
||||||
auto=add
|
auto=add
|
||||||
|
|
|
@ -8,14 +8,15 @@ conn %default
|
||||||
rekeymargin=3m
|
rekeymargin=3m
|
||||||
keyingtries=1
|
keyingtries=1
|
||||||
keyexchange=ikev1
|
keyexchange=ikev1
|
||||||
authby=xauthrsasig
|
|
||||||
xauth=server
|
|
||||||
|
|
||||||
conn rw
|
conn rw
|
||||||
left=PH_IP_MOON
|
left=PH_IP_MOON
|
||||||
leftcert=moonCert.pem
|
leftcert=moonCert.pem
|
||||||
leftid=@moon.strongswan.org
|
leftid=@moon.strongswan.org
|
||||||
leftsubnet=10.1.0.0/16
|
leftsubnet=10.1.0.0/16
|
||||||
|
leftauth=rsasig
|
||||||
leftfirewall=yes
|
leftfirewall=yes
|
||||||
right=%any
|
right=%any
|
||||||
|
rightauth=rsasig
|
||||||
|
rightauth2=xauth
|
||||||
auto=add
|
auto=add
|
||||||
|
|
Loading…
Reference in New Issue