mirror of
https://github.com/flynx/proxmox-utils.git
synced 2025-10-28 18:50:08 +00:00
merge...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
commit
ab6ed6b1ae
@ -119,7 +119,9 @@ fillsection(){ (
|
||||
|
||||
ct2hostname(){
|
||||
local ct=${CT_DIR}/${1}.conf
|
||||
local host=$(cat $ct | grep hostname | head -1)
|
||||
local host=$(cat $ct \
|
||||
| grep -e '^\s*hostname:' \
|
||||
| head -1)
|
||||
echo ${host/hostname: /}
|
||||
}
|
||||
|
||||
|
||||
@ -78,6 +78,9 @@ pctSetNotes $ID
|
||||
|
||||
saveLastRunConfig
|
||||
|
||||
echo "# Traefik config..."
|
||||
traefikPushConfig
|
||||
|
||||
showNotes
|
||||
echo "# Done."
|
||||
|
||||
|
||||
@ -106,6 +106,9 @@ echo "# Building config..."
|
||||
buildAssets
|
||||
|
||||
|
||||
# XXX /etc/hosts???
|
||||
|
||||
|
||||
# DNS
|
||||
if xreadYes "# Update DNS?" DNS ; then
|
||||
file=/etc/resolv.conf
|
||||
|
||||
@ -23,8 +23,7 @@ fi
|
||||
for ct in $CT_DIR/*.conf ; do
|
||||
id=$(basename ${ct/.conf/})
|
||||
|
||||
# XXX this seems to break on 302...
|
||||
host=$(cat $ct | grep hostname | head -1)
|
||||
host=$(ct2hostname $id)
|
||||
host=${host/hostname: /}
|
||||
|
||||
# skip templates...
|
||||
|
||||
@ -141,6 +141,9 @@ pctSetNotes $ID
|
||||
|
||||
saveLastRunConfig
|
||||
|
||||
echo "# Traefik config..."
|
||||
traefikPushConfig
|
||||
|
||||
showNotes
|
||||
echo "# Done."
|
||||
|
||||
|
||||
@ -95,6 +95,7 @@ pctSetNotes $ID
|
||||
|
||||
saveLastRunConfig
|
||||
|
||||
echo "# Traefik config..."
|
||||
traefikPushConfig
|
||||
|
||||
showNotes
|
||||
|
||||
@ -105,6 +105,9 @@ pctSetNotes $ID
|
||||
|
||||
saveLastRunConfig
|
||||
|
||||
echo "# Traefik config..."
|
||||
traefikPushConfig
|
||||
|
||||
showNotes
|
||||
echo "# Done."
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user