Merge branch 'devel' into 'main'

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

View file

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