From 04a80ea994fcc5fec842df1b8943c30ab8801ab4 Mon Sep 17 00:00:00 2001 From: JEAN-FRANCOIS GUILLAUME Date: Wed, 30 Oct 2024 15:35:44 +0100 Subject: [PATCH 1/3] updating netbird service to be launched multiple time --- glicid/packages/vpn.scm | 4 ++-- glicid/services/vpn.scm | 24 ++++++++++++------------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/glicid/packages/vpn.scm b/glicid/packages/vpn.scm index d498cfb..b63a08b 100644 --- a/glicid/packages/vpn.scm +++ b/glicid/packages/vpn.scm @@ -1,4 +1,4 @@ -(define-module (glicid packages vpn) +(define-module (yamit packages vpn) #:use-module (guix) #:use-module (ice-9 match) #:use-module ((guix licenses) #:prefix license:) @@ -32,7 +32,7 @@ (build-system copy-build-system) (arguments `(#:install-plan `(("netbird" "/bin/")))) - (propagated-inputs (list openresolv iptables nftables ebtables)) + (propagated-inputs (list openresolv iptables nftables ebtables le-certs nss-certs)) (synopsis "NetBird combines a configuration-free peer-to-peer private network and a centralized access control system in a single platform, making it easy to create secure private networks for your organization or home. Connect. NetBird creates a WireGuard-based overlay network that automatically connects your machines over an encrypted tunnel, leaving behind the hassle of opening ports, complex firewall rules, VPN gateways, and so forth. Secure. NetBird enables secure remote access by applying granular access policies while allowing you to manage them intuitively from a single place. Works universally on any infrastructure.") diff --git a/glicid/services/vpn.scm b/glicid/services/vpn.scm index ab3a332..90de51f 100644 --- a/glicid/services/vpn.scm +++ b/glicid/services/vpn.scm @@ -38,11 +38,11 @@ (define-record-type* netbird-configuration make-netbird-configuration netbird-configuration? + (instance-name instance-name (default '(netbird))) (netbird netbird (default netbird-cli)) (config-file config-file (default "/etc/netbird/config.json")) (daemon-addr daemon-addr (default "unix:///var/run/netbird.sock")) - (log-file log-file (default "/var/log/netbird.log")) - ) + (log-file log-file (default "/var/log/netbird.log"))) (define %netbird-activation #~(begin @@ -51,27 +51,27 @@ (define netbird-shepherd-service (match-lambda - (($ netbird config-file daemon-addr log-file) + (($ instance-name netbird config-file daemon-addr log-file) (list (shepherd-service - (provision '(netbird)) + (provision instance-name) (documentation "Run netbird daemon.") - (requirement '(user-processes)) + (requirement '(user-processes networking)) (respawn? #t) (start #~(make-forkexec-constructor (list (string-append #$netbird "/bin/netbird") "service" "run" - "--config" - #$config-file + "--config" #$config-file "--log-level" "info" - "--daemon-addr" - #$daemon-addr - "--log-file" - "console") + "--daemon-addr" #$daemon-addr + "--log-file" "console") #:environment-variables (list - "PATH=/run/current-system/profile/bin:/run/current-system/profile/sbin:/run/current-system/profile/libexec") + "PATH=/run/current-system/profile/bin:/run/current-system/profile/sbin:/run/current-system/profile/libexec" + "CURL_CA_BUNDLE=/run/current-system/profile/etc/ssl/certs/ca-certificates.crt" + "SSL_CERT_FILE=/run/current-system/profile/etc/ssl/certs/ca-certificates.crt" + "SSL_CERT_DIR=/run/current-system/profile/etc/ssl/certs") #:log-file #$log-file )) (stop #~(make-kill-destructor))))))) From b35d290daea9754ee9bb9b5854ee32bf88848d11 Mon Sep 17 00:00:00 2001 From: JEAN-FRANCOIS GUILLAUME Date: Wed, 30 Oct 2024 15:37:04 +0100 Subject: [PATCH 2/3] updating netbird service to be launched multiple time --- glicid/packages/vpn.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/glicid/packages/vpn.scm b/glicid/packages/vpn.scm index b63a08b..de4ab89 100644 --- a/glicid/packages/vpn.scm +++ b/glicid/packages/vpn.scm @@ -1,4 +1,4 @@ -(define-module (yamit packages vpn) +(define-module (glicid packages vpn) #:use-module (guix) #:use-module (ice-9 match) #:use-module ((guix licenses) #:prefix license:) @@ -9,6 +9,7 @@ #:use-module (guix build-system copy) #:use-module (guix build-system go) #:use-module (nonguix build-system binary) + #:use-module (gnu packages certs) #:use-module (gnu packages dns) #:use-module (gnu packages gl) #:use-module (gnu packages golang) From edd4baede6033d8d053ebda90490f5e1220d08e6 Mon Sep 17 00:00:00 2001 From: JEAN-FRANCOIS GUILLAUME Date: Fri, 1 Nov 2024 20:50:44 +0100 Subject: [PATCH 3/3] updating netbird service to be launched multiple time --- glicid/packages/vpn.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/glicid/packages/vpn.scm b/glicid/packages/vpn.scm index de4ab89..d36a2b3 100644 --- a/glicid/packages/vpn.scm +++ b/glicid/packages/vpn.scm @@ -20,7 +20,7 @@ #:use-module (gnu packages xorg) ) -(define %netbird-version "0.30.3") +(define %netbird-version "0.31.0") (define-public netbird-cli (package @@ -29,7 +29,7 @@ (source (origin (method url-fetch) (uri (string-append "https://github.com/netbirdio/netbird/releases/download/v" version "/netbird_" version "_linux_amd64.tar.gz")) - (sha256 (base32 "0bdszkkl2y1r0jqljkkia3pppw8ymsyd2d83qdkvc0cvc3ycnsh8")))) + (sha256 (base32 "0mxy2xr5rjmvqp31ca953xxa49zz3k7jj9xmpxabjgj2d6k483w4")))) (build-system copy-build-system) (arguments `(#:install-plan `(("netbird" "/bin/")))) @@ -51,7 +51,7 @@ Secure. NetBird enables secure remote access by applying granular access policie (url "https://github.com/netbirdio/netbird") (commit (string-append "v" version)))) (file-name (git-file-name name version)) - (sha256 (base32 "19xyw6vxwag4w71zm998jjlv19cvrgwrzlpq0jrhbm8yf8jpjvs8")))) + (sha256 (base32 "0hgshjvy6499nfb98pga71c16f6gpnhc1m7h07nrvqlsb4hj4ykv")))) (build-system go-build-system) (native-inputs (list go-github-com-cenkalti-backoff-v4 go-github-com-ayufan-golang-kardianos-service @@ -99,7 +99,7 @@ Secure. NetBird enables secure remote access by applying granular access policie (source (origin (method url-fetch) (uri (string-append "https://github.com/netbirdio/netbird/releases/download/v" version "/netbird-ui-linux_" version "_linux_amd64.tar.gz")) - (sha256 (base32 "05zgibbjwgmffdxz9b4ikiw06rdpp20ccpxq87286m4vwl4ad907")))) + (sha256 (base32 "1nfh1i173q5cv654cqpg33f11i8rp0jcwqrq7ypd15mgvqm2d8p5")))) (build-system binary-build-system) (inputs (list libx11 libglvnd)) (arguments