Merge pull request #17 from blackkaven/update_conf

config/types/update.go Added support for more fields in update section

Author: jepio

config/types/update.go

@@ -33,12 +33,20 @@ var (
 )
 
 type Update struct {
-	Group  UpdateGroup  `yaml:"group"`
-	Server UpdateServer `yaml:"server"`
+	Group            UpdateGroup            `yaml:"group"`
+	Server           UpdateServer           `yaml:"server"`
+	PCRPolicyServer  UpdatePCRPolicyServer  `yaml:"pcr_policy_server"`
+	DownloadUser     UpdateDownloadUser     `yaml:"download_user"`
+	DownloadPassword UpdateDownloadPassword `yaml:"download_password"`
+	MachineAlias     UpdateMachineAlias     `yaml:"machine_alias"`
 }
 
 type UpdateGroup string
 type UpdateServer string
+type UpdatePCRPolicyServer string
+type UpdateDownloadUser string
+type UpdateDownloadPassword string
+type UpdateMachineAlias string
 
 func (u Update) Validate() report.Report {
 	switch strings.ToLower(string(u.Group)) {
@@ -70,6 +78,18 @@ func init() {
 			if in.Update.Server != "" {
 				contents += fmt.Sprintf("\nSERVER=%s", in.Update.Server)
 			}
+			if in.Update.PCRPolicyServer != "" {
+				contents += fmt.Sprintf("\nPCR_POLICY_SERVER=%s", in.Update.PCRPolicyServer)
+			}
+			if in.Update.DownloadUser != "" {
+				contents += fmt.Sprintf("\nDOWNLOAD_USER=%s", in.Update.DownloadUser)
+			}
+			if in.Update.DownloadPassword != "" {
+				contents += fmt.Sprintf("\nDOWNLOAD_PASSWORD=%s", in.Update.DownloadPassword)
+			}
+			if in.Update.MachineAlias != "" {
+				contents += fmt.Sprintf("\nMACHINE_ALIAS=%s", in.Update.MachineAlias)
+			}
 		}
 		if in.Locksmith != nil {
 			lines := in.Locksmith.configLines()

doc/configuration.md

@@ -160,6 +160,10 @@ _Note: all fields are optional unless otherwise marked_
 * **update**
     * **group** (string): the update group to follow. Most users will want one of: stable, beta, alpha.
     * **server** (string): the server to fetch updates from.
+    * **pcr_policy_server** (string): the server to receive posted TPM PCR policy from.
+    * **download_user** (string): the authentication user to fetch the update.
+    * **download_password** (string): the authentication password to fetch the update
+    * **machine_alias** (string): human readable machine alias to be displayed in the update server UI.
 * **locksmith**
     * **reboot_strategy** (string): the reboot strategy for locksmithd to follow. Must be one of: reboot, etcd-lock, off.
     * **window_start** (string, required if window-length isn't empty): the start of the window that locksmithd can reboot the machine during