diff options
| author | EuAndreh <eu@euandre.org> | 2024-08-30 09:36:55 -0300 |
|---|---|---|
| committer | EuAndreh <eu@euandre.org> | 2024-08-30 09:36:55 -0300 |
| commit | e186522317ac58272d71ef3131ae52fae1a63c16 (patch) | |
| tree | c52252f474d38b1a01ad7027f9302b03ea259922 | |
| parent | src/secrets/repo/borg-key-standby.txt.gpg: Add (diff) | |
| download | asami-e186522317ac58272d71ef3131ae52fae1a63c16.tar.gz asami-e186522317ac58272d71ef3131ae52fae1a63c16.tar.xz | |
system.scm: Attempt to remove certbot and nginx services and introduce binder
| -rw-r--r-- | src/guix/system.scm | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/src/guix/system.scm b/src/guix/system.scm index fef4712..5dbd852 100644 --- a/src/guix/system.scm +++ b/src/guix/system.scm @@ -91,6 +91,19 @@ `(((untls-https) (,@certs "/var/run/untls/https.socket" "/var/run/glaze/glaze.socket")) ((untls-ircs) (,@certs "/var/run/untls/ircs.socket" "/var/run/papod/papod.socket"))))) +(use-service-modules web) +(define simple-postfix-service-type + (service-type + (inherit q:internet-postfix-service-type) + (extensions + (filter (lambda (extension) + (let ((target (service-extension-target extension))) + (not + (or + (eq? nginx-service-type target) + (eq? certbot-service-type target))))) + (service-type-extensions q:internet-postfix-service-type))))) + (operating-system @@ -107,13 +120,14 @@ (service ntp-service-type) (service dhcp-client-service-type) (service fail2ban-service-type) - ;; (service binder-service-type (pkg:binder-configuration (package (latest pkg:binder)))) + (service binder-service-type (pkg:binder-configuration (package (latest pkg:binder)))) ;; (service glaze-service-type (pkg:glaze-configuration (package (latest pkg:glaze)))) ;; (service untls-service-type (pkg:untls-configuration (package (latest pkg:untls)))) ;; (service pkg:wscat-service-type (pkg:wscat-configuration (package (latest pkg:wscat)))) ;; (service pkg:papod-service-type (pkg:papod-configuration (package (latest pkg: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 pkg:syskeep-service-type (pkg:syskeep-configuration @@ -126,7 +140,9 @@ (service q:dkimproxyout-service-type) (service q:cyrus-sasl-service-type) (service q:dovecot-service-type) +#; (service q:internet-postfix-service-type) + (service simple-postfix-service-type) (simple-service 'host-specific-etc-file etc-service-type `(("id_rsa.pub" ,(plain-file "id_rsa.pub" +root-pubkey+)) ("known_hosts" ,(plain-file "known-hosts.txt" +known-hosts+)) |