GLiCID/guix-glicid
7
0
Fork 0
mirror of https://gitlab.univ-nantes.fr/glicid-public/guix-glicid.git synced 2025-04-29 21:58:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

updating squid service

Browse source
This commit is contained in:
Jean-François GUILLAUME 2022-05-10 13:15:54 +02:00
parent 7ce1527394
commit 94bb98d6af
Signed by: Jean-François GUILLAUME
GPG key ID: 38751DAE145EFB5A
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
glicid/services/networking.scm
View file

@ -23,13 +23,13 @@
(default 3128) (default 3128)
) )
(pid-file squid-configuration-pid-file (pid-file squid-configuration-pid-file
(default "/var/run/squid.pid") (default "/var/run/squid/squid.pid")
) )
(config-file squid-configuration-config-file (config-file squid-configuration-config-file
(default (file-append squid "/etc/squid.conf")) (default (file-append squid "/etc/squid.conf"))
) )
(log-file squid-configuration-log-file (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 (start #~(make-forkexec-constructor
(list (list
#$(file-append squid "/sbin/squid") #$(file-append squid "/sbin/squid")
"-d ALL,1"
"-a" #$port
"-u" #$port
"-f" #$config-file "-f" #$config-file
) )
#:pid-file #$pid-file #:pid-file #$pid-file
@ -56,9 +53,6 @@
(stop #~(exec-command (stop #~(exec-command
(list (list
#$(file-append squid "/sbin/squid") #$(file-append squid "/sbin/squid")
"-d"
"-a" #$port
"-u" #$port
"-k" "shutdown" "-k" "shutdown"
"-f" #$config-file "-f" #$config-file
) )
@ -72,9 +66,6 @@
(procedure #~(exec-command (procedure #~(exec-command
(list (list
#$(file-append squid "/sbin/squid") #$(file-append squid "/sbin/squid")
"-d"
"-a" #$port
"-u" #$port
"-k" "reconfigure" "-k" "reconfigure"
"-f" #$config-file "-f" #$config-file
) )
@ -91,9 +82,21 @@
(define %squid-activation (define %squid-activation
(with-imported-modules '((guix build utils)) (with-imported-modules '((guix build utils))
#~(begin #~(begin
(define (touch file-name)
(call-with-output-file file-name (const #t))
)
(use-modules (guix build utils)) (use-modules (guix build utils))
(mkdir-p "/var/run/squid") (mkdir-p "/var/run/squid")
(mkdir-p "/var/log/squid")
(mkdir-p "/var/cache/squid")
(mkdir-p "/var/spool/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 #t
) )
) )