services: readymedia: Fix configurations.

* gnu/services/upnp.scm (%readymedia-default-log-directory): Remove variable.
(%readymedia-default-log-file): New procedure.
(%readymedia-default-cache-directory): Turn it into a procedure.
(<readymedia-configuration>)[log-directory]: Remove field.
[log-file]: New field.
[cache-directory]: Set to %readymedia-default-cache-directory.
(readymedia-configuration->config-file): Remove "user" and "log_dir" fields.
(readymedia-shepherd-service)[modules]: Add (shepherd support).
[start]: Do not map the log-directory. For home services, do not wrap the
program with least-authority-wrapper.
(readymedia-activation): Do not create the log-directory.
* gnu/home/services/upnp.scm (%readymedia-cache-file, %readymedia-cache-path,
%readymedia-log-path): Remove variables.
(run-readymedia-test): Use the procedures properly. Do not test the
log directory. Test the log file.
* doc/guix.texi (Miscellaneous Services)[DLNA/UPnP Services]: Update doc.

Change-Id: I97d84b5287c374ddb26a495f20a36f986b0c142d
Signed-off-by: Giacomo Leidi <therewasa@fishinthecalculator.me>

1 files changed, 6 insertions, 37 deletions

diff --git a/gnu/tests/upnp.scm b/gnu/tests/upnp.scm
index 079df6c7771..547351b4463 100644
--- a/gnu/tests/upnp.scm
+++ b/gnu/tests/upnp.scm
@@ -25,15 +25,6 @@
   #:use-module (guix gexp)
   #:export (%test-readymedia))
 
-(define %readymedia-cache-file "files.db")
-(define %readymedia-cache-path
-  (string-append %readymedia-default-cache-directory
-                 "/"
-                 %readymedia-cache-file))
-(define %readymedia-log-path
-  (string-append %readymedia-default-log-directory
-                 "/"
-                 %readymedia-log-file))
 (define %readymedia-default-port 8200)
 (define %readymedia-media-directory "/media")
 (define %readymedia-configuration-test
@@ -83,51 +74,29 @@
                 #t)
              marionette))
 
-          ;; Cache directory and file
+          ;; Cache directory
           (test-assert "cache directory exists"
             (marionette-eval
-             '(eq? (stat:type (stat #$%readymedia-default-cache-directory))
+             '(eq? (stat:type (stat #$(%readymedia-default-cache-directory)))
                    'directory)
              marionette))
           (test-assert "cache directory has correct ownership"
             (marionette-eval
-             '(let ((cache-dir (stat #$%readymedia-default-cache-directory))
+             '(let ((cache-dir (stat #$(%readymedia-default-cache-directory)))
                     (user (getpwnam #$%readymedia-user-account)))
                 (and (eqv? (stat:uid cache-dir) (passwd:uid user))
                      (eqv? (stat:gid cache-dir) (passwd:gid user))))
              marionette))
           (test-assert "cache directory has expected permissions"
             (marionette-eval
-             '(eqv? (stat:perms (stat #$%readymedia-default-cache-directory))
+             '(eqv? (stat:perms (stat #$(%readymedia-default-cache-directory)))
                     #o755)
              marionette))
 
-          ;; Log directory and file
-          (test-assert "log directory exists"
-            (marionette-eval
-             '(eq? (stat:type (stat #$%readymedia-default-log-directory))
-                   'directory)
-             marionette))
-          (test-assert "log directory has correct ownership"
-            (marionette-eval
-             '(let ((log-dir (stat #$%readymedia-default-log-directory))
-                    (user (getpwnam #$%readymedia-user-account)))
-                (and (eqv? (stat:uid log-dir) (passwd:uid user))
-                     (eqv? (stat:gid log-dir) (passwd:gid user))))
-             marionette))
-          (test-assert "log directory has expected permissions"
-            (marionette-eval
-             '(eqv? (stat:perms (stat #$%readymedia-default-log-directory))
-                    #o755)
-             marionette))
+          ;; Log file
           (test-assert "log file exists"
             (marionette-eval
-             '(file-exists? #$%readymedia-log-path)
-             marionette))
-          (test-assert "log file has expected permissions"
-            (marionette-eval
-             '(eqv? (stat:perms (stat #$%readymedia-log-path))
-                    #o640)
+             '(file-exists? #$(%readymedia-default-log-file))
              marionette))
 
           ;; Service