summaryrefslogtreecommitdiff
path: root/systems/izumi/izumi.org
diff options
context:
space:
mode:
authorMarek Paśnikowski <marek@marekpasnikowski.pl>2024-08-28 17:21:20 +0200
committerMarek Paśnikowski <marek@marekpasnikowski.pl>2024-09-01 16:27:52 +0200
commit2c6a733adaaa5c24c089b94f99fa1b1d59e9b2e2 (patch)
tree04ee98c2719f6659ba420096a4cf6e287cf2b5f2 /systems/izumi/izumi.org
parentcfd138216dc17093bb3744595b0d79b6f6bba765 (diff)
refactor(id1000): implement dovecot in user module
Diffstat (limited to 'systems/izumi/izumi.org')
-rw-r--r--systems/izumi/izumi.org41
1 files changed, 21 insertions, 20 deletions
diff --git a/systems/izumi/izumi.org b/systems/izumi/izumi.org
index 779e899..3fd6542 100644
--- a/systems/izumi/izumi.org
+++ b/systems/izumi/izumi.org
@@ -484,7 +484,7 @@
( define* ( wip-mail-services #:key interface domain )
( list
( wip-dkim-service domain )
- ( wip-imap-service domain )
+ ;; ( wip-imap-service domain )
( wip-smtp-service interface domain ) ) )
( operating-system
@@ -569,6 +569,7 @@
#:interface "enp1s0"
#:domain "marekpasnikowski.pl" )
( list
+ (@ (users id1000) dovecot-service)
(service (service-type (inherit certbot-service-type)
(extensions (map (lambda (extension)
(if (eq? (service-extension-target extension)
@@ -578,24 +579,24 @@
certbot-nginx-server-configurations))
extension))
(service-type-extensions certbot-service-type))))
- ( certbot-configuration
- ( certificates
- ( list
- ( certificate-configuration
- ( deploy-hook
- ( program-file
- "nginx-deploy-hook"
- #~
- ( let
- ( ( pid ( call-with-input-file "/var/run/nginx/pid" read ) ) )
- ( kill pid SIGHUP ) ) ) )
- ( domains
- ( list
- "marekpasnikowski.pl"
- "git.marekpasnikowski.pl"
- "radicale.marekpasnikowski.pl" ) ) ) ) )
- ( email "marek@marekpasnikowski.pl" )
- ( webroot "/srv/www/marek/marekpasnikowski.pl" ) ) )
+ ( certbot-configuration
+ ( certificates
+ ( list
+ ( certificate-configuration
+ ( deploy-hook
+ ( program-file
+ "nginx-deploy-hook"
+ #~
+ ( let
+ ( ( pid ( call-with-input-file "/var/run/nginx/pid" read ) ) )
+ ( kill pid SIGHUP ) ) ) )
+ ( domains
+ ( list
+ "marekpasnikowski.pl"
+ "git.marekpasnikowski.pl"
+ "radicale.marekpasnikowski.pl" ) ) ) ) )
+ ( email "marek@marekpasnikowski.pl" )
+ ( webroot "/srv/www/marek/marekpasnikowski.pl" ) ) )
(service (service-type (inherit cgit-service-type)
(extensions (map (lambda (extension)
(if (eq? (service-extension-target extension)
@@ -647,7 +648,7 @@
( gitolite-configuration
( rc-file ( gitolite-rc-file ( umask #o0027 ) ) )
( admin-pubkey ( plain-file "gitolite-admin.pub"
- "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK4THTYnHCc/ihCJNKJtGTNu1zCnLndbMHnxnrxzJk+N marek@izumi\n") ) ) )
+ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK4THTYnHCc/ihCJNKJtGTNu1zCnLndbMHnxnrxzJk+N marek@izumi\n") ) ) )
( service gnome-desktop-service-type )
( service syncthing-service-type ( syncthing-configuration ( user "marek" ) ) )
(service nginx-service-type*