Update nono

Julien LepillerTue Jan 23 19:23:18+0100 2024

25b690a

Update nono

systems/nono.scm

3333 
(use-modules (gnu packages mail))
3434 
(use-modules (gnu packages package-management))
3535 
(use-modules (gnu packages php))
36+
(use-modules (gnu packages tls))
3637 
(use-modules (gnu packages tor))
3738 
(use-modules (gnu packages web))
3839 
…
4344 
(use-modules (config certbot) (config dns) (config iptables)
4445 
             (config mail) (config os) (config static-web)
4546 
             (config web)
46-
             (packages gitile))
47+
             (packages gitile)
48+
	     (services gitile))
4749 
4850 
;; Copy from (gnu bootloader u-boot)
4951 
…
5153 
  (let ((base (make-u-boot-package "rock-pi-4-rk3399" "aarch64-linux-gnu")))
5254 
    (package
5355 
      (inherit base)
56+
      (source (origin
57+
		(inherit (package-source base))
58+
		(modules '((guix build utils)))
59+
		(snippet
60+
		  `(begin
61+
		     (substitute* "configs/rock-pi-4-rk3399_defconfig"
62+
		       (("CONFIG_SPL_FIT_SIGNATURE=y") ""))
63+
		     #;(substitute* "include/image.h"
64+
		       (("#  include <openssl/evp.h>") "")
65+
		       (("IMAGE_ENABLE_SIGN\t1") "IMAGE_ENABLE_SIGN	0")
66+
		       (("IMAGE_ENABLE_VERIFY\t1") "IMAGE_ENABLE_VERIFY	0")
67+
		       (("IMAGE_ENABLE_ENCRYPT\t1") "IMAGE_ENABLE_ENRYPT	0")
68+
		       (("IMAGE_ENABLE_DECRYPT\t1") "IMAGE_ENABLE_DERYPT	0")
69+
		       )))))
5470 
      (arguments
5571 
        (substitute-keyword-arguments (package-arguments base)
5672 
          ((#:phases phases)
57-
           `(modify-phases ,phases
73+
           #~(modify-phases #$phases
5874 
              (add-after 'unpack 'set-environment
5975 
                (lambda* (#:key inputs #:allow-other-keys)
6076 
                  (setenv "BL31"
61-
                          (search-input-file inputs "/bl31.elf"))))
77+
                          (search-input-file inputs "bl31.elf"))))
6278 
              ;; Phases do not succeed on the bl31 ELF.
6379 
              (delete 'strip)
6480 
              (delete 'validate-runpath)))))
65-
      (native-inputs
66-
       `(("firmware" ,arm-trusted-firmware-rk3399)
67-
         ,@(package-native-inputs base))))))
81+
      (inputs
82+
	(modify-inputs (package-inputs base)
83+
	  (append arm-trusted-firmware-rk3399))))))
6884 
6985 
;; Same as install-rockpro64-rk3399-u-boot
7086 
(define install-rock-pi-4-rk3399-u-boot
…
161177 
                  (ssl-certificate-key
162178 
                    "/etc/letsencrypt/live/nono.lepiller.eu/privkey.pem")
163179 
                  (listen '("443 ssl http2" "[::]:443 ssl http2"))
164-
                  (server-name '(default))
180+
                  (server-name '(default "nono.lepiller.eu" "toulouse.lepiller.eu"))
165181 
		  (root "/srv/http/default"))))
166182 
        #;(simple-service 'social-http-server nginx-service-type
167183 
          (list (nginx-server-configuration