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

Merge branch 'devel' into 'main'

Browse source 
updating squid service

See merge request glicid-public/guix-glicid!26
This commit is contained in:
Jean-François GUILLAUME 2022-05-12 20:43:52 +00:00
commit d5fd633470
1 changed files with 43 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

97
glicid/services/networking.scm
View file

@ -59,60 +59,49 @@
#:user (passwd:uid (getpwnam "squid")) #:user (passwd:uid (getpwnam "squid"))
#:group (passwd:gid (getpwnam "squid")) #:group (passwd:gid (getpwnam "squid"))
)) ))
(stop #~(lambda _ (exec-command (stop #~(make-kill-destructor))
(list ; TODO: find out why actions are not working
#$(file-append squid "/sbin/squid") ; (actions (list
"-d" #$loglevel ; (shepherd-action
"-N" ; (name 'reload)
"-k" "shutdown" ; (documentation "Reload the settings file from disk.")
"-f" #$config-file ; (procedure #~(lambda _ (exec-command
) ; (list
#:pid-file #$pid-file ; #$(file-append squid "/sbin/squid")
#:log-file #$log-file ; "-d" #$loglevel
#:user (passwd:uid (getpwnam "squid")) ; "-N"
#:group (passwd:gid (getpwnam "squid")) ; "-k" "reconfigure"
))) ; "-f" #$config-file
(actions (list ; )
(shepherd-action ; )#t))
(name 'reload) ; )
(documentation "Reload the settings file from disk.") ; (shepherd-action
(procedure #~(lambda _ (exec-command ; (name 'check-config)
(list ; (documentation "Check the settings file from disk.")
#$(file-append squid "/sbin/squid") ; (procedure #~(lambda _ (exec-command
"-d" #$loglevel ; (list
"-N" ; #$(file-append squid "/sbin/squid")
"-k" "reconfigure" ; "-d" #$loglevel
"-f" #$config-file ; "-N"
) ; "-k" "parse"
)#t)) ; "-f" #$config-file
) ; )
(shepherd-action ; )#t))
(name 'check-config) ; )
(documentation "Check the settings file from disk.") ; (shepherd-action
(procedure #~(lambda _ (exec-command ; (name 'kill)
(list ; (documentation "Ultimatly kill the squid process.")
#$(file-append squid "/sbin/squid") ; (procedure #~(lambda _ (exec-command
"-d" #$loglevel ; (list
"-N" ; #$(file-append squid "/sbin/squid")
"-k" "parse" ; "-d" #$loglevel
"-f" #$config-file ; "-N"
) ; "-k" "kill"
)#t)) ; "-f" #$config-file
) ; )
(shepherd-action ; )#t))
(name 'kill) ; )
(documentation "Ultimatly kill the squid process.") ; ))
(procedure #~(lambda _ (exec-command
(list
#$(file-append squid "/sbin/squid")
"-d" #$loglevel
"-N"
"-k" "kill"
"-f" #$config-file
)
)#t))
)
))
) )
) )
) )