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!19
This commit is contained in:
Jean-François GUILLAUME 2022-05-12 08:40:42 +00:00
commit 2e1e228ad5
1 changed files with 68 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
glicid/services/networking.scm
View file

@ -1,7 +1,9 @@
(define-module (glicid services networking) (define-module (glicid services networking)
#:use-module (gnu packages bash)
#:use-module (gnu packages networking) #:use-module (gnu packages networking)
#:use-module (gnu services) #:use-module (gnu services)
#:use-module (gnu services shepherd) #:use-module (gnu services shepherd)
#:use-module (gnu system shadow)
#:use-module (guix) #:use-module (guix)
#:use-module (guix records) #:use-module (guix records)
#:use-module (ice-9 match) #:use-module (ice-9 match)
@ -22,6 +24,9 @@
(port squid-configuration-port (port squid-configuration-port
(default 3128) (default 3128)
) )
(loglevel squid-configuration-loglevel
(default 1)
)
(pid-file squid-configuration-pid-file (pid-file squid-configuration-pid-file
(default "/var/run/squid/squid.pid") (default "/var/run/squid/squid.pid")
) )
@ -45,25 +50,25 @@
(start #~(make-forkexec-constructor (start #~(make-forkexec-constructor
(list (list
#$(file-append squid "/sbin/squid") #$(file-append squid "/sbin/squid")
"-d 1" "-d" #$loglevel
"--foreground" "-N"
"-f" #$config-file "-f" #$config-file
) )
#:pid-file #$pid-file #:pid-file #$pid-file
#:log-file #$log-file #:log-file #$log-file
#:user (passwd:uid (getpwnam "nobody")) #:user (passwd:uid (getpwnam "squid"))
)) ))
(stop #~(exec-command (stop #~(exec-command
(list (list
#$(file-append squid "/sbin/squid") #$(file-append squid "/sbin/squid")
"-d 1" "-d" #$loglevel
"--foreground" "-N"
"-k" "shutdown" "-k" "shutdown"
"-f" #$config-file "-f" #$config-file
) )
#:pid-file #$pid-file #:pid-file #$pid-file
#:log-file #$log-file #:log-file #$log-file
#:user (passwd:uid (getpwnam "nobody")) #:user (passwd:uid (getpwnam "squid"))
)) ))
(actions (list (actions (list
(shepherd-action (shepherd-action
@ -72,14 +77,46 @@
(procedure #~(exec-command (procedure #~(exec-command
(list (list
#$(file-append squid "/sbin/squid") #$(file-append squid "/sbin/squid")
"-d 1" "-d" #$loglevel
"--foreground" "-N"
"-k" "reconfigure" "-k" "reconfigure"
"-f" #$config-file "-f" #$config-file
) )
#:pid-file #$pid-file #:pid-file #$pid-file
#:log-file #$log-file #:log-file #$log-file
#:user (passwd:uid (getpwnam "nobody")) #:user (passwd:uid (getpwnam "squid"))
))
)
(shepherd-action
(name 'check-config)
(documentation "Check the settings file from disk.")
(procedure #~(exec-command
(list
#$(file-append squid "/sbin/squid")
"-d" #$loglevel
"-N"
"-k" "parse"
"-f" #$config-file
)
#:pid-file #$pid-file
#:log-file #$log-file
#:user (passwd:uid (getpwnam "squid"))
))
)
(shepherd-action
(name 'kill)
(documentation "Ultimatly kill the squid process.")
(procedure #~(exec-command
(list
#$(file-append squid "/sbin/squid")
"-d" #$loglevel
"-N"
"-k" "kill"
"-f" #$config-file
)
#:pid-file #$pid-file
#:log-file #$log-file
#:user (passwd:uid (getpwnam "squid"))
)) ))
) )
)) ))
@ -104,24 +141,39 @@
(touch "/var/log/squid/squid_access.log") (touch "/var/log/squid/squid_access.log")
(touch "/var/log/squid/squid_cache.log") (touch "/var/log/squid/squid_cache.log")
(touch "/var/log/squid/squid_cache_store.log") (touch "/var/log/squid/squid_cache_store.log")
(chown "/var/run/squid" (passwd:uid (getpwnam "nobody"))) (chown "/var/run/squid" (passwd:uid (getpwnam "squid")))
(chown "/var/log/squid" (passwd:uid (getpwnam "nobody"))) (chown "/var/log/squid" (passwd:uid (getpwnam "squid")))
(chown "/var/cache/squid" (passwd:uid (getpwnam "nobody"))) (chown "/var/cache/squid" (passwd:uid (getpwnam "squid")))
(chown "/var/spool/squid" (passwd:uid (getpwnam "nobody"))) (chown "/var/spool/squid" (passwd:uid (getpwnam "squid")))
(chown "/var/log/squid/squid_access.log" (passwd:uid (getpwnam "nobody"))) (chown "/var/log/squid/squid_access.log" (passwd:uid (getpwnam "squid")))
(chown "/var/log/squid/squid_cache.log" (passwd:uid (getpwnam "nobody"))) (chown "/var/log/squid/squid_cache.log" (passwd:uid (getpwnam "squid")))
(chown "/var/log/squid/squid_cache_store.log" (passwd:uid (getpwnam "nobody"))) (chown "/var/log/squid/squid_cache_store.log" (passwd:uid (getpwnam "squid")))
#t #t
) )
) )
) )
(define %squid-accounts
(list
(user-group (name "squid") (system? #t))
(user-account
(name "squid")
(group "squid")
(system? #t)
(comment "Squid server user")
(home-directory "/var/spool/squid")
(shell (file-append bash "/bin/bash"))
)
)
)
(define squid-service-type (define squid-service-type
(service-type (name 'squid) (service-type (name 'squid)
(extensions (extensions
(list (list
(service-extension shepherd-root-service-type squid-shepherd-service) (service-extension shepherd-root-service-type squid-shepherd-service)
(service-extension activation-service-type (const %squid-activation)) (service-extension activation-service-type (const %squid-activation))
(service-extension account-service-type (const %squid-accounts))
) )
) )
(description "Run @uref{http://www.squid-cache.org/, squid} community developped Squid software.") (description "Run @uref{http://www.squid-cache.org/, squid} community developped Squid software.")