Compare commits

...

1 commit
dev ... main

Author SHA1 Message Date
fenris cc113f2a86 [fix] 2026-03-31 23:28:23 +02:00
5 changed files with 18 additions and 16 deletions

View file

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

View file

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

View file

@ -4,16 +4,17 @@
"become": true, "become": true,
"ansible.builtin.file": { "ansible.builtin.file": {
"state": "directory", "state": "directory",
"path": "{{cfg_heimdall_order.directory}}", "path": "{{cfg_heimdall_order.directory_conf}}",
"owner": "{{cfg_heimdall_order.user}}" "owner": "{{cfg_heimdall_order.user}}"
} }
}, },
{ {
"name": "file", "name": "file",
"become": true, "become": true,
"become_user": "{{cfg_heimdall_program.user}}",
"ansible.builtin.copy": { "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 +25,12 @@
"user": "{{cfg_heimdall_order.user}}", "user": "{{cfg_heimdall_order.user}}",
"disabled": false, "disabled": false,
"name": "heimdall:{{cfg_heimdall_order.name}}", "name": "heimdall:{{cfg_heimdall_order.name}}",
"minute": "*/{{cfg_heimdall_program.rate | string}}", "minute": "*",
"hour": "*", "hour": "*",
"day": "*", "day": "*",
"month": "*", "month": "*",
"weekday": "*", "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"
} }
} }
] ]

View file

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

View file

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