diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-09-15 10:20:32 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-09-15 10:20:32 -0400 |
| commit | 3d297a0017210f1dd135592efb10846840a8af88 (patch) | |
| tree | 8868c35a558a6288b5097d65bee42dda291178e4 /gnu/services/web.scm | |
| parent | 279349209e44aaae6ca2aba328fe2a4d2da99f12 (diff) | |
| parent | 6737d8d3248301e65bc24291b1a776e4aa8c3648 (diff) | |
| download | guix-3d297a0017210f1dd135592efb10846840a8af88.tar.gz | |
Merge branch 'master' into staging
With resolved conflicts in: gnu/local.mk gnu/packages/freedesktop.scm gnu/packages/gnuzilla.scm
Diffstat (limited to 'gnu/services/web.scm')
| -rw-r--r-- | gnu/services/web.scm | 66 |
1 files changed, 36 insertions, 30 deletions
diff --git a/gnu/services/web.scm b/gnu/services/web.scm index b144cf7076..5bac496f01 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -1393,7 +1393,7 @@ files.") (replacement anonip-configuration-replacement ;string (default #f)) (ipv4mask anonip-configuration-ipv4mask ;number - (default #f)) + (default #f)) (ipv6mask anonip-configuration-ipv6mask ;number (default #f)) (increment anonip-configuration-increment ;number @@ -1425,35 +1425,41 @@ files.") (format #false "~a=~a" option value)))) (list))))) - (list (shepherd-service - (provision (list (symbol-append 'anonip- (string->symbol output)))) - (requirement '(user-processes)) - (documentation "Anonimyze the given log file location with anonip.") - (start #~(lambda _ - (unless (file-exists? #$input) - (mknod #$input 'fifo #o600 0)) - (let ((pid (fork+exec-command - (append - (list #$(file-append (anonip-configuration-anonip config) - "/bin/anonip") - (string-append "--input=" #$input) - (string-append "--output=" #$output)) - (if #$(anonip-configuration-skip-private? config) - '("--skip-private") (list)) - '#$(optional anonip-configuration-column "--column") - '#$(optional anonip-configuration-ipv4mask "--ipv4mask") - '#$(optional anonip-configuration-ipv6mask "--ipv6mask") - '#$(optional anonip-configuration-increment "--increment") - '#$(optional anonip-configuration-replacement "--replacement") - '#$(optional anonip-configuration-delimiter "--delimiter") - '#$(optional anonip-configuration-regex "--regex")) - ;; Run in a UTF-8 locale - #:environment-variables - (list (string-append "GUIX_LOCPATH=" #$glibc-utf8-locales - "/lib/locale") - "LC_ALL=en_US.utf8")))) - pid))) - (stop #~(make-kill-destructor)))))) + (list + (shepherd-service + (provision + (list (symbol-append 'anonip- (string->symbol output)))) + (requirement '(user-processes)) + (documentation + "Anonimyze the given log file location with anonip.") + (start + #~(lambda _ + (unless (file-exists? #$input) + (mknod #$input 'fifo #o600 0)) + (let ((pid + (fork+exec-command + (append + (list #$(file-append (anonip-configuration-anonip config) + "/bin/anonip") + (string-append "--input=" #$input) + (string-append "--output=" #$output)) + (if #$(anonip-configuration-skip-private? config) + '("--skip-private") (list)) + '#$(optional anonip-configuration-column "--column") + '#$(optional anonip-configuration-ipv4mask "--ipv4mask") + '#$(optional anonip-configuration-ipv6mask "--ipv6mask") + '#$(optional anonip-configuration-increment "--increment") + '#$(optional anonip-configuration-replacement + "--replacement") + '#$(optional anonip-configuration-delimiter "--delimiter") + '#$(optional anonip-configuration-regex "--regex")) + ;; Run in a UTF-8 locale + #:environment-variables + (list (string-append "GUIX_LOCPATH=" #$glibc-utf8-locales + "/lib/locale") + "LC_ALL=en_US.utf8")))) + pid))) + (stop #~(make-kill-destructor)))))) (define anonip-service-type (service-type |