diff --git a/files/snster-kaz/kaz/group.yml b/files/snster-kaz/kaz/group.yml index 4e5f748..ba9c345 100644 --- a/files/snster-kaz/kaz/group.yml +++ b/files/snster-kaz/kaz/group.yml @@ -1,8 +1,8 @@ version: 1 header: - name: Target AS - comment: AS of the Target organization + name: Kaz AS + comment: AS of the Kaz CHATONS hosts: router: diff --git a/files/snster-kaz/kaz/prod/kaz-config/container-proxy.list b/files/snster-kaz/kaz/prod/kaz-config/container-proxy.list index a4b7bf8..1e85afe 100644 --- a/files/snster-kaz/kaz/prod/kaz-config/container-proxy.list +++ b/files/snster-kaz/kaz/prod/kaz-config/container-proxy.list @@ -1,2 +1,2 @@ proxy -#traefic \ No newline at end of file +#traefik diff --git a/files/snster-kaz/kaz/prod/kaz-config/container-withoutMail.list b/files/snster-kaz/kaz/prod/kaz-config/container-withoutMail.list index 4b2cabc..1c4906e 100644 --- a/files/snster-kaz/kaz/prod/kaz-config/container-withoutMail.list +++ b/files/snster-kaz/kaz/prod/kaz-config/container-withoutMail.list @@ -3,7 +3,7 @@ jirafeau ethercalc collabora ethercalc -#etherpad +etherpad quotas web #vigilo diff --git a/files/snster-kaz/kaz/prod/provision.sh b/files/snster-kaz/kaz/prod/provision.sh index 061b6b3..62d398a 100644 --- a/files/snster-kaz/kaz/prod/provision.sh +++ b/files/snster-kaz/kaz/prod/provision.sh @@ -101,7 +101,7 @@ DEBIAN_FRONTEND=noninteractive apt-get clean # On installe Kaz ifconfig lo:0 100.80.0.2 ifconfig lo:1 100.80.1.2 -echo "100.80.0.2 smtp imap www mail cloud cloud.kaz.sns tableur tableur.kaz.sns webmail webmail.kaz.sns garradin garradin.kaz.sns wiki wiki.kaz.sns git git.kaz.sns office office.kaz.sns depot depot.kaz.sns ldap ldap.kaz.sns mdp mdp.kaz.sns koffre koffre.kaz.sns pad pad.kaz.sns agora agora.kaz.sns" >> /etc/hosts +echo "100.80.0.2 smtp imap www mail cloud cloud.kaz.sns tableur tableur.kaz.sns webmail webmail.kaz.sns garradin garradin.kaz.sns wiki wiki.kaz.sns git git.kaz.sns office office.kaz.sns depot depot.kaz.sns ldap ldap.kaz.sns mdp mdp.kaz.sns koffre koffre.kaz.sns pad pad.kaz.sns agora agora.kaz.sns dashboard dashboard.kaz.sns" >> /etc/hosts echo "100.80.1.2 listes listes.kaz.sns" >> /etc/hosts cp "${DIR}/kaz.sh" /root/kaz.sh cp "${DIR}/createUser.txt" /root/ diff --git a/files/snster-kaz/mica/group.yml b/files/snster-kaz/mica/group.yml index e06ad30..6cd39f0 100644 --- a/files/snster-kaz/mica/group.yml +++ b/files/snster-kaz/mica/group.yml @@ -11,8 +11,8 @@ hosts: interfaces: eth0: bridge: transit-a - ipv4: 100.64.1.140/24 - ipv6: 2001:db8:b001::140/48 + ipv4: 100.64.0.140/24 + ipv6: 2001:db8:b000::140/48 eth1: bridge: mica-lan ipv4: 100.82.0.1/16 diff --git a/files/snster-kaz/transit-a/group.yml b/files/snster-kaz/transit-a/group.yml index 83f2c11..01bf4da 100644 --- a/files/snster-kaz/transit-a/group.yml +++ b/files/snster-kaz/transit-a/group.yml @@ -20,8 +20,8 @@ hosts: - bgprouter: asn: 30 asdev: eth1 - neighbors4: 100.64.0.10 as 10;100.64.0.30 as 7;100.64.0.40 as 8; 100.64.0.20 as 6; 100.64.0.50 as 13; 100.64.0.110 as 20; 100.64.1.140 as 12 - neighbors6: 2001:db8:b000::10 as 10; 2001:db8:b000::30 as 7;2001:db8:b000::40 as 8; 2001:db8:b000::20 as 6; 2001:db8:b000::50 as 13; 2001:db8:b000::110 as 20; 2001:db8:b001::140 as 12 + neighbors4: 100.64.0.10 as 10;100.64.0.11 as 11;100.64.0.30 as 7;100.64.0.40 as 8; 100.64.0.20 as 6; 100.64.0.50 as 13; 100.64.0.110 as 20; 100.64.0.140 as 12 + neighbors6: 2001:db8:b000::10 as 10; 2001:db8:b000::11 as 11; 2001:db8:b000::30 as 7;2001:db8:b000::40 as 8; 2001:db8:b000::20 as 6; 2001:db8:b000::50 as 13; 2001:db8:b000::110 as 20; 2001:db8:b000::140 as 12 - resolv: ns: 100.100.100.100 domain: transit-a.sns