Compare commits
1 commit
d3c9457b7e
...
105f0cb126
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
105f0cb126 |
1 changed files with 0 additions and 4 deletions
|
|
@ -787,7 +787,6 @@ _disinto_init_nomad() {
|
||||||
# (woodpecker without forgejo is nonsensical)
|
# (woodpecker without forgejo is nonsensical)
|
||||||
# Also expand 'woodpecker' to 'woodpecker-server,woodpecker-agent'
|
# Also expand 'woodpecker' to 'woodpecker-server,woodpecker-agent'
|
||||||
local normalized_services="$with_services"
|
local normalized_services="$with_services"
|
||||||
local needs_log_note=false
|
|
||||||
|
|
||||||
# First, expand 'woodpecker' to 'woodpecker-server,woodpecker-agent'
|
# First, expand 'woodpecker' to 'woodpecker-server,woodpecker-agent'
|
||||||
if echo "$normalized_services" | grep -q "woodpecker"; then
|
if echo "$normalized_services" | grep -q "woodpecker"; then
|
||||||
|
|
@ -799,7 +798,6 @@ _disinto_init_nomad() {
|
||||||
if echo "$normalized_services" | grep -q "woodpecker" && ! echo "$normalized_services" | grep -q "forgejo"; then
|
if echo "$normalized_services" | grep -q "woodpecker" && ! echo "$normalized_services" | grep -q "forgejo"; then
|
||||||
echo "Note: --with woodpecker implies --with forgejo (OAuth dependency)"
|
echo "Note: --with woodpecker implies --with forgejo (OAuth dependency)"
|
||||||
normalized_services="forgejo,${normalized_services}"
|
normalized_services="forgejo,${normalized_services}"
|
||||||
needs_log_note=true
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Define deployment order: forgejo -> woodpecker-server -> woodpecker-agent
|
# Define deployment order: forgejo -> woodpecker-server -> woodpecker-agent
|
||||||
|
|
@ -1017,7 +1015,6 @@ _disinto_init_nomad() {
|
||||||
# (woodpecker without forgejo is nonsensical)
|
# (woodpecker without forgejo is nonsensical)
|
||||||
# Also expand 'woodpecker' to 'woodpecker-server,woodpecker-agent'
|
# Also expand 'woodpecker' to 'woodpecker-server,woodpecker-agent'
|
||||||
local normalized_services="$with_services"
|
local normalized_services="$with_services"
|
||||||
local needs_log_note=false
|
|
||||||
|
|
||||||
# First, expand 'woodpecker' to 'woodpecker-server,woodpecker-agent'
|
# First, expand 'woodpecker' to 'woodpecker-server,woodpecker-agent'
|
||||||
if echo "$normalized_services" | grep -q "woodpecker"; then
|
if echo "$normalized_services" | grep -q "woodpecker"; then
|
||||||
|
|
@ -1028,7 +1025,6 @@ _disinto_init_nomad() {
|
||||||
if echo "$normalized_services" | grep -q "woodpecker" && ! echo "$normalized_services" | grep -q "forgejo"; then
|
if echo "$normalized_services" | grep -q "woodpecker" && ! echo "$normalized_services" | grep -q "forgejo"; then
|
||||||
echo "Note: --with woodpecker implies --with forgejo (OAuth dependency)"
|
echo "Note: --with woodpecker implies --with forgejo (OAuth dependency)"
|
||||||
normalized_services="forgejo,${normalized_services}"
|
normalized_services="forgejo,${normalized_services}"
|
||||||
needs_log_note=true
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Define deployment order: forgejo -> woodpecker-server -> woodpecker-agent
|
# Define deployment order: forgejo -> woodpecker-server -> woodpecker-agent
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue