X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=cmd%2Fsafcm%2Fconfig%2Fgroups.go;h=a1dd83a0164267a0f24a351a74966fd108300323;hb=5d6cc7f14a4bacc36bf3a23cd735a75ad4a90f1d;hp=d003bddeed1c9e5efdf24db2db57b788dc252b3f;hpb=e63b0157527fb7d69b4bfcc2716e4eb3ac80f98d;p=safcm%2Fsafcm.git

diff --git a/cmd/safcm/config/groups.go b/cmd/safcm/config/groups.go
index d003bdd..a1dd83a 100644
--- a/cmd/safcm/config/groups.go
+++ b/cmd/safcm/config/groups.go
@@ -34,7 +34,7 @@ const (
 	GroupRemoveSuffix     = GroupSpecialSeparator + "remove"
 )
 
-// Keep in sync with sync_info.go:infoGroupDetectedRegexp
+// Keep in sync with cmd/safcm/sync_info.go:infoGroupDetectedRegexp
 var groupNameRegexp = regexp.MustCompile(`^[a-z0-9_-]+$`)
 
 func LoadGroups(cfg *Config, hosts *Hosts) (map[string][]string, error) {
@@ -86,6 +86,8 @@ func LoadGroups(cfg *Config, hosts *Hosts) (map[string][]string, error) {
 			if x == GroupAll {
 				continue
 			}
+			// Don't validate against groupNameRegexp because
+			// hosts have less strict restrictions.
 			if strings.Contains(x, GroupSpecialSeparator) {
 				return nil, fmt.Errorf(
 					"%s member %q must not contain %q",
@@ -103,8 +105,8 @@ func LoadGroups(cfg *Config, hosts *Hosts) (map[string][]string, error) {
 	}
 
 	// Sanity check for global configuration
-	for _, x := range cfg.GroupOrder {
-		const errPrefix = "config.yaml: group_order:"
+	for _, x := range cfg.GroupPriority {
+		const errPrefix = "config.yaml: group_priority:"
 
 		if x == GroupAll {
 			continue