Merge branch 'develop-site2' of ssh://git.kaz.bzh:2202/KAZ/kaz-vagrant into develop-site2

This commit is contained in:
Francois Lesueur 2023-05-25 20:31:10 +02:00
commit c4065559fc
3 changed files with 4 additions and 2 deletions

View File

@ -20,6 +20,8 @@ mail IN CNAME kaz1
cloud IN CNAME kaz1 cloud IN CNAME kaz1
tableur IN CNAME kaz1 tableur IN CNAME kaz1
dashboard IN CNAME kaz1 dashboard IN CNAME kaz1
dashboard2 IN CNAME kaz2
sondage IN CNAME kaz1
webmail IN CNAME kaz1 webmail IN CNAME kaz1
garradin IN CNAME kaz1 garradin IN CNAME kaz1
wiki IN CNAME kaz1 wiki IN CNAME kaz1

View File

@ -76,7 +76,7 @@ echo "{
{ {
\"httpProxy\": \"http://$proxy:3142\", \"httpProxy\": \"http://$proxy:3142\",
\"httpsProxy\": \"http://$proxy:3142\", \"httpsProxy\": \"http://$proxy:3142\",
\"noProxy\": \"*.sns,127.0.0.1,localhost,127.0.0.0/8,100.64.0.0/10,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16\" \"noProxy\": \"*.sns,127.0.0.1,localhost,127.0.0.0/8,100.64.0.0/10,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16,agora\"
} }
} }
}" > /root/.docker/config.json }" > /root/.docker/config.json

View File

@ -76,7 +76,7 @@ echo "{
{ {
\"httpProxy\": \"http://$proxy:3142\", \"httpProxy\": \"http://$proxy:3142\",
\"httpsProxy\": \"http://$proxy:3142\", \"httpsProxy\": \"http://$proxy:3142\",
\"noProxy\": \"*.sns,127.0.0.1,localhost,127.0.0.0/8,100.64.0.0/10,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16\" \"noProxy\": \"*.sns,127.0.0.1,localhost,127.0.0.0/8,100.64.0.0/10,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16,agora\"
} }
} }
}" > /root/.docker/config.json }" > /root/.docker/config.json