Parcourir la source

doc: Remove French comments

The duality with en/fr comments produce strange things and heavier
reading. The official bird documentation is only avail. in English
so we suppose that English isn't a problem for our readers :-)
Sebastien Badia il y a 10 ans
Parent
commit
5218a4307c

+ 0 - 58
README.fr.md

@@ -1,58 +0,0 @@
-
-GITOYEN : Configuration BIRD d'un routeur de bordure
-==========================================
-
-Ce dépot contient la configuration d'un routeur de bordure de Gitoyen. Il s'agit d'une configuration prenant en compte :
-
-  * La gestion des communautés ;
-  * La gestion de livraisons (membres, clients) ;
-  * La gestion des peering/transits.
-
-N'hésitez pas à vous en inspirer.
-
-## Nous contacter
-
-Pour toutes questions / commentaires / discussions, vous pouvez nous contacter via :
-
-* mél : contact (AT) gitoyen.net ;
-* irc : gitoyen / geeknode ;
-* www : http://www.gitoyen.net.
-
-## Principe de fonctionnement
-
-* Les routes importées depuis une session bgp sont étiquetées par une communauté indiquant sa provenance.
-* Les routes exportées vers une session bgp sont filtrées sur la base des communautés en fonction de leur provenance.
-  * Exemples : 
-    * Les routes exportées vers une session avec un transitaire comprennent uniquement les routes étiquetées membres/clients/interne.
-    * Les routes exportées vers une session avec un membre comprennent toutes les routes de l'Internet.
-   
-## Organisation
-
-    $ cat etc/local/bird/bird.conf 
-    # Gitoyen contact (AT) gitoyen.net
-    #
-    # vim: set ts=4:sw=4
-
-    log syslog all;
-
-    # Parametres specifiques au routeur
-    include "/etc/local/bird/common/local.conf";
-
-    # Filtres/Fonctions communs a tous les protocoles
-    include "/etc/local/bird/bird/filters.conf";
-
-    # Gestion des protocoles lies au noyau
-    include "/etc/local/bird/common/kernel.conf";
-
-    # Routes statiques
-    include "/etc/local/bird/bird/static.conf";
-
-    # OSPF (Backbone)
-    include "/etc/local/bird/common/ospf.conf";
-
-    # Filtres/Fonctions pour BGP
-    include "/etc/local/bird/common/bgp-filters.conf";
-
-    # BGP (Livraisons, Transit, Peering)
-    include "/etc/local/bird/bird/bgp.conf";
-

README.en.md → README.md


+ 7 - 14
etc/local/bird/bird.conf

@@ -4,30 +4,23 @@
 
 log syslog all;
 
-# en: specific router parameters
-# fr: Parametres specifiques au routeur
+# specific router parameters
 include "/etc/local/bird/common/local.conf";
 
-# en: filters/functions common to all protocols
-# fr: filtres/fonctions communs a tous les protocoles
+# filters/functions common to all protocols
 include "/etc/local/bird/bird/filters.conf";
 
-# en: kernel protocol management
-# fr: Gestion des protocoles lies au noyau
+# kernel protocol management
 include "/etc/local/bird/common/kernel.conf";
 
-# en: static routes
-# fr: routes statiques
+# static routes
 include "/etc/local/bird/bird/static.conf";
 
-# en: OSPF (Backbone)
-# fr: OSPF (Backbone)
+# OSPF (Backbone)
 include "/etc/local/bird/common/ospf.conf";
 
-# en: filters/functions for BGP
-# fr: filtres/fonctions pour BGP
+# filters/functions for BGP
 include "/etc/local/bird/common/bgp-filters.conf";
 
-# en: BGP (Livraisons, Transit, Peering)
-# fr: BGP (Deliveries, Transit, Peering)
+# BGP (Livraisons, Transit, Peering)
 include "/etc/local/bird/bird/bgp.conf";

+ 5 - 11
etc/local/bird/bird/bgp.conf

@@ -27,8 +27,7 @@ protocol bgp core_zoulou from ibgp {
 
 
 #
-# en: Member: FDN
-# fr: Membre: FDN
+# Member: FDN
 #
 template bgp tpl_fdn {
 	local as 20766;
@@ -44,9 +43,8 @@ protocol bgp membre_fdn2 from tpl_fdn {
 	neighbor 80.67.168.214 as 65055;
 }
 
-
-# en: Member: Grenode
-# fr: Membre: Grenode
+#
+# Member: Grenode
 #
 template bgp tpl_grenode {
 	local as 20766;
@@ -61,8 +59,7 @@ protocol bgp member_grenode1 from tpl_grenode {
 
 
 #
-# en: Member: Lautrenet
-# fr: Membre: Lautrenet
+# Member: Lautrenet
 #
 template bgp tpl_lautrenet {
 	local as 20766;
@@ -80,8 +77,7 @@ protocol bgp membre_lautrenet2 from tpl_lautrenet {
 
 
 #
-# en: Member: Tetaneutral
-# fr: Membre: Tetaneutral
+# Member: Tetaneutral
 #
 template bgp tpl_tetaneutral {
 	local as 20766;
@@ -127,7 +123,6 @@ template bgp tpl_franceix_peers {
 	import limit 10000;
 }
 
-
 protocol bgp franceix_rs1 from tpl_franceix_rs {
 	neighbor 37.49.236.250 as 51706;
 	description "FranceIX Route Server 1";
@@ -173,4 +168,3 @@ protocol bgp franceix_13335 from tpl_franceix_peers {
 	neighbor 37.49.237.49 as 13335;
 	description "FranceIX /  Cloudfare";
 }
-

+ 7 - 15
etc/local/bird/bird/filters.conf

@@ -2,14 +2,11 @@
 #
 # vim: set ts=4:sw=4
 
-# en: Filter limiting accepted prefixes on members and customers BGP sessions
-# fr: Filtre pour limiter les prefix accepte sur les sessions BGP des membres et clients
+# Filter limiting accepted prefixes on members and customers BGP sessions
 #
-# en: NB: the '+' sign is necessary for backhole management
-# fr: NB : le '+' est necessaire pour le systeme de blackhole
+# NB: the '+' sign is necessary for backhole management
 #
-# TODO: en: Content of this function could be filled semi-automatically using the IRR
-#       fr: Le contenu de cette function pourrait etre alimente semi-automatiquement via les IRR
+# TODO: Content of this function could be filled semi-automatically using the IRR
 function is_net_from_member(int AS)
 prefix set as_prefixes;
 {
@@ -70,27 +67,22 @@ function is_martians() {
   return net ~ [ 169.254.0.0/16+, 224.0.0.0/4+, 240.0.0.0/4+, 0.0.0.0/32{1,32}];
 }
 
-# en: Routes within Gitoyen
-# fr: Routes dans Gitoyen
+# Routes within Gitoyen
 function is_within_gitoyen() {
   return net ~ [ 80.67.160.0/19{20,32} ];
 }
 
-# en: Gitoyen's routes
-# fr: Routes de Gitoyen
+# Gitoyen's routes
 function is_gitoyen() {
   return net ~ [ 80.67.160.0/19 ];
 }
 
-# en: Routes corresponding to carp prefixes routes
-# fr: Routes correspondant aux routes dans les prefix carp
+# Routes corresponding to carp prefixes routes
 function is_within_carp() {
   return net ~ [ 80.67.174.0/24{25,32}, 80.67.163.0/26{27,32}, 80.67.163.128/26{27,32}, 80.67.168.224/29{30,32} ];
 }
 
-# en: Default route
-# fr: Route par default
+# Default route
 function is_default() {
   return net ~ [ 0.0.0.0/0 ];
 }
-

+ 7 - 15
etc/local/bird/bird/static.conf

@@ -3,12 +3,10 @@
 # vim: set ts=4:sw=4
 
 #
-# en: Routes to announce
-# fr: Routes a annoncer
+# Routes to announce
 #
 
-# en: Route to export through BGP. These are the routes of Gitoyen's prefixes allocated by RIPE
-# fr: Route a exporter en BGP. Ce sont les routes des prefix alloue a Gitoyen par le RIPE
+# Route to export through BGP. These are the routes of Gitoyen's prefixes allocated by RIPE
 protocol static static_export_routes {
         route 80.67.160.0/19 reject;
         import filter {
@@ -17,26 +15,20 @@ protocol static static_export_routes {
         };
 }
 
-# en: Default route announcement. It's only used by delivery which needs only the default route (see import/export)
-# fr: Annonce de la route par defaut. Celle-ci est uniquement utilisee
-#     les livraisons qui n'ont besoin que de la route par defaut. (voir les import/export)
+# Default route announcement. It's only used by delivery which needs only the default route (see import/export)
 protocol static static_noexport_routes {
         route 0.0.0.0/0 reject;
 }
 
-# en: Globenet's routes announce
-# fr: Annonce des routes de Globenet
+# Globenet's routes announce
 protocol static static_globenet_routes {
         route 80.67.172.0/24 via 80.67.168.229;
         route 80.67.164.0/26 via 80.67.168.229;
 }
 
-## en: Blackhole routes announce.
-##     Likely unnecessary because blackholes routes are learnt directly from
-##     the kernel, ibgp and members
-## fr: Annonce des routes blackhole.
-##     A priori pas necessaire car les routes blackhole sont apprises directement
-##     depuis le noyau, l'ibgp et les membres
+## Blackhole routes announce.
+## Likely unnecessary because blackholes routes are learnt directly from
+## the kernel, ibgp and members
 #protocol static backhole_routes {
 #	import filter {
 # 		bgp_community.add((20766,9999));

+ 7 - 14
etc/local/bird/bird6.conf

@@ -4,30 +4,23 @@
 
 log syslog all;
 
-# en: specific router parameters
-# fr: parametres specifiques au routeur
+# specific router parameters
 include "/etc/local/bird/common/local.conf";
 
-# en: filters/functions common to all protocols
-# fr: filtres/fonctions communs a tous les protocoles
+# filters/functions common to all protocols
 include "/etc/local/bird/bird6/filters.conf";
 
-# en: kernel protocol management
-# fr: gestion des protocoles lies au noyau
+# kernel protocol management
 include "/etc/local/bird/common/kernel.conf";
 
-# en: static routes
-# fr: routes statiques
+# static routes
 include "/etc/local/bird/bird6/static.conf";
 
-# en: OSPF (Backbone)
-# fr: OSPF (Backbone)
+# OSPF (Backbone)
 include "/etc/local/bird/common/ospf.conf";
 
-# en: filters/functions for BGP
-# fr: filtres/fonctions pour BGP
+# filters/functions for BGP
 include "/etc/local/bird/common/bgp-filters.conf";
 
-# en: BGP (Livraisons, Transit, Peering)
-# fr: BGP (Deliveries, Transit, Peering)
+# BGP (Livraisons, Transit, Peering)
 include "/etc/local/bird/bird6/bgp.conf";

+ 4 - 6
etc/local/bird/bird6/bgp.conf

@@ -27,7 +27,7 @@ protocol bgp core_zoulou from ibgp {
 
 
 #
-# Membre: FDN
+# Member: FDN
 #
 template bgp tpl_fdn {
 	local as 20766;
@@ -45,7 +45,7 @@ protocol bgp member_fdn2 from tpl_fdn {
 
 
 #
-# Membre: Grenode
+# Member: Grenode
 #
 template bgp tpl_grenode {
 	local as 20766;
@@ -60,7 +60,7 @@ protocol bgp member_grenode1 from tpl_grenode {
 
 
 #
-# Membre: L'Autre.net
+# Member: L'Autre.net
 #
 template bgp tpl_lautrenet {
 	local as 20766;
@@ -78,9 +78,8 @@ protocol bgp member_lautrenet2 from tpl_lautrenet {
 
 
 #
-# Membre: Tetaneutral
+# Member: Tetaneutral
 #
-
 template bgp tpl_tetaneutral {
 	local as 20766;
 	description "Livraison Tetaneutral.net";
@@ -112,7 +111,6 @@ protocol bgp transit_absolight from tpl_absolight {
 #
 # Peering: FranceIX
 #
-
 template bgp tpl_franceix_rs {
 	local as 20766;
         import where bgp_import(51706,"peering",26000);

+ 8 - 16
etc/local/bird/bird6/filters.conf

@@ -2,14 +2,11 @@
 #
 # vim: set ts=4:sw=4
 
-# en: Filter limiting accepted prefixes on members and customers BGP sessions
-# fr: Filtre pour limiter les prefix accepte sur les sessions BGP des membres et clients
+# Filter limiting accepted prefixes on members and customers BGP sessions
 #
-# en: NB: the '+' sign is necessary for backhole management
-# fr: NB : le '+' est necessaire pour le systeme de blackhole
+# NB: the '+' sign is necessary for backhole management
 #
-# TODO: en: Content of this function could be filled semi-automatically using the IRR
-#       fr: Le contenu de cette function pourrait etre alimente semi-automatiquement via les IRR
+# TODO: Content of this function could be filled semi-automatically using the IRR
 function is_net_from_member(int AS)
 prefix set as_prefixes;
 {
@@ -41,8 +38,7 @@ prefix set as_prefixes;
     return (net ~ as_prefixes);
 }
 
-# en: prefix equivalent ot rfc1918
-# fr: prefix equivalent au rfc1918
+# prefix equivalent ot rfc1918
 function is_rfc1918() {
   return net ~ [ FC00::/7+ ];
 }
@@ -52,26 +48,22 @@ function is_martians() {
   return net ~ [ FE80::/10+, fec0::/10+, FF00::/8+, ::/96+, 0100::/64+, 2001:10::/28+, 2001:0db8::/32+, fc00::/7+ ];
 }
 
-# en: Routes within Gitoyen
-# fr: Routes dans Gitoyen
+# Routes within Gitoyen
 function is_within_gitoyen() {
   return net ~ [ 2001:910::/32{33,128} ];
 }
 
-# en: Gitoyen's routes
-# fr: Routes de Gitoyen
+# Gitoyen's routes
 function is_gitoyen() {
   return net ~ [ 2001:910::/32 ];
 }
 
-# en: Routes corresponding to carp prefixes routes
-# fr: Routes correspondant aux routes dans les prefix carp
+# Routes corresponding to carp prefixes routes
 function is_within_carp() {
   return net ~ [ 2001:910:0:4::/64{65,128}, 2001:910:0:40::/64{65,128}, 2001:910:0:41::/64{65,128}, 2001:910:0:117::/64{65,128} ];
 }
 
-# en: Default route
-# fr: Route par default
+# Default route
 function is_default() {
   return (net ~ [ ::/0 ]);
 }

+ 6 - 13
etc/local/bird/bird6/static.conf

@@ -3,12 +3,10 @@
 # vim: set ts=4:sw=4
 
 #
-# en: Routes to announce
-# fr: Routes a annoncer
+# Routes to announce
 #
 
-# en: Route to export through BGP. These are the routes of Gitoyen's prefixes allocated by RIPE
-# fr: Route a exporter en BGP. Ce sont les routes des prefix alloue a Gitoyen par le RIPE
+# Route to export through BGP. These are the routes of Gitoyen's prefixes allocated by RIPE
 protocol static static_export_routes {
         route 2001:910::/32 reject;
         import filter {
@@ -17,19 +15,14 @@ protocol static static_export_routes {
         };
 }
 
-# en: Default route announcement. It's only used by delivery which needs only the default route (see import/export)
-# fr: Annonce de la route par defaut. Celle-ci est uniquement utilisee
-#     les livraisons qui n'ont besoin que de la route par defaut. (voir les import/export)
+# Default route announcement. It's only used by delivery which needs only the default route (see import/export)
 protocol static static_noexport_routes {
         route ::0/0 reject;
 }
 
-## en: Blackhole routes announce.
-##     Likely unnecessary because blackholes routes are learnt directly from
-##     the kernel, ibgp and members
-## fr: Annonce des routes blackhole.
-##     A priori pas necessaire car les routes blackhole sont apprises directement
-##     depuis le noyau, l'ibgp et les membres
+## Blackhole routes announce.
+## Likely unnecessary because blackholes routes are learnt directly from
+## the kernel, ibgp and members
 #protocol static backhole_routes {
 #       import filter {
 #               bgp_community.add((20766,9999));

+ 35 - 73
etc/local/bird/common/bgp-filters.conf

@@ -2,33 +2,19 @@
 #
 # vim: set ts=4:sw=4
 
-# en: bgp import function
-# en: this function import routes according to the import_type and the AS number. It also add tag the route with
-# en: the  given community
-# en:
-# en: Parameters
-# en:    AS           / AS number of the peer
-# en:    import_type  / the import type. Could be
-# en:                       transit:  this is a transit session
-# en:                       peering:  this is a peering session on an Internet Exchange Point (including route
-# en:                                 servers)
-# en:                       member:   this is a member of Gitoyen.
-# en:                       core:     this is a core session. It's the backbone iBGP sessions.
-# en:    community    / community number to associate to the route. If equal 0, there is no association.
+# bgp import function
+# this function import routes according to the import_type and the AS number. It also add tag the route with
+# the  given community
 #
-# fr: fonction d'import bgp
-# fr: cette fonction importe les routes selon import_type et selon le numero d'AS. Elle associe aussi un numero
-# fr: de communaute aux routes importees.
-# fr:
-# fr: Parametres
-# fr:    AS           / Numero d'AS du pair
-# fr:    import_type  / Le type d'import. Peut-etre:
-# fr:                       transit:  c'est une session de transit
-# fr:                       peering:  c'est une session de pair sur une point d'echange Internet (incluant les
-# fr:                                 serveurs de routes)
-# fr:                       member:   c'est une session avec un membre de Gitoyen.
-# fr:                       core:     c'est une session de coeur de reseau. Ce sont les sessions iBGP.
-# fr:    community    / le numero de communaute a associer aux routes. Si egal a 0, il n'y a pas d'association.
+# Parameters
+#    AS           / AS number of the peer
+#    import_type  / the import type. Could be
+#                       transit:  this is a transit session
+#                       peering:  this is a peering session on an Internet Exchange Point (including route
+#                                 servers)
+#                       member:   this is a member of Gitoyen.
+#                       core:     this is a core session. It's the backbone iBGP sessions.
+#    community    / community number to associate to the route. If equal 0, there is no association.
 #
 function bgp_import( int AS; string import_type; int community)
 {
@@ -42,64 +28,47 @@ function bgp_import( int AS; string import_type; int community)
         return false;
     }
 
-    # en: weird routes are not accepted
-    # fr: les routes bizarres ne sont pas acceptees
+    # weird routes are not accepted
     if is_default() || is_martians() || is_rfc1918() then return false;
 
-    # en: gitoyen's routes are not accepted
-    # fr: les routes de gitoyen ne sont pas acceptes
+    # gitoyen's routes are not accepted
     if is_gitoyen() then return false;
 
-    # en: in case of peering or transit, the routes within the gitoyen's network are not accepted.
-    # fr: dans le cas du peering & transit, les routes incluses dans le reseau de Gitoyen ne sont pas acceptees.
+    # in case of peering or transit, the routes within the gitoyen's network are not accepted.
     if import_type = "peering" && import_type = "transit" then {
         if is_within_gitoyen() then return false;
     }
 
-    # en: in case of member, only the routes defined for the member AS are accepted.
-    # fr: dans le cas d'un membre, seulement les routes definies pour l'AS du membre sont acceptees.
+    # in case of member, only the routes defined for the member AS are accepted.
     if import_type = "member" && ! is_net_from_member(AS) then return false;
 
-    # en: bgp local preference by default
-    # fr: preference locales de bgp par defaut
+    # bgp local preference by default
     if import_type = "transit"         then bgp_local_pref=100;
     if import_type = "peering"         then bgp_local_pref=1000;
     if import_type = "member"          then bgp_local_pref=1500;
 
-    # en: communities cleaning (only communities handled by Gitoyen are kept)
-    # fr: nettoyage des communautes (seulement les communautes gerees par Gitoyen sont gardees)
+    # communities cleaning (only communities handled by Gitoyen are kept)
     if import_type = "transit" then  bgp_community.delete( [(20766,*)] );
     if import_type = "peering" then  bgp_community.delete( [(20766,*)] );
     if import_type = "membre"  then  bgp_community.filter( [(20766,9999)] );
 
-    # en: adding the community to identify the source of the route
+    # adding the community to identify the source of the route
     # fr: ajout de la communaute pour identifier la source de la route
     if import_type != "core" && community > 0 then bgp_community.add((20766,community));
 
     return true;
 }
 
-# en: bgp export function
-# en: this function export routes according to the export_type and the AS number.
-# en:
-# en: Parameters
-# en:    AS           / AS number of the peer
-# en:    export_type  / the export type. Could be
-# en:                       full:     The full-view are exported
-# en:                       default:  The default route are exported
-# en:                       members:  The routes of the members are exported
-# en:                       core:     All the routes learned by bgp are exported
+# bgp export function
+# this function export routes according to the export_type and the AS number.
 #
-# fr: fonction d'export bgp
-# fr: this function export routes according to the export_type and the AS number.
-# fr:
-# fr: Parametres
-# fr:    AS           / AS numero d'AS du pair
-# fr:    export_type  / Type d'export. Cela peut etre :
-# fr:                       full:     La vue complete d'internet est exportee.
-# fr:                       default:  La route par defaut est exportee.
-# fr:                       members:  Les routes des membres sont exportees.
-# fr:                       core:     Toutes les routes apprises par bgp sont exportees.
+# Parameters
+#    AS           / AS number of the peer
+#    export_type  / the export type. Could be
+#                       full:     The full-view are exported
+#                       default:  The default route are exported
+#                       members:  The routes of the members are exported
+#                       core:     All the routes learned by bgp are exported
 #
 function bgp_export(int AS; string export_type)
 pair set members_export_communities;
@@ -111,16 +80,13 @@ pair set full_export_communities;
         return false;
     }
 
-    # en: weird routes are not accepted
-    # fr: les routes bizarres ne sont pas acceptees
+    # weird routes are not accepted
     if is_martians() || is_rfc1918() then return false;
 
-    # en: the default route are not exported except if asked.
-    # fr: la route par defaut n'est pas exportee sauf si demandee.
+    # the default route are not exported except if asked.
     if is_default() && ! (export_type="default") then return false;
 
-    # en: for the routes of the members, only the routes having one of these communities are exported 
-    # fr: pour les routes des membres, seulement les routes ayant au moins une de ces communautes sont exportees
+    # for the routes of the members, only the routes having one of these communities are exported
     members_export_communities = [
             (20766,1),
             (20766,9999),
@@ -131,8 +97,7 @@ pair set full_export_communities;
         && filter(bgp_community, members_export_communities).len = 0 then return false;
 
     # Filtrage des exports de la full view
-    # en: for the full-view, only the routes having one of these communities are exported 
-    # fr: pour la vue complete, seulement les routes ayant au moins une de ces communautes sont exportees
+    # for the full-view, only the routes having one of these communities are exported
     full_export_communities = [
             (20766,1),
             (20766,9999),
@@ -145,18 +110,15 @@ pair set full_export_communities;
     if export_type = "full"
         && filter(bgp_community, full_export_communities).len = 0 then return false;
 
-    # en: for the default, only the default route are exported.
-    # fr: pour default, seul la route par defaut est exportee.
+    # for the default, only the default route are exported.
     if export_type = "default"
         && ! is_default() then return false;
 
-    # en: for the core export type, only the routes learned by BGP are exported
-    # fr: pour l'export de type core, seulement les routes apprises par BGP sont exportees
+    # for the core export type, only the routes learned by BGP are exported
     if export_type = "core"
         && source != RTS_BGP then return false;
 
-    # en: blackhole management
-    # fr: gestion du blackhole
+    # blackhole management
     case AS {
         # Absolight
         29608:  if filter(bgp_community, [ (20766,9999) ]).len > 0 then bgp_community.add ((29608,65001));

+ 2 - 4
etc/local/bird/common/kernel.conf

@@ -10,8 +10,7 @@ protocol device {
         scan time 5;
 }
 
-# en: Filters for the kernerl procotol allowing to handle the blackhole
-# fr: Filtres pour le protocole kernel permettant la gestion du blackhole
+# Filters for the kernerl procotol allowing to handle the blackhole
 filter import_kernel {
 
         if dest = RTD_BLACKHOLE && is_within_gitoyen() then {
@@ -36,8 +35,7 @@ filter export_kernel {
         accept;
 }
 
-# en: Import/export of the routes from/to the kernel
-# fr: Import/export des routes depuis/vers le noyau
+# Import/export of the routes from/to the kernel
 protocol kernel {
         learn;
         scan time 60;

+ 3 - 6
etc/local/bird/common/local.conf

@@ -2,15 +2,12 @@
 #
 # vim: set ts=4:sw=4
 
-# en: Preferred source for OSPF/BGP (not usable on *BSD)
-# fr: source preferee pour OSPF/BGP (pas utilisable en *BSD)
+# Preferred source for OSPF/BGP (not usable on *BSD)
 define my_krt_prefsrc = 80.67.168.5;
 
-# en: router id
-# fr: Identifiant du routeur
+# router id
 router id 80.67.168.5;
 
-# en: AS number
-# fr: numero d'AS
+# AS number
 define my_as = 20766;
 

+ 3 - 6
etc/local/bird/common/ospf.conf

@@ -2,8 +2,7 @@
 #
 # vim: set ts=4:sw=4
 
-# en: OSPF export only the routes not from BGP and wihtin the gitoyen network 
-# fr: seul les routes, non BGP et dans le reseau de Gitoyen sont exportees
+# OSPF export only the routes not from BGP and wihtin the gitoyen network 
 filter export_OSPF {
 
         if source = RTS_BGP then reject;
@@ -19,8 +18,7 @@ filter export_OSPF {
 	reject;
 }
 
-# en: en OSPF import only the routes within the gitoyen network
-# fr: seul les routes dans le reseau de Gitoyen sont acceptees
+# en OSPF import only the routes within the gitoyen network
 filter import_OSPF {
         if is_rfc1918()  then reject;
         if is_martians() then reject;
@@ -34,8 +32,7 @@ filter import_OSPF {
 }
 
 
-# en: OSPF for the gitoyen backbone
-# fr: OSPF pour le backbone de Gitoyen
+# OSPF for the gitoyen backbone
 protocol ospf {
         import filter import_OSPF;
         export filter export_OSPF;