[int]

roles/heimdall-order/cfg.schema.json

@@ -7,22 +7,27 @@
 			"type": "string",
 			"default": "heimdall"
 		},
-		"directory": {
+		"directory_program": {
+			"nullable": false,
+			"type": "string",
+			"default": "/opt/heimdall"
+		},
+		"directory_conf": {
 			"nullable": false,
 			"type": "string",
 			"default": "/etc/heimdall"
 		},
-		"rate": {
-			"nullable": false,
-			"type": "integer",
-			"default": 15
-		},
 		"name": {
 			"nullable": false,
 			"type": "string"
 		},
 		"conf": {
 			"type": "any"
+		},
+		"rate": {
+			"nullable": false,
+			"type": "integer",
+			"default": 15
 		}
 	},
 	"additionalProperties": false,

roles/heimdall-order/defaults/main.json

@@ -1,7 +1,8 @@
 {
 	"cfg_heimdall_order_defaults": {
 		"user": "heimdall",
-		"directory": "/etc/heimdall",
+		"directory_program": "/opt/heimdall",
+		"directory_conf": "/etc/heimdall",
 		"rate": 15
 	}
 }

roles/heimdall-order/tasks/main.json

@@ -4,7 +4,7 @@
 		"become": true,
 		"ansible.builtin.file": {
 			"state": "directory",
-			"path": "{{cfg_heimdall_order.directory}}",
+			"path": "{{cfg_heimdall_order.directory_conf}}",
 			"owner": "{{cfg_heimdall_order.user}}"
 		}
 	},
@@ -12,8 +12,8 @@
 		"name": "file",
 		"become": true,
 		"ansible.builtin.copy": {
-			"content": "{{cfg_heimdall_order.conf}} | json",
+			"content": "{{cfg_heimdall_order.conf | to_nice_json(sort_keys=False)}}",
-			"dest": "{{cfg_heimdall_order.directory}}/{{cfg_heimdall_order.name}}.hmdl.json"
+			"dest": "{{cfg_heimdall_order.directory_conf}}/{{cfg_heimdall_order.name}}.hmdl.json"
 		}
 	},
 	{
@@ -24,12 +24,12 @@
 			"user": "{{cfg_heimdall_order.user}}",
 			"disabled": false,
 			"name": "heimdall:{{cfg_heimdall_order.name}}",
-			"minute": "*/{{cfg_heimdall_program.rate | string}}",
+			"minute": "*/{{cfg_heimdall_order.rate | string}}",
 			"hour": "*",
 			"day": "*",
 			"month": "*",
 			"weekday": "*",
-			"job": "{{cfg_heimdall_program.directory}}/heimdall {{cfg_heimdall_order.directory}}/{{cfg_heimdall_order.name}}.hmdl.json --mutex-path=/tmp/heimdall-{{cfg_heimdall_order.name}}.lock"
+			"job": "{{cfg_heimdall_order.directory_program}}/heimdall {{cfg_heimdall_order.directory_conf}}/{{cfg_heimdall_order.name}}.hmdl.json --mutex-path=/tmp/heimdall-{{cfg_heimdall_order.name}}.lock"
 		}
 	}
 ]

roles/heimdall-program/defaults/main.json

@@ -2,7 +2,7 @@
 	"cfg_heimdall_program_defaults": {
 		"user": "heimdall",
 		"directory": "/opt/heimdall",
-		"git_repository_url": "pv-svartalfheim-git:heimdall/core",
+		"git_repository_url": "https://forgejo.ramsch.sx/heimdall/core",
 		"git_reference": "main"
 	}
 }

roles/heimdall-program/tasks/main.json

@@ -8,7 +8,8 @@
 				"git",
 				"make",
 				"rsync",
-				"nodejs"
+				"nodejs",
+				"node-typescript"
 			]
 		}
 	},
@@ -18,7 +19,7 @@
 		"ansible.builtin.user": {
 			"name": "{{cfg_heimdall_program.user}}",
 			"create_home": true,
-			"home": "{{cfg_heimdall_program.directory}"
+			"home": "{{cfg_heimdall_program.directory}}"
 		}
 	},
 	{