diff options
| author | EuAndreh <eu@euandre.org> | 2024-08-19 07:24:03 -0300 |
|---|---|---|
| committer | EuAndreh <eu@euandre.org> | 2024-08-19 07:24:03 -0300 |
| commit | 33ce357c3712b80faf45bee4c057250f1dc6d364 (patch) | |
| tree | 8e5bad70ac8b59bf99461bfee03678461b1e1bad | |
| parent | system.scm: Get (pkg:with-services-from-args ...) from upstream packages repo... (diff) | |
| download | asami-33ce357c3712b80faf45bee4c057250f1dc6d364.tar.gz asami-33ce357c3712b80faf45bee4c057250f1dc6d364.tar.xz | |
system.scm: Get q:knot-zones-configuration from upstream packages repository
| -rw-r--r-- | src/guix/system.scm | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/guix/system.scm b/src/guix/system.scm index 673f70c..c45a848 100644 --- a/src/guix/system.scm +++ b/src/guix/system.scm @@ -4,26 +4,24 @@ ((xyz euandreh heredoc) #:prefix heredoc:) ((org euandre packages) #:prefix pkg:) ((org euandre queue) #:prefix q:) - (gnu) - (guix records)) -(use-package-modules - version-control) + (gnu)) +(use-package-modules) (use-service-modules certbot cgit + dns mail networking security shepherd - ssh - web) + ssh) (heredoc:enable-syntax) (define (path s) ;; src/guix/system.scm + ../../../ = ./ - (string-append (dirname (dirname (dirname (current-filename)))) "/" s)) + (pkg:str (dirname (dirname (dirname (current-filename)))) "/" s)) (define +users+ `(("andre" "EuAndreh" ("wheel") ,(path "src/keys/SSH/andre.pub.txt")))) @@ -35,17 +33,16 @@ ((packages) #:prefix packages:)) -(define file - (compose pkg:slurp path)) - +(define +ipv4+ "216.238.73.1") +(define +ipv6+ "2001:19f0:b400:1582:5400:04ff:fea9:370e") (define +tld+ ((compose string-trim-right pkg:slurp path) "src/config/tld.txt")) -(define +cert.pem+ (string-append "/etc/letsencrypt/live/" +tld+ "/cert.pem")) -(define +privkey.pem+ (string-append "/etc/letsencrypt/live/" +tld+ "/privkey.pem")) +(define +cert.pem+ (pkg:str "/etc/letsencrypt/live/" +tld+ "/cert.pem")) +(define +privkey.pem+ (pkg:str "/etc/letsencrypt/live/" +tld+ "/privkey.pem")) @@ -104,6 +101,7 @@ (service untls-service-type (pkg:untls-configuration (package packages:untls))) (service pkg:wscat-service-type (pkg:wscat-configuration (package packages:wscat))) (service pkg:papod-service-type (pkg:papod-configuration (package packages:papod))) + (service knot-service-type (q:knot-zones-configuration +tld+ +ipv4+ +ipv6+)) (service openssh-service-type (q:openssh-default-configuration (pkg:users->keys +users+))) (service certbot-service-type (q:tld-certbot-configuration +tld+)) (service cgit-service-type q:cgit-pre-configuration) |