From 94bb98d6afa399bfe7fd018bf78870e130ee2d79 Mon Sep 17 00:00:00 2001
From: JEAN-FRANCOIS GUILLAUME <mrbear@yam-it.net>
Date: Tue, 10 May 2022 13:15:54 +0200
Subject: [PATCH] updating squid service

---
 glicid/services/networking.scm | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/glicid/services/networking.scm b/glicid/services/networking.scm
index f9350fb..e760423 100644
--- a/glicid/services/networking.scm
+++ b/glicid/services/networking.scm
@@ -23,13 +23,13 @@
     (default 3128)
   )
   (pid-file squid-configuration-pid-file
-    (default "/var/run/squid.pid")
+    (default "/var/run/squid/squid.pid")
   )
   (config-file squid-configuration-config-file
     (default (file-append squid "/etc/squid.conf"))
   )
   (log-file squid-configuration-log-file
-    (default "/var/log/squid.log")
+    (default "/var/log/squid/squid.log")
   )
 )
 
@@ -45,9 +45,6 @@
           (start #~(make-forkexec-constructor
             (list
               #$(file-append squid "/sbin/squid")
-              "-d ALL,1"
-              "-a" #$port
-              "-u" #$port
               "-f" #$config-file
             )
             #:pid-file #$pid-file 
@@ -56,9 +53,6 @@
           (stop #~(exec-command
             (list
               #$(file-append squid "/sbin/squid")
-              "-d"
-              "-a" #$port
-              "-u" #$port
               "-k" "shutdown"
               "-f" #$config-file
             )
@@ -72,9 +66,6 @@
               (procedure #~(exec-command
                 (list
                   #$(file-append squid "/sbin/squid")
-                  "-d"
-                  "-a" #$port
-                  "-u" #$port
                   "-k" "reconfigure"
                   "-f" #$config-file
                 )
@@ -91,9 +82,21 @@
 (define %squid-activation
   (with-imported-modules '((guix build utils))
     #~(begin
+        (define (touch file-name)
+          (call-with-output-file file-name (const #t))
+        )
         (use-modules (guix build utils))
         (mkdir-p "/var/run/squid")
+        (mkdir-p "/var/log/squid")
+        (mkdir-p "/var/cache/squid")
         (mkdir-p "/var/spool/squid")
+        (touch "/var/log/squid/squid_access.log")
+        (touch "/var/log/squid/squid_cache.log")
+        (touch "/var/log/squid/squid_cache_store.log")
+        (chown "/var/run/squid" "nobody" "nogroup")
+        (chown "/var/log/squid" "nobody" "nogroup")
+        (chown "/var/cache/squid" "nobody" "nogroup")
+        (chown "/var/spool/squid" "nobody" "nogroup")
         #t
     )
   )