summaryrefslogtreecommitdiffstats
path: root/config/chroot_local-includes/lib
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2018-11-17 17:32:57 +0000
committerintrigeri <intrigeri@boum.org>2018-11-17 17:32:57 +0000
commit78d9bdff7f4e2747e70f1fe4f73b16486f6c2241 (patch)
tree898c7a0af07c4b1688b164898caaac4e1cb0ba7e /config/chroot_local-includes/lib
parent5225742f02f43d2207ed1c206e09bb5f8dc22559 (diff)
Rename pools to avoid confusion (refs: #15428)
People get confused by the use of pal/neutral/foe: they think we need to particularly trust members of the "pal" pool, which is incorrect and can lead to useless controversy. So let's fix this by renaming the pools and clarifying our design doc.
Diffstat (limited to 'config/chroot_local-includes/lib')
-rw-r--r--config/chroot_local-includes/lib/systemd/system/htpdate.service14
1 files changed, 7 insertions, 7 deletions
diff --git a/config/chroot_local-includes/lib/systemd/system/htpdate.service b/config/chroot_local-includes/lib/systemd/system/htpdate.service
index 6d956c6..dda8aef 100644
--- a/config/chroot_local-includes/lib/systemd/system/htpdate.service
+++ b/config/chroot_local-includes/lib/systemd/system/htpdate.service
@@ -11,10 +11,10 @@ Environment=SUCCESS_FILE=/run/htpdate/success
Environment=LOG=/var/log/htpdate.log
EnvironmentFile=/etc/default/htpdate.*
ExecStartPre=/bin/sh -c \
- '[ -n "${HTTP_USER_AGENT}" ] && \
- [ -n "${HTP_POOL_PAL}" ] && \
- [ -n "${HTP_POOL_NEUTRAL}" ] && \
- [ -n "${HTP_POOL_FOE}" ]'
+ '[ -n "${HTTP_USER_AGENT}" ] && \
+ [ -n "${HTP_POOL_1}" ] && \
+ [ -n "${HTP_POOL_2}" ] && \
+ [ -n "${HTP_POOL_3}" ]'
ExecStartPre=/bin/rm -f "${DONE_FILE}"
ExecStartPre=/bin/rm -f "${SUCCESS_FILE}"
ExecStartPre=/usr/bin/install -o htp -g nogroup -m 0644 /dev/null "${LOG}"
@@ -26,9 +26,9 @@ ExecStart=/usr/local/sbin/htpdate \
--user htp \
--done_file "${DONE_FILE}" \
--success_file "${SUCCESS_FILE}" \
- --pal_pool "${HTP_POOL_PAL}" \
- --neutral_pool "${HTP_POOL_NEUTRAL}" \
- --foe_pool "${HTP_POOL_FOE}" \
+ --pool1 "${HTP_POOL_1}" \
+ --pool2 "${HTP_POOL_2}" \
+ --pool3 "${HTP_POOL_3}" \
--proxy 127.0.0.1:9062
RemainAfterExit=yes
CapabilityBoundingSet=CAP_CHOWN CAP_FOWNER CAP_SETUID CAP_SYS_TIME