Rename .Https template variable to .TLS
Signed-off-by: Jonathon Anderson <janderson@ciq.com>
This commit is contained in:
@@ -66,7 +66,7 @@ menuentry "Single-stage boot" --id single-stage {
|
||||
echo "Downloading images..."
|
||||
image="${uri}&stage=image&compress=gz"
|
||||
system="${uri}&stage=system&compress=gz"
|
||||
{{- if not (eq .Https true) }}
|
||||
{{- if not (eq .TLS true) }}
|
||||
runtime="${uri}&stage=runtime&compress=gz"
|
||||
{{- end }}
|
||||
initrd $image $system $runtime
|
||||
@@ -115,7 +115,7 @@ menuentry "Single-stage boot (no compression)" --id single-stage-nocompress {
|
||||
echo "Downloading images..."
|
||||
image="${uri}&stage=image"
|
||||
system="${uri}&stage=system"
|
||||
{{- if not (eq .Https true) }}
|
||||
{{- if not (eq .TLS true) }}
|
||||
runtime="${uri}&stage=runtime"
|
||||
{{- end }}
|
||||
initrd $image $system $runtime
|
||||
|
||||
@@ -46,7 +46,7 @@ echo Downloading compressed image with imgextract...
|
||||
imgextract --name image ${uri}&stage=image&compress=gz || goto error_use_initrd
|
||||
echo Downloading compressed system overlay image with imgextract...
|
||||
imgextract --name system ${uri}&stage=system&compress=gz || goto error_reboot
|
||||
{{- if not (eq .Https true) }}
|
||||
{{- if not (eq .TLS true) }}
|
||||
echo Downloading compressed runtime overlay image with imgextract...
|
||||
imgextract --name runtime ${uri}&stage=runtime&compress=gz && set runtime_initrd initrd=runtime || echo Unable to download runtime overlay. (ignored)
|
||||
{{- end }}
|
||||
@@ -65,7 +65,7 @@ echo Downloading compressed image with initrd...
|
||||
initrd --name image ${uri}&stage=image&compress=gz || goto error_reboot
|
||||
echo Downloading compressed system overlay with initrd...
|
||||
initrd --name system ${uri}&stage=system&compress=gz || goto error_reboot
|
||||
{{- if not (eq .Https true) }}
|
||||
{{- if not (eq .TLS true) }}
|
||||
echo Downloading compressed runtime overlay with initrd...
|
||||
initrd --name runtime ${uri}&stage=runtime&compress=gz && set runtime_initrd initrd=runtime || echo Unable to download runtime overlay. (ignored)
|
||||
{{- end }}
|
||||
@@ -80,7 +80,7 @@ echo Downloading uncompressed image with initrd...
|
||||
initrd --name image ${uri}&stage=image || goto error_reboot
|
||||
echo Downloading uncompressed system overlay with initrd...
|
||||
initrd --name system ${uri}&stage=system || goto error_reboot
|
||||
{{- if not (eq .Https true) }}
|
||||
{{- if not (eq .TLS true) }}
|
||||
echo Downloading uncompressed runtime overlay with initrd...
|
||||
initrd --name runtime ${uri}&stage=runtime && set runtime_initrd initrd=runtime || echo Unable to download runtime overlay. (ignored)
|
||||
{{- end }}
|
||||
|
||||
@@ -39,7 +39,7 @@ type templateVars struct {
|
||||
KernelArgs string
|
||||
KernelVersion string
|
||||
Root string
|
||||
Https bool
|
||||
TLS bool
|
||||
Tags map[string]string
|
||||
NetDevs map[string]*node.NetDev
|
||||
}
|
||||
@@ -142,7 +142,7 @@ func ProvisionSend(w http.ResponseWriter, req *http.Request) {
|
||||
Ipaddr: conf.Ipaddr,
|
||||
Ipaddr6: ipaddr6,
|
||||
Port: strconv.Itoa(conf.Warewulf.Port),
|
||||
Https: conf.Warewulf.EnableTLS(),
|
||||
TLS: conf.Warewulf.EnableTLS(),
|
||||
Authority: authority,
|
||||
Hostname: remoteNode.Id(),
|
||||
Hwaddr: rinfo.hwaddr,
|
||||
@@ -249,7 +249,7 @@ func ProvisionSend(w http.ResponseWriter, req *http.Request) {
|
||||
Ipaddr: conf.Ipaddr,
|
||||
Ipaddr6: ipaddr6,
|
||||
Port: strconv.Itoa(conf.Warewulf.Port),
|
||||
Https: conf.Warewulf.EnableTLS(),
|
||||
TLS: conf.Warewulf.EnableTLS(),
|
||||
Authority: authority,
|
||||
Hostname: remoteNode.Id(),
|
||||
Hwaddr: rinfo.hwaddr,
|
||||
|
||||
Reference in New Issue
Block a user