diff options
| author | Marek Paśnikowski <marek@marekpasnikowski.pl> | 2024-04-04 10:08:28 +0200 |
|---|---|---|
| committer | Marek Paśnikowski <marek@marekpasnikowski.pl> | 2024-04-04 16:46:46 +0200 |
| commit | 67e10bef6d185373a416f3d4aa2f2a77ef7bcda7 (patch) | |
| tree | 066877b47954c22b2a1cf893b5ad2ad4744c605a /systems/izumi/system-configuration.scm | |
| parent | 72726b0d75296413dfad557858eb96d6659cf566 (diff) | |
guix-channel: remove dependency on private-inputs: interference with other systems
Diffstat (limited to 'systems/izumi/system-configuration.scm')
| -rw-r--r-- | systems/izumi/system-configuration.scm | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/systems/izumi/system-configuration.scm b/systems/izumi/system-configuration.scm index 2612400..e14601e 100644 --- a/systems/izumi/system-configuration.scm +++ b/systems/izumi/system-configuration.scm @@ -1,7 +1,10 @@ ( 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 ) @@ -385,7 +388,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 @@ -545,7 +548,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 @@ -587,8 +590,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 @@ -652,8 +656,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 |