Merge pull request #308 from ClusterCockpit/dev

Move to open Release PR

pkg/schema/config.go

@@ -164,13 +164,13 @@ type ProgramConfig struct {
 	// Defines time X in seconds in which jobs are considered to be "short" and will be filtered in specific views.
 	ShortRunningJobsDuration int `json:"short-running-jobs-duration"`
 
-	// Array of Clusters
-	Clusters []*ClusterConfig `json:"clusters"`
-
 	// Energy Mix CO2 Emission Constant [g/kWh]
 	// If entered, displays estimated CO2 emission for job based on jobs totalEnergy
 	EmissionConstant int `json:"emission-constant"`
 
 	// Frequency of cron job workers
 	CronFrequency *CronFrequency `json:"cron-frequency"`
+
+	// Array of Clusters
+	Clusters []*ClusterConfig `json:"clusters"`
 }

pkg/schema/schemas/config.schema.json

@@ -10,7 +10,10 @@
     },
     "apiAllowedIPs": {
       "description": "Addresses from which secured API endpoints can be reached",
-      "type": "string"
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
     },
     "user": {
       "description": "Drop root permissions once .env was read and the port was taken. Only applicable if using privileged port.",