From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 297311FF137 for ; Tue, 03 Feb 2026 17:02:41 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 620CF244E2; Tue, 3 Feb 2026 17:02:58 +0100 (CET) From: Gabriel Goller To: pve-devel@lists.proxmox.com Subject: [PATCH proxmox-ve-rs 7/9] frr: support custom frr configuration lines Date: Tue, 3 Feb 2026 17:01:14 +0100 Message-ID: <20260203160246.353351-8-g.goller@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260203160246.353351-1-g.goller@proxmox.com> References: <20260203160246.353351-1-g.goller@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1770134496707 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.003 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: URANEBFA6CN3NOZX74AU6ERHL7UKAOWX X-Message-ID-Hash: URANEBFA6CN3NOZX74AU6ERHL7UKAOWX X-MailFrom: g.goller@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: When merging the frr.conf.local with the frr.conf, some lines cannot be merged and we need to add custom frr config lines to the rust configuration. Add the vec of lines and just dump them into the template. Co-authored-by: Stefan Hanreich Signed-off-by: Gabriel Goller --- proxmox-frr-templates/templates/frr.conf.jinja | 3 +++ proxmox-frr/src/ser/mod.rs | 3 +++ 2 files changed, 6 insertions(+) diff --git a/proxmox-frr-templates/templates/frr.conf.jinja b/proxmox-frr-templates/templates/frr.conf.jinja index c8495b417990..6d60ad2a4c4c 100644 --- a/proxmox-frr-templates/templates/frr.conf.jinja +++ b/proxmox-frr-templates/templates/frr.conf.jinja @@ -4,3 +4,6 @@ {% include "access_lists.jinja" %} {% include "route_maps.jinja" %} {% include "protocol_routemaps.jinja" %} +{% for line in custom_frr_config %} +{{ line }} +{% endfor %} diff --git a/proxmox-frr/src/ser/mod.rs b/proxmox-frr/src/ser/mod.rs index 9aaee74d7af0..3baa0a318fb0 100644 --- a/proxmox-frr/src/ser/mod.rs +++ b/proxmox-frr/src/ser/mod.rs @@ -185,6 +185,9 @@ pub struct FrrConfig { #[builder(default)] #[serde(default)] pub access_lists: BTreeMap>, + #[builder(default)] + #[serde(default)] + pub custom_frr_config: Vec, } #[derive(Clone, Debug, PartialEq, Eq, Default, Serialize, Deserialize)] -- 2.47.3