diff options
| author | Nguyễn Gia Phong <cnx@loang.net> | 2026-07-27 11:46:23 +0900 |
|---|---|---|
| committer | Nguyễn Gia Phong <cnx@loang.net> | 2026-07-27 11:53:41 +0900 |
| commit | a6149814533863a14f239c6d227b9c02ea7dd209 (patch) | |
| tree | 693e53d864b191999a0aa63ab40d5c6dcc461d25 /gnu/services | |
| parent | 50f0f015603699ea1258b78239f0c47ea3204f4b (diff) | |
services: Eliminate tab-based indentations.
* gnu/services/admin.scm: Replace tabs with 8 spaces.
* gnu/services/dbus.scm: Likewise.
* gnu/services/power.scm: Likewise.
* gnu/services/ssh.scm: Likewise.
* gnu/services/virtualization.scm: Likewise.
* gnu/services/web.scm: Likewise.
* gnu/services/xorg.scm: Likewise.
* gnu/services/networking.scm: Reindent lines with tabs.
Diffstat (limited to 'gnu/services')
| -rw-r--r-- | gnu/services/admin.scm | 7 | ||||
| -rw-r--r-- | gnu/services/dbus.scm | 4 | ||||
| -rw-r--r-- | gnu/services/networking.scm | 59 | ||||
| -rw-r--r-- | gnu/services/power.scm | 36 | ||||
| -rw-r--r-- | gnu/services/ssh.scm | 2 | ||||
| -rw-r--r-- | gnu/services/virtualization.scm | 2 | ||||
| -rw-r--r-- | gnu/services/web.scm | 28 | ||||
| -rw-r--r-- | gnu/services/xorg.scm | 10 |
8 files changed, 72 insertions, 76 deletions
diff --git a/gnu/services/admin.scm b/gnu/services/admin.scm index 0829d67574a..907f7d37f4a 100644 --- a/gnu/services/admin.scm +++ b/gnu/services/admin.scm | |||
| @@ -226,12 +226,11 @@ log-rotation} to list files subject to log rotation.") | |||
| 226 | (with-imported-modules '((guix build utils)) | 226 | (with-imported-modules '((guix build utils)) |
| 227 | #~(begin | 227 | #~(begin |
| 228 | (use-modules (guix build utils)) | 228 | (use-modules (guix build utils)) |
| 229 | |||
| 230 | (let* ((now (car (gettimeofday))) | 229 | (let* ((now (car (gettimeofday))) |
| 231 | (logs (find-files #$directory | 230 | (logs (find-files #$directory |
| 232 | (lambda (file stat) | 231 | (lambda (file stat) |
| 233 | (> (- now (stat:mtime stat)) | 232 | (> (- now (stat:mtime stat)) |
| 234 | #$expiry))))) | 233 | #$expiry))))) |
| 235 | (format #t "deleting ~a log files from '~a'...~%" | 234 | (format #t "deleting ~a log files from '~a'...~%" |
| 236 | (length logs) #$directory) | 235 | (length logs) #$directory) |
| 237 | (for-each delete-file logs)))))) | 236 | (for-each delete-file logs)))))) |
diff --git a/gnu/services/dbus.scm b/gnu/services/dbus.scm index 40f2c9264ef..3d314f4183e 100644 --- a/gnu/services/dbus.scm +++ b/gnu/services/dbus.scm | |||
| @@ -469,8 +469,8 @@ the capability to suspend the system if the user is logged in locally." | |||
| 469 | (extensions | 469 | (extensions |
| 470 | (list (service-extension | 470 | (list (service-extension |
| 471 | polkit-service-type rtkit-package) | 471 | polkit-service-type rtkit-package) |
| 472 | (service-extension dbus-root-service-type rtkit-package) | 472 | (service-extension dbus-root-service-type rtkit-package) |
| 473 | (service-extension | 473 | (service-extension |
| 474 | account-service-type | 474 | account-service-type |
| 475 | (const (list %rtkit-account))))) | 475 | (const (list %rtkit-account))))) |
| 476 | (default-value (rtkit-configuration)) | 476 | (default-value (rtkit-configuration)) |
diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index ee626928aaa..752f3e3e890 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm | |||
| @@ -184,11 +184,11 @@ | |||
| 184 | tor-onion-service-configuration? | 184 | tor-onion-service-configuration? |
| 185 | tor-onion-service-configuration-name | 185 | tor-onion-service-configuration-name |
| 186 | tor-onion-service-configuration-mapping | 186 | tor-onion-service-configuration-mapping |
| 187 | tor-transport-plugin | 187 | tor-transport-plugin |
| 188 | tor-transport-plugin? | 188 | tor-transport-plugin? |
| 189 | tor-plugin-role | 189 | tor-plugin-role |
| 190 | tor-plugin-protocol | 190 | tor-plugin-protocol |
| 191 | tor-plugin-program | 191 | tor-plugin-program |
| 192 | tor-hidden-service ; deprecated | 192 | tor-hidden-service ; deprecated |
| 193 | tor-service-type | 193 | tor-service-type |
| 194 | 194 | ||
| @@ -1098,15 +1098,15 @@ maps ports 22 and 80 of the Onion Service to the local ports 22 and 8080.")) | |||
| 1098 | (define-record-type* <tor-transport-plugin> | 1098 | (define-record-type* <tor-transport-plugin> |
| 1099 | tor-transport-plugin make-tor-transport-plugin | 1099 | tor-transport-plugin make-tor-transport-plugin |
| 1100 | tor-transport-plugin? | 1100 | tor-transport-plugin? |
| 1101 | (role tor-plugin-role | 1101 | (role tor-plugin-role |
| 1102 | (default 'client) | 1102 | (default 'client) |
| 1103 | (sanitize (lambda (value) | 1103 | (sanitize (lambda (value) |
| 1104 | (if (memq value '(client server)) | 1104 | (if (memq value '(client server)) |
| 1105 | value | 1105 | value |
| 1106 | (configuration-field-error #f 'role value))))) | 1106 | (configuration-field-error #f 'role value))))) |
| 1107 | (protocol tor-plugin-protocol | 1107 | (protocol tor-plugin-protocol |
| 1108 | (default "obfs4")) | 1108 | (default "obfs4")) |
| 1109 | (program tor-plugin-program)) | 1109 | (program tor-plugin-program)) |
| 1110 | 1110 | ||
| 1111 | (define (tor-configuration->torrc config) | 1111 | (define (tor-configuration->torrc config) |
| 1112 | "Return a 'torrc' file for CONFIG." | 1112 | "Return a 'torrc' file for CONFIG." |
| @@ -1201,10 +1201,10 @@ HiddenServicePort ~a ~a~%" | |||
| 1201 | (source (file-append nss-certs "/etc/ssl/certs")) | 1201 | (source (file-append nss-certs "/etc/ssl/certs")) |
| 1202 | (target "/etc/ssl/certs"))) | 1202 | (target "/etc/ssl/certs"))) |
| 1203 | (map (lambda (plugin) | 1203 | (map (lambda (plugin) |
| 1204 | (file-system-mapping | 1204 | (file-system-mapping |
| 1205 | (source (tor-plugin-program plugin)) | 1205 | (source (tor-plugin-program plugin)) |
| 1206 | (target source))) | 1206 | (target source))) |
| 1207 | transport-plugins)) | 1207 | transport-plugins)) |
| 1208 | #:namespaces (delq 'net %namespaces)))) | 1208 | #:namespaces (delq 'net %namespaces)))) |
| 1209 | (list (shepherd-service | 1209 | (list (shepherd-service |
| 1210 | (provision '(tor)) | 1210 | (provision '(tor)) |
| @@ -2697,18 +2697,17 @@ local servers publicly accessible on the web, even behind NATs and firewalls.")) | |||
| 2697 | dotted-list?) | 2697 | dotted-list?) |
| 2698 | (define (param->camel str) | 2698 | (define (param->camel str) |
| 2699 | (string-concatenate | 2699 | (string-concatenate |
| 2700 | (map | 2700 | (map string-capitalize |
| 2701 | string-capitalize | 2701 | (string-split str (cut eqv? <> #\-))))) |
| 2702 | (string-split str (cut eqv? <> #\-))))) | ||
| 2703 | (cond | 2702 | (cond |
| 2704 | ((key-value? x) | 2703 | ((key-value? x) |
| 2705 | (let ((k (car x)) | 2704 | (let ((k (car x)) |
| 2706 | (v (cdr x))) | 2705 | (v (cdr x))) |
| 2707 | (cons | 2706 | (cons |
| 2708 | (if (symbol? k) | 2707 | (if (symbol? k) |
| 2709 | (param->camel (symbol->string k)) | 2708 | (param->camel (symbol->string k)) |
| 2710 | k) | 2709 | k) |
| 2711 | v))) | 2710 | v))) |
| 2712 | ((list? x) (map scm->yggdrasil-json x)) | 2711 | ((list? x) (map scm->yggdrasil-json x)) |
| 2713 | ((vector? x) (vector-map scm->yggdrasil-json x)) | 2712 | ((vector? x) (vector-map scm->yggdrasil-json x)) |
| 2714 | (else x))) | 2713 | (else x))) |
| @@ -2740,11 +2739,9 @@ local servers publicly accessible on the web, even behind NATs and firewalls.")) | |||
| 2740 | (list "-extraconffile" extraconf) | 2739 | (list "-extraconffile" extraconf) |
| 2741 | '())) | 2740 | '())) |
| 2742 | (list "-loglevel" | 2741 | (list "-loglevel" |
| 2743 | #$(symbol->string | 2742 | #$(symbol->string (yggdrasil-configuration-log-level config)) |
| 2744 | (yggdrasil-configuration-log-level config)) | ||
| 2745 | "-logto" | 2743 | "-logto" |
| 2746 | #$(symbol->string | 2744 | #$(symbol->string (yggdrasil-configuration-log-to config))))) |
| 2747 | (yggdrasil-configuration-log-to config))))) | ||
| 2748 | (list (shepherd-service | 2745 | (list (shepherd-service |
| 2749 | (documentation "Connect to the Yggdrasil mesh network") | 2746 | (documentation "Connect to the Yggdrasil mesh network") |
| 2750 | (provision '(yggdrasil)) | 2747 | (provision '(yggdrasil)) |
diff --git a/gnu/services/power.scm b/gnu/services/power.scm index 26c1157f5da..504b31b293d 100644 --- a/gnu/services/power.scm +++ b/gnu/services/power.scm | |||
| @@ -547,24 +547,24 @@ file, 0 disables.") | |||
| 547 | ("killpower" #$killpower) | 547 | ("killpower" #$killpower) |
| 548 | ("commfailure" #$commfailure) | 548 | ("commfailure" #$commfailure) |
| 549 | ("commok" #$commok) | 549 | ("commok" #$commok) |
| 550 | ("powerout" #$powerout) | 550 | ("powerout" #$powerout) |
| 551 | ("onbattery" #$onbattery) | 551 | ("onbattery" #$onbattery) |
| 552 | ("offbattery" #$offbattery) | 552 | ("offbattery" #$offbattery) |
| 553 | ("mainsback" #$mainsback) | 553 | ("mainsback" #$mainsback) |
| 554 | ("failing" #$failing) | 554 | ("failing" #$failing) |
| 555 | ("timeout" #$timeout) | 555 | ("timeout" #$timeout) |
| 556 | ("loadlimit" #$loadlimit) | 556 | ("loadlimit" #$loadlimit) |
| 557 | ("runlimit" #$runlimit) | 557 | ("runlimit" #$runlimit) |
| 558 | ("doreboot" #$doreboot) | 558 | ("doreboot" #$doreboot) |
| 559 | ("doshutdown" #$doshutdown) | 559 | ("doshutdown" #$doshutdown) |
| 560 | ("annoyme" #$annoyme) | 560 | ("annoyme" #$annoyme) |
| 561 | ("emergency" #$emergency) | 561 | ("emergency" #$emergency) |
| 562 | ("changeme" #$changeme) | 562 | ("changeme" #$changeme) |
| 563 | ("remotedown" #$remotedown) | 563 | ("remotedown" #$remotedown) |
| 564 | ("startselftest" #$startselftest) | 564 | ("startselftest" #$startselftest) |
| 565 | ("endselftest" #$endselftest) | 565 | ("endselftest" #$endselftest) |
| 566 | ("battdetach" #$battdetach) | 566 | ("battdetach" #$battdetach) |
| 567 | ("battattach" #$battattach) | 567 | ("battattach" #$battattach) |
| 568 | (_ | 568 | (_ |
| 569 | (err "Unknown event: ~a~%" cmd) | 569 | (err "Unknown event: ~a~%" cmd) |
| 570 | (err "Iff the event was emitted by apcupsd, this is a bug.~%") | 570 | (err "Iff the event was emitted by apcupsd, this is a bug.~%") |
diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm index ddb985e51bb..e167d2f689f 100644 --- a/gnu/services/ssh.scm +++ b/gnu/services/ssh.scm | |||
| @@ -624,7 +624,7 @@ object." | |||
| 624 | (ssh-options autossh-configuration-ssh-options | 624 | (ssh-options autossh-configuration-ssh-options |
| 625 | (default '())) | 625 | (default '())) |
| 626 | (auto-start? autossh-configuration-auto-start? | 626 | (auto-start? autossh-configuration-auto-start? |
| 627 | (default #t)) | 627 | (default #t)) |
| 628 | (shepherd-provision autossh-configuration-shepherd-provision | 628 | (shepherd-provision autossh-configuration-shepherd-provision |
| 629 | (default '(autossh)))) | 629 | (default '(autossh)))) |
| 630 | 630 | ||
diff --git a/gnu/services/virtualization.scm b/gnu/services/virtualization.scm index c6bf5360a6d..502894eb66b 100644 --- a/gnu/services/virtualization.scm +++ b/gnu/services/virtualization.scm | |||
| @@ -625,7 +625,7 @@ performs required management tasks for virtualized guests."))) | |||
| 625 | 625 | ||
| 626 | (define virtlog-service-type | 626 | (define virtlog-service-type |
| 627 | (service-type (name 'virtlogd) | 627 | (service-type (name 'virtlogd) |
| 628 | (extensions | 628 | (extensions |
| 629 | (list | 629 | (list |
| 630 | (service-extension shepherd-root-service-type | 630 | (service-extension shepherd-root-service-type |
| 631 | virtlogd-shepherd-service))) | 631 | virtlogd-shepherd-service))) |
diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 9bc1adf147a..a333d51aeac 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm | |||
| @@ -910,7 +910,7 @@ of index files." | |||
| 910 | (number->string server-names-hash-bucket-max-size) | 910 | (number->string server-names-hash-bucket-max-size) |
| 911 | ";\n") | 911 | ";\n") |
| 912 | "") | 912 | "") |
| 913 | (match extra-content | 913 | (match extra-content |
| 914 | ((? list? extra-content) | 914 | ((? list? extra-content) |
| 915 | (map (lambda (line) | 915 | (map (lambda (line) |
| 916 | `(" " ,line "\n")) | 916 | `(" " ,line "\n")) |
| @@ -2829,11 +2829,11 @@ Use absolute path like @code{\"/var/run/miniflux/miniflux.sock\"} for a Unix soc | |||
| 2829 | administrator-account-name administrator-account-password) | 2829 | administrator-account-name administrator-account-password) |
| 2830 | (let ((config-file (miniflux-configuration-file config))) | 2830 | (let ((config-file (miniflux-configuration-file config))) |
| 2831 | (list (shepherd-service | 2831 | (list (shepherd-service |
| 2832 | (documentation "Run Miniflux server") | 2832 | (documentation "Run Miniflux server") |
| 2833 | (provision '(miniflux)) | 2833 | (provision '(miniflux)) |
| 2834 | (requirement '(postgres networking)) | 2834 | (requirement '(postgres networking)) |
| 2835 | (start #~(make-forkexec-constructor | 2835 | (start #~(make-forkexec-constructor |
| 2836 | (list #$(least-authority-wrapper | 2836 | (list #$(least-authority-wrapper |
| 2837 | (file-append miniflux "/bin/miniflux") | 2837 | (file-append miniflux "/bin/miniflux") |
| 2838 | #:name "miniflux" | 2838 | #:name "miniflux" |
| 2839 | #:user user | 2839 | #:user user |
| @@ -2858,11 +2858,11 @@ Use absolute path like @code{\"/var/run/miniflux/miniflux.sock\"} for a Unix soc | |||
| 2858 | (fold delq %namespaces '(net user))) | 2858 | (fold delq %namespaces '(net user))) |
| 2859 | "-config-file" | 2859 | "-config-file" |
| 2860 | #$config-file) | 2860 | #$config-file) |
| 2861 | #:log-file #$log-file)) | 2861 | #:log-file #$log-file)) |
| 2862 | (stop #~(make-kill-destructor)) | 2862 | (stop #~(make-kill-destructor)) |
| 2863 | (actions | 2863 | (actions |
| 2864 | (list | 2864 | (list |
| 2865 | (shepherd-configuration-action config-file)))))))) | 2865 | (shepherd-configuration-action config-file)))))))) |
| 2866 | 2866 | ||
| 2867 | (define (miniflux-accounts config) | 2867 | (define (miniflux-accounts config) |
| 2868 | (match-record config <miniflux-configuration> | 2868 | (match-record config <miniflux-configuration> |
| @@ -2901,11 +2901,11 @@ Use absolute path like @code{\"/var/run/miniflux/miniflux.sock\"} for a Unix soc | |||
| 2901 | (default-value (miniflux-configuration)) | 2901 | (default-value (miniflux-configuration)) |
| 2902 | (extensions | 2902 | (extensions |
| 2903 | (list (service-extension account-service-type | 2903 | (list (service-extension account-service-type |
| 2904 | miniflux-accounts) | 2904 | miniflux-accounts) |
| 2905 | (service-extension postgresql-role-service-type | 2905 | (service-extension postgresql-role-service-type |
| 2906 | miniflux-postgresql-role) | 2906 | miniflux-postgresql-role) |
| 2907 | (service-extension shepherd-root-service-type | 2907 | (service-extension shepherd-root-service-type |
| 2908 | miniflux-shepherd-service) | 2908 | miniflux-shepherd-service) |
| 2909 | (service-extension log-rotation-service-type | 2909 | (service-extension log-rotation-service-type |
| 2910 | miniflux-log-files) | 2910 | miniflux-log-files) |
| 2911 | (service-extension activation-service-type | 2911 | (service-extension activation-service-type |
diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index 3dec5877ef8..412961828f2 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm | |||
| @@ -1187,12 +1187,12 @@ argument."))) | |||
| 1187 | (program-file | 1187 | (program-file |
| 1188 | "gdm-wayland-session-wrapper" | 1188 | "gdm-wayland-session-wrapper" |
| 1189 | #~((let* ((user (getpw (getuid))) | 1189 | #~((let* ((user (getpw (getuid))) |
| 1190 | (name (passwd:name user)) | 1190 | (name (passwd:name user)) |
| 1191 | (shell (passwd:shell user)) | 1191 | (shell (passwd:shell user)) |
| 1192 | (args (cdr (command-line)))) | 1192 | (args (cdr (command-line)))) |
| 1193 | (if (string=? name "gdm") | 1193 | (if (string=? name "gdm") |
| 1194 | (apply execl (cons (car args) args)) | 1194 | (apply execl (cons (car args) args)) |
| 1195 | (execl shell shell "--login" "-c" (string-join args))))))) | 1195 | (execl shell shell "--login" "-c" (string-join args))))))) |
| 1196 | 1196 | ||
| 1197 | (define-record-type* <gdm-configuration> | 1197 | (define-record-type* <gdm-configuration> |
| 1198 | gdm-configuration make-gdm-configuration | 1198 | gdm-configuration make-gdm-configuration |
