summaryrefslogtreecommitdiff
path: root/systems/izumi/izumi.org
diff options
context:
space:
mode:
Diffstat (limited to 'systems/izumi/izumi.org')
-rw-r--r--systems/izumi/izumi.org17
1 files changed, 10 insertions, 7 deletions
diff --git a/systems/izumi/izumi.org b/systems/izumi/izumi.org
index 7678341..92920fb 100644
--- a/systems/izumi/izumi.org
+++ b/systems/izumi/izumi.org
@@ -10,8 +10,11 @@
#+BEGIN_SRC scheme :tangle system-configuration.scm
( define-module ( systems izumi system-configuration ) )
+ (define smtpd-keys "/secrets/smtpd")
+ (define radicale-keys "/secrets/radicale")
+ (define dovecot-keys "/secrets/dovecot")
+
( use-modules
- ( marek )
( gnu )
( guix records )
( ice-9 match )
@@ -395,7 +398,7 @@
( passdbs
( list
( passdb-configuration
- ( args ( list "username_format=%n" "/etc/dovecot-passwd" ) )
+ ( args ( list "username_format=%n" "/secrets/dovecot" ) )
( driver "passwd-file" ) ) ) )
( protocols
( list
@@ -555,7 +558,7 @@
"marekpasnikowski.pl"
"git.marekpasnikowski.pl"
"radicale.marekpasnikowski.pl" ) ) ) ) )
- ( email certbot-mail )
+ ( email "marek@marekpasnikowski.pl" )
( webroot "/srv/www/marek/marekpasnikowski.pl" ) ) )
( service cgit-service-type
( cgit-configuration
@@ -597,8 +600,9 @@
( service fcgiwrap-service-type )
( service gitolite-service-type
( gitolite-configuration
- ( admin-pubkey gitolite-keys )
- ( rc-file ( gitolite-rc-file ( umask #o0022 ) ) ) ) )
+ ( rc-file ( gitolite-rc-file ( umask #o0022 ) ) )
+ ( admin-pubkey ( plain-file "gitolite-admin.pub"
+ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK4THTYnHCc/ihCJNKJtGTNu1zCnLndbMHnxnrxzJk+N marek@izumi\n") ) ) )
( service gnome-desktop-service-type )
( service nginx-service-type
( nginx-configuration
@@ -662,8 +666,7 @@
'etc-files
etc-service-type
( list
- `( "mailname" ,( plain-file "mailname" "marekpasnikowski.pl\n" ) )
- `( "dovecot-passwd" ,dovecot-keys ) ) ) ) ) )
+ `( "mailname" ,( plain-file "mailname" "marekpasnikowski.pl\n" ) ) ) ) ) ) )
( sudoers-file ( local-file "system-files/sudoers" ) )
( swap-devices
( list