Merge branch 'devel' into 'main'

squid

See merge request glicid-public/guix-glicid!156
This commit is contained in:
Jean-François GUILLAUME 2022-11-30 15:53:36 +00:00
commit 5f87cbdd92

View file

@ -18,10 +18,10 @@
<squid-configuration>
squid-configuration make-squid-configuration
squid-configuration?
(squid-pkg squid-pkg (default squid))
(squid-port squid-port (default 3128))
(squid-loglevel squid-loglevel (default 1))
(squid-config-file squid-config-file (default (file-append squid "/etc/squid.conf")))
(pkg squid-pkg (default squid))
(port squid-port (default 3128))
(loglevel squid-loglevel (default 1))
(config-file squid-config-file (default (file-append squid "/etc/squid.conf")))
(pid-file squid-pid-file (default "/var/run/squid/squid.pid"))
(log-file squid-log-file (default "/var/log/squid/squid.log")))
@ -36,8 +36,8 @@
(respawn? #t)
(start #~(make-forkexec-constructor
(list
#$(file-append squid-pkg "/sbin/squid")
"-f" #$squid-config-file
#$(file-append pkg "/sbin/squid")
"-f" #$config-file
)
#:pid-file #$pid-file
#:log-file #$log-file