allow (optional) per-host ignition files

jeefy · Jun 24, 2023 · 339ca25 · 339ca25
1 parent 21d9458
commit 339ca25
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 9 deletions.
diff --git a/pkg/hardware/mac.go b/pkg/hardware/mac.go
@@ -12,10 +12,11 @@ import (
 )
 
 type Host struct {
-	MAC      string `json:"mac"`
-	Hostname string `json:"hostname"`
-	IP       string `json:"ip"`
-	Booted   string `json:"booted"`
+	MAC          string `json:"mac"`
+	Hostname     string `json:"hostname"`
+	IP           string `json:"ip"`
+	Booted       string `json:"booted"`
+	IgnitionFile string `json:"ignitionFile",omitempty`
 }
 
 type BootyData struct {

diff --git a/pkg/http/request.go b/pkg/http/request.go
@@ -141,7 +141,12 @@ WantedBy=default.target`,
 		JoinString: viper.GetString(config.JoinString),
 		ServerIP:   viper.GetString(config.ServerIP),
 	}
-	t, err := template.ParseFiles(fmt.Sprintf("%s/%s", viper.GetString(config.DataDir), viper.GetString(config.IgnitionFile)))
+
+	ignitionFile := viper.GetString(config.IgnitionFile)
+	if host.IgnitionFile != "" {
+		ignitionFile = host.IgnitionFile
+	}
+	t, err := template.ParseFiles(fmt.Sprintf("%s/%s", viper.GetString(config.DataDir), ignitionFile))
 	if err != nil {
 		w.Write([]byte(err.Error()))
 		return

diff --git a/web/src/views/HostsView.vue b/web/src/views/HostsView.vue
@@ -75,11 +75,15 @@ export default {
     <table>
           <tr v-for="(host, mac, index) of hostData.hosts">
                <td>
-                    <span><a href="/ignition.json?mac={{mac}}" target="_blank">{{mac}}</a></span>
+                    <span><a :href="`/ignition.json?mac=${mac}`" target="_blank">{{mac}}</a></span>
                </td>
                <td>
                     <span v-show="!host.edit">{{host.hostname}}</span>
-                    <input type="text" v-model="host.hostname" v-show="host.edit">
+                    <input type="text" placeholder="Hostname" v-model="host.hostname" v-show="host.edit">
+               </td>
+               <td>
+                    <span v-show="!host.edit">{{host.ignitionFile}}</span>
+                    <input type="text" placeholder="Ignition File" v-model="host.ignitionFile" v-show="host.edit">
                </td>
                <td>
                     <button v-show="!host.edit" v-on:click="editHost(mac, host)">edit</button>
@@ -94,11 +98,15 @@ export default {
     <table>
           <tr v-for="(host, mac, index) of hostData.unknownHosts">
                <td>
-                    <span>{{mac}}</span>
+                  <span><a :href="`/ignition.json?mac=${mac}`" target="_blank">{{mac}}</a></span>
                </td>
                <td>
                     <span v-show="!host.edit">{{host.hostname}}</span>
-                    <input type="text" v-model="host.hostname" v-show="host.edit">
+                    <input type="text" placeholder="Hostname" v-model="host.hostname" v-show="host.edit">
+               </td>
+               <td>
+                    <span v-show="!host.edit">{{host.ignitionFile}}</span>
+                    <input type="text" placeholder="Ignition File" v-model="host.ignitionFile" v-show="host.edit">
                </td>
                <td>
                     <button v-show="!host.edit" v-on:click="editHost(mac, host)">edit</button>