aboutsummaryrefslogtreecommitdiff
path: root/sync
diff options
context:
space:
mode:
authorEuAndreh <eu@euandre.org>2020-11-26 19:31:52 -0300
committerEuAndreh <eu@euandre.org>2020-11-26 19:32:45 -0300
commite778a41e34fc55ab6e86375b5e8bad87c3eb4ddf (patch)
tree3cc2b96a3e34e99e5e9c3889728f9f7773b520a6 /sync
parentvps.scm: Add nginx, certbot and mail-aliases services (diff)
downloadserver-e778a41e34fc55ab6e86375b5e8bad87c3eb4ddf.tar.gz
server-e778a41e34fc55ab6e86375b5e8bad87c3eb4ddf.tar.xz
vps.scm: Indent (operating-system ...) expression
Diffstat (limited to 'sync')
-rw-r--r--sync/vps.scm122
1 files changed, 61 insertions, 61 deletions
diff --git a/sync/vps.scm b/sync/vps.scm
index f56b3ed..890ad25 100644
--- a/sync/vps.scm
+++ b/sync/vps.scm
@@ -57,8 +57,8 @@ pki " mail-domain " key \"" (tls-priv-for mail-domain) "\""))
(define %nginx-deploy-hook
(program-file
"nginx-deploy-hook"
- #~ (let ((pid (call-with-input-file "/var/run/nginx/pid" read)))
- (kill pid SIGHUP))))
+ #~(let ((pid (call-with-input-file "/var/run/nginx/pid" read)))
+ (kill pid SIGHUP))))
(operating-system
(locale "fr_FR.UTF-8")
@@ -66,69 +66,69 @@ pki " mail-domain " key \"" (tls-priv-for mail-domain) "\""))
(keyboard-layout (keyboard-layout "us"))
(host-name "guix-pet-server")
(users (cons* (user-account
- (name user)
- (group "users")
- (home-directory (string-append "/home/" user))
- (supplementary-groups '("wheel")))
+ (name user)
+ (group "users")
+ (home-directory (string-append "/home/" user))
+ (supplementary-groups '("wheel")))
%base-user-accounts))
(sudoers-file (plain-file "sudoers" sudoers))
(packages
- (append (map specification->package
- '("git"
- "nss-certs"
- "rsync"))
- %base-packages))
+ (append (map specification->package
+ '("git"
+ "nss-certs"
+ "rsync"))
+ %base-packages))
(services
- (append
- (list (service openssh-service-type
- (openssh-configuration
- (openssh openssh-sans-x)
- (password-authentication? #false)
- (authorized-keys
- `((,user ,(plain-file "id_rsa.pub" ssh-public-key))))))
- (service mcron-service-type
- (mcron-configuration
- (jobs (list))))
- (service unattended-upgrade-service-type)
- (service dhcp-client-service-type)
- ;; (service opensmtpd-service-type
- ;; (opensmtpd-configuration
- ;; (config-file opensmtpd-config)))
- (service mail-aliases-service-type
- '(("postmaster" "root")
- ("webmaster" "root")
- ("abuse" "root")))
- (service nginx-service-type
- (nginx-configuration
- (server-blocks
- (list
- (nginx-server-configuration
- ;; redirect???
- (server-name (list tld))
- (ssl-certificate (tls-pub-for tld))
- (ssl-certificate-key (tls-priv-for tld)))))))
- (service certbot-service-type
- (certbot-configuration
- (email (string-append "certbot@" tld))
- (certificates
- (list
- (certificate-configuration
- (domains tls-domains)
- ;; FIXME: call /var/lib/certbot/renew-certificates on deploy-hook
- (deploy-hook %nginx-deploy-hook)))))))
- %base-services))
+ (append
+ (list (service openssh-service-type
+ (openssh-configuration
+ (openssh openssh-sans-x)
+ (password-authentication? #false)
+ (authorized-keys
+ `((,user ,(plain-file "id_rsa.pub" ssh-public-key))))))
+ (service mcron-service-type
+ (mcron-configuration
+ (jobs (list))))
+ (service unattended-upgrade-service-type)
+ (service dhcp-client-service-type)
+ ;; (service opensmtpd-service-type
+ ;; (opensmtpd-configuration
+ ;; (config-file opensmtpd-config)))
+ (service mail-aliases-service-type
+ '(("postmaster" "root")
+ ("webmaster" "root")
+ ("abuse" "root")))
+ (service nginx-service-type
+ (nginx-configuration
+ (server-blocks
+ (list
+ (nginx-server-configuration
+ ;; redirect???
+ (server-name (list tld))
+ (ssl-certificate (tls-pub-for tld))
+ (ssl-certificate-key (tls-priv-for tld)))))))
+ (service certbot-service-type
+ (certbot-configuration
+ (email (string-append "certbot@" tld))
+ (certificates
+ (list
+ (certificate-configuration
+ (domains tls-domains)
+ ;; FIXME: call /var/lib/certbot/renew-certificates on deploy-hook
+ (deploy-hook %nginx-deploy-hook)))))))
+ %base-services))
(bootloader
- (bootloader-configuration
- (bootloader grub-bootloader)
- (target "/dev/vda")
- (keyboard-layout keyboard-layout)))
+ (bootloader-configuration
+ (bootloader grub-bootloader)
+ (target "/dev/vda")
+ (keyboard-layout keyboard-layout)))
(swap-devices
- (list (uuid "79a91c82-f3e1-4ed7-8c4e-23569f1ae0ca")))
+ (list (uuid "79a91c82-f3e1-4ed7-8c4e-23569f1ae0ca")))
(file-systems
- (cons* (file-system
- (mount-point "/")
- (device
- (uuid "fddb6a4c-8b8c-4f57-b274-5d6d33200f28"
- 'ext4))
- (type "ext4"))
- %base-file-systems)))
+ (cons* (file-system
+ (mount-point "/")
+ (device
+ (uuid "fddb6a4c-8b8c-4f57-b274-5d6d33200f28"
+ 'ext4))
+ (type "ext4"))
+ %base-file-systems)))