ajout schema dmz

modif routes ipsec.conf x509
Merge branch 'master' of https://gitea.lyc-lecastel.fr/gadmin/gsb2021
2021-01-28 17:46:09 +01:00 · 2021-01-28 17:08:58 +01:00 · 2021-01-28 15:37:16 +01:00 · 2021-01-28 15:37:13 +01:00
5 changed files with 5 additions and 5 deletions
--- a/doc/pics/e4-dmz-tl.dia
+++ b/doc/pics/e4-dmz-tl.dia
--- a/doc/pics/e4-dmz-tl.png
+++ b/doc/pics/e4-dmz-tl.png
--- a/roles/fog/defaults/main.yml
+++ b/roles/fog/defaults/main.yml
@@ -1,2 +1,2 @@
-depl_url: "http://s-adm.gsb.adm/gsbstore/"
+depl_url: "http://s-adm.gsb.adm/gsbstore"
 depl_fog: "fogproject-1.5.9.tar.gz"
--- a/roles/x509-l/files/ipsec.conf
+++ b/roles/x509-l/files/ipsec.conf
@@ -7,7 +7,7 @@ conn tunnel #
        left=192.168.0.52
        leftsubnet=172.16.128.0/24
        right=192.168.0.51
-        rightsubnet=192.168.0.0/16, 172.16.0.0/24
+        rightsubnet=192.168.1.0/24, 192.168.200.0/24, 172.16.0.0/24
        ike=aes256-sha2_256-modp1024!
        esp=aes256-sha2_256!
        keyingtries=0
@@ -22,4 +22,4 @@ conn tunnel #
        type=tunnel
 	leftcert=r-vp2Cert.pem
        leftid="C=CH, O=GSB, CN=r-vp2"
-        rightid="C=CH, O=GSB, CN=r-vp1"
+        rightid="C=CH, O=GSB, CN=r-vp1"
--- a/roles/x509-r/files/ipsec.conf
+++ b/roles/x509-r/files/ipsec.conf
@@ -5,7 +5,7 @@ config setup
 conn %default
 conn tunnel #
        left=192.168.0.51
-        leftsubnet=192.168.0.0/16, 172.16.0.0/24
+        leftsubnet=192.168.1.0/24, 192.168.200.0/24, 172.16.0.0/24
        right=192.168.0.52
        rightsubnet=172.16.128.0/24
        ike=aes256-sha2_256-modp1024!
@@ -22,4 +22,4 @@ conn tunnel #
        type=tunnel
 	leftcert=r-vp1Cert.pem
        leftid="C=CH, O=GSB, CN=r-vp1"
-        rightid="C=CH, O=GSB, CN=r-vp2"
+        rightid="C=CH, O=GSB, CN=r-vp2"
Author	SHA1	Message	Date
Thomas Lerallu	6c090e61f8	ajout schema dmz	2021-01-28 17:46:09 +01:00
Theo Vallet	1c036df5c4	modif routes ipsec.conf x509	2021-01-28 17:08:58 +01:00
root	a9b757dafa	Merge branch 'master' of https://gitea.lyc-lecastel.fr/gadmin/gsb2021	2021-01-28 15:37:16 +01:00
root	bb5521f0dc	ajout variable fog	2021-01-28 15:37:13 +01:00
`@@ -1,2 +1,2 @@`
	`depl_url: "http://s-adm.gsb.adm/gsbstore/"`	`depl_url: "http://s-adm.gsb.adm/gsbstore"`
	`depl_fog: "fogproject-1.5.9.tar.gz"`	`depl_fog: "fogproject-1.5.9.tar.gz"`