diff options
Diffstat (limited to 'gnu/services')
| -rw-r--r-- | gnu/services/upnp.scm | 136 |
1 files changed, 72 insertions, 64 deletions
diff --git a/gnu/services/upnp.scm b/gnu/services/upnp.scm index 8267b1e53af..e0b9b974b93 100644 --- a/gnu/services/upnp.scm +++ b/gnu/services/upnp.scm @@ -32,8 +32,7 @@ #:use-module (guix records) #:use-module (ice-9 match) #:export (%readymedia-default-cache-directory - %readymedia-default-log-directory - %readymedia-log-file + %readymedia-default-log-file %readymedia-user-account %readymedia-user-group readymedia-configuration @@ -59,9 +58,16 @@ ;;; ;;; Code: -(define %readymedia-default-cache-directory "/var/cache/readymedia") -(define %readymedia-default-log-directory "/var/log/readymedia") -(define %readymedia-log-file "minidlna.log") +(define* (%readymedia-default-cache-directory #:key (home-service? #f)) + (if home-service? + ".cache/readymedia" + "/var/cache/readymedia")) +(define* (%readymedia-default-log-file #:key (home-service? #f)) + (if home-service? + #~(begin + (use-modules (shepherd support)) ;for %user-log-dir + (string-append %user-log-dir "/readymedia.log")) + "/var/log/readymedia.log")) (define %readymedia-user-group "readymedia") (define %readymedia-user-account "readymedia") @@ -73,20 +79,11 @@ (port readymedia-configuration-port (default #f)) (cache-directory readymedia-configuration-cache-directory - (default (if for-home? - (string-append (or (getenv "XDG_CACHE_HOME") - (string-append - (getenv "HOME") "/.cache")) - "/readymedia") - %readymedia-default-cache-directory))) - (log-directory readymedia-configuration-log-directory - (default (if for-home? - (string-append (or (getenv "XDG_STATE_HOME") - (string-append - (getenv "HOME") - "/.local/state")) - "/readymedia") - %readymedia-default-log-directory))) + (default (%readymedia-default-cache-directory + #:home-service? for-home?))) + (log-file readymedia-configuration-log-directory + (default (%readymedia-default-log-file + #:home-service? for-home?))) (friendly-name readymedia-configuration-friendly-name (default #f)) (media-directories readymedia-configuration-media-directories) @@ -110,15 +107,11 @@ (define (readymedia-configuration->config-file config) "Return the ReadyMedia/MiniDLNA configuration file corresponding to CONFIG." (match-record config <readymedia-configuration> - (port friendly-name cache-directory log-directory media-directories - extra-config home-service?) + (port friendly-name cache-directory media-directories extra-config + home-service?) (apply mixed-text-file "minidlna.conf" - (if home-service? - (string-append "user=" (number->string (getuid)) "\n") - "") "db_dir=" cache-directory "\n" - "log_dir=" log-directory "\n" (if friendly-name (string-append "friendly_name=" friendly-name "\n") "") @@ -143,42 +136,54 @@ (define (readymedia-shepherd-service config) "Return a least-authority ReadyMedia/MiniDLNA Shepherd service." (match-record config <readymedia-configuration> - (cache-directory log-directory media-directories home-service?) + (cache-directory log-file media-directories home-service?) (let ((minidlna-conf (readymedia-configuration->config-file config))) (shepherd-service (documentation "Run the ReadyMedia/MiniDLNA daemon.") (provision '(readymedia)) (requirement (if home-service? '() '(networking user-processes))) + (modules '((shepherd support))) ;for %user-log-dir (start - #~(make-forkexec-constructor - (list #$(least-authority-wrapper - (file-append (readymedia-configuration-readymedia config) - "/sbin/minidlnad") - #:name "minidlna" - #:mappings - (cons* (file-system-mapping - (source cache-directory) - (target source) - (writable? #t)) - (file-system-mapping - (source log-directory) - (target source) - (writable? #t)) - (file-system-mapping - (source minidlna-conf) - (target source)) - (map (lambda (directory) - (file-system-mapping - (source (readymedia-media-directory-path directory)) - (target source))) - media-directories)) - #:namespaces (delq 'net %namespaces)) - "-f" - #$minidlna-conf - "-S") - #:log-file #$(string-append log-directory "/" %readymedia-log-file) - #:user #$(if home-service? #f %readymedia-user-account) - #:group #$(if home-service? #f %readymedia-user-group))) + (if (not home-service?) + #~(make-forkexec-constructor + (list #$(least-authority-wrapper + (file-append (readymedia-configuration-readymedia + config) + "/sbin/minidlnad") + #:name "minidlna" + #:mappings + (cons* (file-system-mapping + (source cache-directory) + (target source) + (writable? #t)) + (file-system-mapping + (source minidlna-conf) + (target source)) + (map (lambda (directory) + (file-system-mapping + (source (readymedia-media-directory-path + directory)) + (target source))) + media-directories)) + #:namespaces (delq 'net %namespaces)) + "-f" + #$minidlna-conf + "-S") + #:log-file #$log-file + #:user #$(if home-service? #f %readymedia-user-account) + #:group #$(if home-service? #f %readymedia-user-group)) + + ;; Relative paths to home directories are not being able to be + ;; mapped within the least-authority-wrapper. So, for home we use + ;; the program without wrapping it. + #~(make-forkexec-constructor + (list #$(file-append (readymedia-configuration-readymedia + config) + "/sbin/minidlnad") + "-f" + #$minidlna-conf + "-S") + #:log-file #$log-file))) (stop #~(make-kill-destructor)))))) (define readymedia-accounts @@ -196,7 +201,7 @@ (define (readymedia-activation config) "Set up directories for ReadyMedia/MiniDLNA." (match-record config <readymedia-configuration> - (cache-directory log-directory media-directories home-service?) + (cache-directory media-directories home-service?) (with-imported-modules (source-module-closure '((gnu build activation))) #~(begin (use-modules (gnu build activation)) @@ -210,14 +215,17 @@ #$(if home-service? #o755 #o775)))) (list #$@(map readymedia-media-directory-path media-directories))) - (for-each (lambda (directory) - (unless (file-exists? directory) - (mkdir-p/perms directory - (getpw #$(if home-service? - #~(getuid) - %readymedia-user-account)) - #o755))) - (list #$cache-directory #$log-directory)))))) + (unless (file-exists? directory) + (mkdir-p/perms (if (absolute-file-name? #$cache-directory) + #$cache-directory + (string-append (or (getenv "HOME") + (passwd:dir + (getpwuid (getuid)))) + "/" #$cache-directory)) + (getpw #$(if home-service? + #~(getuid) + %readymedia-user-account)) + #o755)))))) (define readymedia-service-type (service-type |