fix(remnawave): не ломать shell на ${#args[@]} в Jinja
ansible-core-net / deploy (push) Failing after 1s
ansible-core-net / deploy (push) Failing after 1s
Ansible воспринимает {# как начало комментария.
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
1 parent
58aba40bc0
commit
d8fc365ee8
1 file changed
+7
-4
@@ -100,7 +100,9 @@
|
|||||||
if [ "${NEED_WEBHOOK}" = "True" ] || [ "${NEED_WEBHOOK}" = "true" ]; then
|
if [ "${NEED_WEBHOOK}" = "True" ] || [ "${NEED_WEBHOOK}" = "true" ]; then
|
||||||
args+=("REMNAWAVE_WEBHOOK_SECRET_HEADER=${RW_WEBHOOK}")
|
args+=("REMNAWAVE_WEBHOOK_SECRET_HEADER=${RW_WEBHOOK}")
|
||||||
fi
|
fi
|
||||||
if [ "${#args[@]}" -eq 0 ]; then
|
# Не использовать ${#args[@]} — Ansible парсит {# как Jinja-комментарий.
|
||||||
|
set -- "${args[@]}"
|
||||||
|
if [ "$#" -eq 0 ]; then
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
out=$(infisical secrets set \
|
out=$(infisical secrets set \
|
||||||
@@ -109,7 +111,7 @@
|
|||||||
--env=prod \
|
--env=prod \
|
||||||
--projectId="${INFISICAL_PROJECT_ID}" \
|
--projectId="${INFISICAL_PROJECT_ID}" \
|
||||||
--path="/services/remnawave" \
|
--path="/services/remnawave" \
|
||||||
"${args[@]}" \
|
"$@" \
|
||||||
--silent 2>&1) || {
|
--silent 2>&1) || {
|
||||||
echo "infisical secrets set failed: ${out}" >&2
|
echo "infisical secrets set failed: ${out}" >&2
|
||||||
exit 1
|
exit 1
|
||||||
@@ -240,7 +242,8 @@
|
|||||||
if [ -n "${RW_NODE_SECRET}" ] && { [ "${NEED_NODE}" = "True" ] || [ "${NEED_NODE}" = "true" ]; }; then
|
if [ -n "${RW_NODE_SECRET}" ] && { [ "${NEED_NODE}" = "True" ] || [ "${NEED_NODE}" = "true" ]; }; then
|
||||||
args+=("REMNANODE_SECRET_KEY=${RW_NODE_SECRET}")
|
args+=("REMNANODE_SECRET_KEY=${RW_NODE_SECRET}")
|
||||||
fi
|
fi
|
||||||
if [ "${#args[@]}" -eq 0 ]; then
|
set -- "${args[@]}"
|
||||||
|
if [ "$#" -eq 0 ]; then
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
out=$(infisical secrets set \
|
out=$(infisical secrets set \
|
||||||
@@ -249,7 +252,7 @@
|
|||||||
--env=prod \
|
--env=prod \
|
||||||
--projectId="${INFISICAL_PROJECT_ID}" \
|
--projectId="${INFISICAL_PROJECT_ID}" \
|
||||||
--path="/services/remnawave" \
|
--path="/services/remnawave" \
|
||||||
"${args[@]}" \
|
"$@" \
|
||||||
--silent 2>&1) || {
|
--silent 2>&1) || {
|
||||||
echo "infisical secrets set failed: ${out}" >&2
|
echo "infisical secrets set failed: ${out}" >&2
|
||||||
exit 1
|
exit 1
|
||||||
|
|||||||
Reference in new issue
Block a user