From 04b4a53ae4b022f4eeba82217fae4fea40f6ef88 Mon Sep 17 00:00:00 2001
From: sump pump <admin@example.com>
Date: Thu, 21 May 2020 18:53:19 +0000
Subject: [PATCH] Update bird/bird.conf.tmpl,
 tinc/lixonet/hosts/inwwv_nurd_lixo, tinc/lixonet/hosts/manva_nurd_lixo files

---
 bird/bird.conf.tmpl                           | 42 +++++++++----------
 .../hosts/{glaz_nurd_lixo => inwwv_nurd_lixo} |  0
 .../{phxaz_nurd_lixo => manva_nurd_lixo}      |  0
 3 files changed, 21 insertions(+), 21 deletions(-)
 rename tinc/lixonet/hosts/{glaz_nurd_lixo => inwwv_nurd_lixo} (100%)
 rename tinc/lixonet/hosts/{phxaz_nurd_lixo => manva_nurd_lixo} (100%)

diff --git a/bird/bird.conf.tmpl b/bird/bird.conf.tmpl
index 0d24c49..e2439b4 100644
--- a/bird/bird.conf.tmpl
+++ b/bird/bird.conf.tmpl
@@ -21,32 +21,32 @@ roa4 table r4; # ROA RPKI
 
 # RPKI
 # See: https://brooks.sh/2019/11/11/validating-bgp-routes-with-rpki-in-bird/
-protocol rpki {
-    roa4 { table r4; };
+#protocol rpki {
+#    roa4 { table r4; };
 
-    {{ range files "bird/rpki/hosts" }} # {{.}}
-    {{ file (print "bird/rpki/hosts/" .) }}
-    {{ end }}
+#    {{ range files "bird/rpki/hosts" }} # {{.}}
+#    {{ file (print "bird/rpki/hosts/" .) }}
+#    {{ end }}
 
-    # Time period in seconds between a failed query the next attempt
-    retry keep ${bgp_rpki_retry:-90};
+#    # Time period in seconds between a failed query the next attempt
+#   retry keep ${bgp_rpki_retry:-90};
 
-    # Tells how long to wait before attempting to poll the cache
-    refresh keep ${bgp_rpki_refresh:-900};
+#    # Tells how long to wait before attempting to poll the cache
+#    refresh keep ${bgp_rpki_refresh:-900};
 
-    # How long to keep any records locally cached before they are deleted
-    # The "refresh" interval will control how often records are refreshed
-    # and not considered expired.
-    expire keep ${bgp_rpki_expire:-172800};
+#    # How long to keep any records locally cached before they are deleted
+#    # The "refresh" interval will control how often records are refreshed
+#    # and not considered expired.
+#    expire keep ${bgp_rpki_expire:-172800};
 
-    # Enable SSH transport, disable TCP transport (insecure)
-    port 22;
-    transport ssh {
-        remote public key "${bgp_rpki_known_hosts:-/etc/bird/rpki/known_hosts}";
-        user "lixonet";
-        #bird private key "</path/to/id_rsa>";
-    };
-}
+#    # Enable SSH transport, disable TCP transport (insecure)
+#    port 22;
+#    transport ssh {
+#        remote public key "${bgp_rpki_known_hosts:-/etc/bird/rpki/known_hosts}";
+#        user "lixonet";
+#        #bird private key "</path/to/id_rsa>";
+#    };
+#}
 
 # Filters
 # Define a series of filters for Lixonet routing policies:
diff --git a/tinc/lixonet/hosts/glaz_nurd_lixo b/tinc/lixonet/hosts/inwwv_nurd_lixo
similarity index 100%
rename from tinc/lixonet/hosts/glaz_nurd_lixo
rename to tinc/lixonet/hosts/inwwv_nurd_lixo
diff --git a/tinc/lixonet/hosts/phxaz_nurd_lixo b/tinc/lixonet/hosts/manva_nurd_lixo
similarity index 100%
rename from tinc/lixonet/hosts/phxaz_nurd_lixo
rename to tinc/lixonet/hosts/manva_nurd_lixo