aurore/ansible
aurore/ansible
11
2
Fork 0
Code Issues 1 Pull requests 13 Releases Wiki Activity

add ipv6_base_prefix variable

Browse source
This commit is contained in:
Yohaï-Eliel BERREBY 2020-08-01 14:31:49 +02:00
parent 468bb9abde
commit d54da8d2b9
2 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
group_vars/all/vars.yml
View file

@ -78,3 +78,9 @@ radius_pg_re2o_ro_password: "{{ vault_re2o_db_user_passwords.re2o_ro }}"
apartment_block_dhcp: "{{ apartment_block }}" apartment_block_dhcp: "{{ apartment_block }}"
# Careful, this is not byte-aligned, just nibble-aligned (RIPE gave us a /28).
# However, we ALWAYS keep the trailing 0 to have byte alignment.
ipv6_base_prefix: "2a09:6840"

18
roles/radvd/templates/radvd.conf.j2
View file

@ -14,7 +14,7 @@
# MaxRtrAdvInterval 30; # MaxRtrAdvInterval 30;
# #
# #
# prefix 2a09:6840:{{ subnet_ids.ap }}::/64 { # prefix {{ ipv6_base_prefix }}:{{ subnet_ids.ap }}::/64 {
# AdvRouterAddr on; # AdvRouterAddr on;
# }; # };
# #
@ -22,8 +22,8 @@
# DNSSL borne.auro.re {}; # DNSSL borne.auro.re {};
# #
# # Les DNS récursifs # # Les DNS récursifs
# RDNSS 2a09:6840:{{ subnet_ids.ap }}::{{ dns_host_suffix_main }} {}; # RDNSS {{ ipv6_base_prefix }}:{{ subnet_ids.ap }}::{{ dns_host_suffix_main }} {};
# RDNSS 2a09:6840:{{ subnet_ids.ap }}::{{ dns_host_suffix_backup }} {}; # RDNSS {{ ipv6_base_prefix }}:{{ subnet_ids.ap }}::{{ dns_host_suffix_backup }} {};
# }; # };
@ -36,14 +36,14 @@ interface ens20 {
AdvDefaultPreference high; AdvDefaultPreference high;
MaxRtrAdvInterval 30; MaxRtrAdvInterval 30;
prefix 2a09:6840:{{ subnet_ids.users_wired }}::/64 { prefix {{ ipv6_base_prefix }}:{{ subnet_ids.users_wired }}::/64 {
AdvRouterAddr on; AdvRouterAddr on;
}; };
DNSSL fil.{{ apartment_block_dhcp }}.auro.re {}; # TODO: fix this shitty workaround. DNSSL fil.{{ apartment_block_dhcp }}.auro.re {}; # TODO: fix this shitty workaround.
RDNSS 2a09:6840:{{ subnet_ids.users_wired }}::{{ dns_host_suffix_main }} {}; RDNSS {{ ipv6_base_prefix }}:{{ subnet_ids.users_wired }}::{{ dns_host_suffix_main }} {};
RDNSS 2a09:6840:{{ subnet_ids.users_wired }}::{{ dns_host_suffix_backup }} {}; RDNSS {{ ipv6_base_prefix }}:{{ subnet_ids.users_wired }}::{{ dns_host_suffix_backup }} {};
}; };
@ -56,14 +56,14 @@ interface ens21 {
AdvDefaultPreference high; AdvDefaultPreference high;
MaxRtrAdvInterval 30; MaxRtrAdvInterval 30;
prefix 2a09:6840:{{ subnet_ids.users_wifi }}::/64 { prefix {{ ipv6_base_prefix }}:{{ subnet_ids.users_wifi }}::/64 {
AdvRouterAddr on; AdvRouterAddr on;
}; };
DNSSL wifi.{{ apartment_block_dhcp }}.auro.re {}; # TODO: fix this shitty workaround. DNSSL wifi.{{ apartment_block_dhcp }}.auro.re {}; # TODO: fix this shitty workaround.
RDNSS 2a09:6840:{{ subnet_ids.users_wifi }}::{{ dns_host_suffix_main }} {}; RDNSS {{ ipv6_base_prefix }}:{{ subnet_ids.users_wifi }}::{{ dns_host_suffix_main }} {};
RDNSS 2a09:6840:{{ subnet_ids.users_wifi }}::{{ dns_host_suffix_backup }} {}; RDNSS {{ ipv6_base_prefix }}:{{ subnet_ids.users_wifi }}::{{ dns_host_suffix_backup }} {};
}; };