diff options
| -rw-r--r-- | src/guix/system.scm | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/src/guix/system.scm b/src/guix/system.scm index 8105e95..ef5a207 100644 --- a/src/guix/system.scm +++ b/src/guix/system.scm @@ -28,7 +28,10 @@ (pkg:str +working-dir+ "/" s)) (define +users+ - `(("andreh" "EuAndreh" ("wheel" "become-secrets-keeper") ,(path "src/keys/SSH/andreh.pub.txt")))) + `(("andreh" + "EuAndreh" + ("wheel" "become-secrets-keeper") + ,(path "src/keys/SSH/andreh.pub.txt")))) (define file (compose string-trim-right pkg:slurp path)) @@ -87,7 +90,11 @@ (q:openssh-default-configuration (append (pkg:users->keys +users+) - `(("pijul" ,(plain-file "pijul-andreh-id_rsa.pub" (pkg:slurp (path "src/keys/SSH/andreh.pub.txt")))))))) + `(("pijul" + ,(plain-file + "pijul-andreh-id_rsa.pub" + (pkg:slurp + (path "src/keys/SSH/andreh.pub.txt")))))))) (service certbot-service-type (q:tld-certbot-configuration +tld+)) (service nginx-service-type @@ -99,8 +106,10 @@ (listen '("[::]:443 ssl" "443 ssl")) (root "/srv/www") (index '()) - (ssl-certificate (pkg:fmt "/etc/letsencrypt/live/~a/fullchain.pem" +tld+)) - (ssl-certificate-key (pkg:fmt "/etc/letsencrypt/live/~a/privkey.pem" +tld+)) + (ssl-certificate + (pkg:fmt "/etc/letsencrypt/live/~a/fullchain.pem" +tld+)) + (ssl-certificate-key + (pkg:fmt "/etc/letsencrypt/live/~a/privkey.pem" +tld+)) (locations (list (nginx-location-configuration @@ -132,8 +141,8 @@ (uri "/gistatic/") (body (list - (list "include " nginx "/share/nginx/conf/fastcgi_params;") - (list "fastcgi_param SCRIPT_FILENAME /srv/www/bin/cgi.sh;") + (list + "include " nginx "/share/nginx/conf/fastcgi_params;") #"- fastcgi_param PATH /run/current-system/profile/bin; fastcgi_pass localhost:9000; @@ -148,7 +157,10 @@ (uri "/git/") (body (list - (list "fastcgi_param SCRIPT_FILENAME " cgit "/lib/cgit/cgit.cgi;") + (list + "fastcgi_param SCRIPT_FILENAME " + cgit + "/lib/cgit/cgit.cgi;") #"- fastcgi_param PATH /run/current-system/profile/bin; fastcgi_param PATH_INFO $uri; @@ -167,6 +179,7 @@ charset utf-8; autoindex on; add_header Strict-Transport-Security 'max-age=31536000; includeSubdomains' always; + types { text/html html; text/css css; |