mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-05-12 15:44:35 +02:00
40b30d19d6
The current behaviour of the configuration directory was required by the upstream, but it doesn't conform to established conventions used by virtually all programs on Linux that support modular configuration, and what the users naturally expect. Also, when someone used to vanilla OpenDoas or doas on BSD comes to Alpine, the way they're used to configuring it (via /etc/doas.conf) will no work without notice! It has already caused some problems and confusion. The current behaviour is: if /etc/doas.d exists, there must be at least one *.conf file and /etc/doas.conf is *ignored*. Since it doesn't look like the upstream will ever merge this, better to fix this patch to work as it should from the beginning... This new behaviour: /etc/doas.conf must always exist (as in unpatched OpenDoas) and will be read first; if /etc/doas.d exists and there are any *.conf files, they will be loaded as well. This commit also cleans up these messy install scripts.
65 lines
2.2 KiB
Bash
65 lines
2.2 KiB
Bash
#!/bin/sh
|
|
|
|
ver_old="$2"
|
|
|
|
if [ "$(apk version -t "$ver_old" '6.8.1-r6')" = '<' ]; then
|
|
if [ "$(stat -c "%a" /etc/doas.d)" = "755" ]; then
|
|
chmod 0750 /etc/doas.d
|
|
fi
|
|
fi
|
|
|
|
if [ "$(apk version -t "$ver_old" '6.8.1-r4')" = '<' ]; then
|
|
: # do nothing, this is prior renaming /etc/doas.conf to /etc/doas.d/doas.conf
|
|
|
|
# Undo what was done by the previous post-{install,upgrade} script.
|
|
elif [ "$(apk version -t "$ver_old" '6.8.2-r5')" = '<' ]; then
|
|
cat >&2 <<-EOF
|
|
*
|
|
* Since 6.8.2-r5, doas reads both /etc/doas.conf and /etc/doas.d/*.conf
|
|
* (if exists), in this order, and /etc/doas.conf is required to exist.
|
|
*
|
|
EOF
|
|
if [ -L /etc/doas.conf ] && [ "$(readlink -f /etc/doas.conf)" = '/etc/doas.d/doas.conf' ]; then
|
|
cat >&2 <<-EOF
|
|
* Removing /etc/doas.conf symlink and moving /etc/doas.d/doas.conf
|
|
* to /etc/doas.conf.
|
|
*
|
|
EOF
|
|
rm /etc/doas.conf # symlink
|
|
mv /etc/doas.d/doas.conf /etc/doas.conf # user's config
|
|
|
|
# Remove outdated comment added by the previous post-upgrade script.
|
|
# Note: /etc/doas.conf.apk-new has been created by the upgrade,
|
|
# so it already has correct perms.
|
|
cat /etc/doas.conf \
|
|
| tr '\n' '\f' \
|
|
| sed 's|# This file is actually located at /etc/doas.d/doas.conf, and reflects\f# the system doas configuration. It may have been migrated from its\f# previous location, /etc/doas.conf, automatically.\f||' \
|
|
| tr '\f' '\n' \
|
|
> /etc/doas.conf.apk-new
|
|
|
|
# Note: If /etc/doas.conf existed, the package upgrade has created
|
|
# doas.conf.apk-new.
|
|
elif [ -f /etc/doas.conf ] && [ -f /etc/doas.conf.apk-new ] && [ "$(ls /etc/doas.d/*.conf 2>/dev/null)" ]; then
|
|
bakfile='/etc/doas.conf.bak'
|
|
[ -e "$bakfile" ] && bakfile="$bakfile$(date +%s)"
|
|
|
|
cat >&2 <<-EOF
|
|
*! CAUTION: /etc/doas.conf already exists and /etc/doas.d is not empty,
|
|
*! so it's been ignored until now! Renaming it to $bakfile.
|
|
*! It's strongly recommended that you check your configuration!
|
|
*
|
|
EOF
|
|
mv /etc/doas.conf "$bakfile" # user's config
|
|
mv /etc/doas.conf.apk-new /etc/doas.conf # new config
|
|
|
|
elif [ -f /etc/doas.d/doas.conf ]; then
|
|
cat >&2 <<-EOF
|
|
* Moving /etc/doas.d/doas.conf to /etc/doas.conf.
|
|
*
|
|
EOF
|
|
mv /etc/doas.conf /etc/doas.conf.apk-new # new config
|
|
mv /etc/doas.d/doas.conf /etc/doas.conf # user's config
|
|
fi
|
|
fi
|
|
|
|
exit 0
|