summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Paśnikowski <marek@marekpasnikowski.pl>2024-10-06 15:28:33 +0200
committerMarek Paśnikowski <marek@marekpasnikowski.pl>2024-10-06 15:28:33 +0200
commit993b37763bfa5401c0ff97111883a7f04ced033a (patch)
tree21334a58cfef10f846f192e479f0eb90a9e948f4
parentb0750062d844c20cc35b71b796eab1c865754d1e (diff)
refactor(izumi): remove tabs
-rw-r--r--systems/izumi/izumi.org100
-rw-r--r--systems/izumi/system-configuration.scm100
2 files changed, 100 insertions, 100 deletions
diff --git a/systems/izumi/izumi.org b/systems/izumi/izumi.org
index 6b36fb1..7058f95 100644
--- a/systems/izumi/izumi.org
+++ b/systems/izumi/izumi.org
@@ -135,10 +135,10 @@
( extra-options extra-options )
( substitute-urls substitute-urls ) ) ) ) )
( list
- (@ (users id1000) dkim-service)
- (@ (users id1000) dovecot-service)
- (@ (users id1000) smtp-service)
- (service (service-type (inherit certbot-service-type)
+ (@ (users id1000) dkim-service)
+ (@ (users id1000) dovecot-service)
+ (@ (users id1000) smtp-service)
+ (service (service-type (inherit certbot-service-type)
(extensions (map (lambda (extension)
(if (eq? (service-extension-target extension)
nginx-service-type)
@@ -147,24 +147,24 @@
certbot-nginx-server-configurations))
extension))
(service-type-extensions certbot-service-type))))
- ( certbot-configuration
- ( certificates
- ( list
+ ( certbot-configuration
+ ( certificates
+ ( list
( certificate-configuration
- ( deploy-hook
- ( program-file
- "nginx-deploy-hook"
- #~
- ( let
- ( ( pid ( call-with-input-file "/var/run/nginx/pid" read ) ) )
+ ( 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" ) ) )
+ ( 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)
@@ -218,45 +218,45 @@
( admin-pubkey ( plain-file "gitolite-admin.pub"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK4THTYnHCc/ihCJNKJtGTNu1zCnLndbMHnxnrxzJk+N marek@izumi\n") ) ) )
( service plasma-desktop-service-type )
- ( service syncthing-service-type ( syncthing-configuration ( user "marek" ) ) )
+ ( service syncthing-service-type ( syncthing-configuration ( user "marek" ) ) )
(service nginx-service-type*
- ( nginx-configuration
- ( server-blocks
- ( list
+ ( nginx-configuration
+ ( server-blocks
+ ( list
;; Top-Level
( nginx-server-configuration
- ( locations
- ( list
- ( nginx-location-configuration
+ ( locations
+ ( list
+ ( nginx-location-configuration
( uri "/.well-known" )
( body
- ( list "root /srv/www/marek/marekpasnikowski.pl ;" ) ) ) ) )
- ( listen ( list "192.168.10.2:443 ssl" ) )
- ( root "/srv/www/marek/marekpasnikowski.pl" )
- ( server-name ( list "marekpasnikowski.pl" ) )
- ( ssl-certificate
- "/etc/letsencrypt/live/marekpasnikowski.pl/fullchain.pem" )
- ( ssl-certificate-key
- "/etc/letsencrypt/live/marekpasnikowski.pl/privkey.pem" ) )
+ ( list "root /srv/www/marek/marekpasnikowski.pl ;" ) ) ) ) )
+ ( listen ( list "192.168.10.2:443 ssl" ) )
+ ( root "/srv/www/marek/marekpasnikowski.pl" )
+ ( server-name ( list "marekpasnikowski.pl" ) )
+ ( ssl-certificate
+ "/etc/letsencrypt/live/marekpasnikowski.pl/fullchain.pem" )
+ ( ssl-certificate-key
+ "/etc/letsencrypt/live/marekpasnikowski.pl/privkey.pem" ) )
;; Radicale
( nginx-server-configuration
- ( locations
- ( list
- ( nginx-location-configuration
+ ( locations
+ ( list
+ ( nginx-location-configuration
( body
- ( list
- "proxy_pass http://localhost:5232/ ;"
- "proxy_set_header X-Script-Name \"\" ;"
- "proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for ;"
- "proxy_set_header Host $http_host ;"
- "proxy_pass_header Authorization ;" ) )
+ ( list
+ "proxy_pass http://localhost:5232/ ;"
+ "proxy_set_header X-Script-Name \"\" ;"
+ "proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for ;"
+ "proxy_set_header Host $http_host ;"
+ "proxy_pass_header Authorization ;" ) )
( uri "/" ) )
- ( nginx-location-configuration
+ ( nginx-location-configuration
( body
- ( list "root /srv/www/marek/marekpasnikowski.pl ;" ) )
+ ( list "root /srv/www/marek/marekpasnikowski.pl ;" ) )
( uri "/.well-known" ) ) ) )
- ( listen ( list "192.168.10.2:443 ssl" ) )
- ( server-name ( list "radicale.marekpasnikowski.pl" ) ) ) ) ) ) )
+ ( listen ( list "192.168.10.2:443 ssl" ) )
+ ( server-name ( list "radicale.marekpasnikowski.pl" ) ) ) ) ) ) )
( service openssh-service-type )
( service radicale-service-type
( radicale-configuration
@@ -284,8 +284,8 @@
( target "/dev/sda3" ) ) ) )
( timezone "Europe/Warsaw" )
(users (append (@ (gnu system shadow) %base-user-accounts)
- (list (@ (users vmail) vmail-account)
- (@ (users id1000) uid1000-account)))))
+ (list (@ (users vmail) vmail-account)
+ (@ (users id1000) uid1000-account)))))
#+END_SRC
#+NAME: OPENSMTPD-CONFIGURATION-FILE
diff --git a/systems/izumi/system-configuration.scm b/systems/izumi/system-configuration.scm
index ef0e3f1..577a6f0 100644
--- a/systems/izumi/system-configuration.scm
+++ b/systems/izumi/system-configuration.scm
@@ -125,10 +125,10 @@
( extra-options extra-options )
( substitute-urls substitute-urls ) ) ) ) )
( list
- (@ (users id1000) dkim-service)
- (@ (users id1000) dovecot-service)
- (@ (users id1000) smtp-service)
- (service (service-type (inherit certbot-service-type)
+ (@ (users id1000) dkim-service)
+ (@ (users id1000) dovecot-service)
+ (@ (users id1000) smtp-service)
+ (service (service-type (inherit certbot-service-type)
(extensions (map (lambda (extension)
(if (eq? (service-extension-target extension)
nginx-service-type)
@@ -137,24 +137,24 @@
certbot-nginx-server-configurations))
extension))
(service-type-extensions certbot-service-type))))
- ( certbot-configuration
- ( certificates
- ( list
+ ( certbot-configuration
+ ( certificates
+ ( list
( certificate-configuration
- ( deploy-hook
- ( program-file
- "nginx-deploy-hook"
- #~
- ( let
- ( ( pid ( call-with-input-file "/var/run/nginx/pid" read ) ) )
+ ( 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" ) ) )
+ ( 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)
@@ -208,45 +208,45 @@
( admin-pubkey ( plain-file "gitolite-admin.pub"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK4THTYnHCc/ihCJNKJtGTNu1zCnLndbMHnxnrxzJk+N marek@izumi\n") ) ) )
( service plasma-desktop-service-type )
- ( service syncthing-service-type ( syncthing-configuration ( user "marek" ) ) )
+ ( service syncthing-service-type ( syncthing-configuration ( user "marek" ) ) )
(service nginx-service-type*
- ( nginx-configuration
- ( server-blocks
- ( list
+ ( nginx-configuration
+ ( server-blocks
+ ( list
;; Top-Level
( nginx-server-configuration
- ( locations
- ( list
- ( nginx-location-configuration
+ ( locations
+ ( list
+ ( nginx-location-configuration
( uri "/.well-known" )
( body
- ( list "root /srv/www/marek/marekpasnikowski.pl ;" ) ) ) ) )
- ( listen ( list "192.168.10.2:443 ssl" ) )
- ( root "/srv/www/marek/marekpasnikowski.pl" )
- ( server-name ( list "marekpasnikowski.pl" ) )
- ( ssl-certificate
- "/etc/letsencrypt/live/marekpasnikowski.pl/fullchain.pem" )
- ( ssl-certificate-key
- "/etc/letsencrypt/live/marekpasnikowski.pl/privkey.pem" ) )
+ ( list "root /srv/www/marek/marekpasnikowski.pl ;" ) ) ) ) )
+ ( listen ( list "192.168.10.2:443 ssl" ) )
+ ( root "/srv/www/marek/marekpasnikowski.pl" )
+ ( server-name ( list "marekpasnikowski.pl" ) )
+ ( ssl-certificate
+ "/etc/letsencrypt/live/marekpasnikowski.pl/fullchain.pem" )
+ ( ssl-certificate-key
+ "/etc/letsencrypt/live/marekpasnikowski.pl/privkey.pem" ) )
;; Radicale
( nginx-server-configuration
- ( locations
- ( list
- ( nginx-location-configuration
+ ( locations
+ ( list
+ ( nginx-location-configuration
( body
- ( list
- "proxy_pass http://localhost:5232/ ;"
- "proxy_set_header X-Script-Name \"\" ;"
- "proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for ;"
- "proxy_set_header Host $http_host ;"
- "proxy_pass_header Authorization ;" ) )
+ ( list
+ "proxy_pass http://localhost:5232/ ;"
+ "proxy_set_header X-Script-Name \"\" ;"
+ "proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for ;"
+ "proxy_set_header Host $http_host ;"
+ "proxy_pass_header Authorization ;" ) )
( uri "/" ) )
- ( nginx-location-configuration
+ ( nginx-location-configuration
( body
- ( list "root /srv/www/marek/marekpasnikowski.pl ;" ) )
+ ( list "root /srv/www/marek/marekpasnikowski.pl ;" ) )
( uri "/.well-known" ) ) ) )
- ( listen ( list "192.168.10.2:443 ssl" ) )
- ( server-name ( list "radicale.marekpasnikowski.pl" ) ) ) ) ) ) )
+ ( listen ( list "192.168.10.2:443 ssl" ) )
+ ( server-name ( list "radicale.marekpasnikowski.pl" ) ) ) ) ) ) )
( service openssh-service-type )
( service radicale-service-type
( radicale-configuration
@@ -274,5 +274,5 @@
( target "/dev/sda3" ) ) ) )
( timezone "Europe/Warsaw" )
(users (append (@ (gnu system shadow) %base-user-accounts)
- (list (@ (users vmail) vmail-account)
- (@ (users id1000) uid1000-account)))))
+ (list (@ (users vmail) vmail-account)
+ (@ (users id1000) uid1000-account)))))