forked from pool/dehydrated
Marcus Rueckert
fc9dddc9f9
- Add man page - Ensure dehydrated is always run as designated user * adds 0001-Add-optional-user-and-group-configuration.patch - Introduce config.d directory for user configuration - Avoid warning about empty config.d directory * adds 0002-use-nullglob-disable-warning-on-empty-CONFIG_D-direc.patch - Fix sed warning about unescaped curly braces in regex - Use timer instead of cron for systemd-enabled distros Note: Timer must be explicitly enabled! OBS-URL: https://build.opensuse.org/request/show/528299 OBS-URL: https://build.opensuse.org/package/show/security:dehydrated/dehydrated?expand=0&rev=11
50 lines
1.8 KiB
Diff
50 lines
1.8 KiB
Diff
From 5214632c55c70c6c1f0dabce204a9fb8529c8ca8 Mon Sep 17 00:00:00 2001
|
|
From: Lukas Schauer <lukas@schauer.so>
|
|
Date: Thu, 21 Sep 2017 18:10:01 +0200
|
|
Subject: [PATCH] use nullglob, disable warning on empty CONFIG_D directory
|
|
|
|
---
|
|
dehydrated | 12 ++++--------
|
|
1 file changed, 4 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/dehydrated b/dehydrated
|
|
index 8b31ee1..a62b858 100755
|
|
--- a/dehydrated
|
|
+++ b/dehydrated
|
|
@@ -8,7 +8,9 @@
|
|
set -e
|
|
set -u
|
|
set -o pipefail
|
|
-[[ -n "${ZSH_VERSION:-}" ]] && set -o SH_WORD_SPLIT && set +o FUNCTION_ARGZERO
|
|
+[[ -n "${ZSH_VERSION:-}" ]] && set -o SH_WORD_SPLIT && set +o FUNCTION_ARGZERO && set -o NULL_GLOB
|
|
+[[ -z "${ZSH_VERSION:-}" ]] && shopt -s nullglob
|
|
+
|
|
umask 077 # paranoid umask, we're creating private keys
|
|
|
|
# Find directory in which this script is stored by traversing all symbolic links
|
|
@@ -146,10 +148,7 @@ load_config() {
|
|
fi
|
|
|
|
for check_config_d in "${CONFIG_D}"/*.sh; do
|
|
- if [[ ! -e "${check_config_d}" ]]; then
|
|
- echo "# !! WARNING !! Extra configuration directory ${CONFIG_D} exists, but no configuration found in it." >&2
|
|
- break
|
|
- elif [[ -f "${check_config_d}" ]] && [[ -r "${check_config_d}" ]]; then
|
|
+ if [[ -f "${check_config_d}" ]] && [[ -r "${check_config_d}" ]]; then
|
|
echo "# INFO: Using additional config file ${check_config_d}"
|
|
# shellcheck disable=SC1090
|
|
. "${check_config_d}"
|
|
@@ -1020,9 +1019,6 @@ command_cleanup() {
|
|
|
|
# Loop over all files of this type
|
|
for file in "${certdir}/${filebase}-"*".${fileext}"; do
|
|
- # Handle case where no files match the wildcard
|
|
- [[ -f "${file}" ]] || break
|
|
-
|
|
# Check if current file is in use, if unused move to archive directory
|
|
filename="$(basename "${file}")"
|
|
if [[ ! "${filename}" = "${current}" ]]; then
|
|
--
|
|
2.12.3
|
|
|