oblachno-oss/grm
1
0
Fork 0
Code Issues Pull Requests Actions 14 Packages Projects Releases Wiki Activity

GRM-12: fix: convert runner config from TOML to YAML format

Browse Source
This commit is contained in:
Emil Simeonov
2026-06-18 04:47:41 +02:00
parent 68dcbc9b16
commit 1ad7c0a816
8 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ansible/roles/gitea-runner/molecule/binary/verify.yml
+1 -1
View File
@@ -46,7 +46,7 @@
- name: Check config file exists - name: Check config file exists
ansible.builtin.stat: ansible.builtin.stat:
path: "{{ gitea_runner_config_dir }}/config.toml" path: "{{ gitea_runner_config_dir }}/config.yaml"
register: config_stat register: config_stat
- name: Assert config file exists - name: Assert config file exists
ansible/roles/gitea-runner/molecule/default/verify.yml
+1 -1
View File
@@ -35,7 +35,7 @@
- name: Check config file exists in data directory - name: Check config file exists in data directory
ansible.builtin.stat: ansible.builtin.stat:
path: "{{ gitea_runner_data_dir }}/config.toml" path: "{{ gitea_runner_data_dir }}/config.yaml"
register: config_stat register: config_stat
- name: Assert config file exists - name: Assert config file exists
ansible/roles/gitea-runner/tasks/config.yml
+2 -2
View File
@@ -7,7 +7,7 @@
- name: Create gitea_runner config file - name: Create gitea_runner config file
ansible.builtin.template: ansible.builtin.template:
src: gitea-runner-config.toml.j2 src: gitea-runner-config.yaml.j2
dest: "{{ gitea_runner_config_dir }}/config.toml" dest: "{{ gitea_runner_config_dir }}/config.yaml"
mode: "0644" mode: "0644"
notify: Restart gitea-runner notify: Restart gitea-runner
ansible/roles/gitea-runner/tasks/docker_mode.yml
+3 -3
View File
@@ -10,8 +10,8 @@
- name: Create gitea_runner config file in data directory - name: Create gitea_runner config file in data directory
ansible.builtin.template: ansible.builtin.template:
src: gitea-runner-config.toml.j2 src: gitea-runner-config.yaml.j2
dest: "{{ gitea_runner_data_dir }}/config.toml" dest: "{{ gitea_runner_data_dir }}/config.yaml"
mode: "0644" mode: "0644"
- name: Pull gitea_runner image - name: Pull gitea_runner image
@@ -61,7 +61,7 @@
-w /data -w /data
{{ gitea_runner_docker_image }}:{{ gitea_runner_version | regex_replace('^v', '') }} {{ gitea_runner_docker_image }}:{{ gitea_runner_version | regex_replace('^v', '') }}
daemon daemon
--config /data/config.toml --config /data/config.yaml
when: when:
- container_check.rc != 0 - container_check.rc != 0
- not skip_runner_registration - not skip_runner_registration
ansible/roles/gitea-runner/tasks/docker_update.yml
+1 -1
View File
@@ -18,6 +18,6 @@
-v /var/run/docker.sock:/var/run/docker.sock -v /var/run/docker.sock:/var/run/docker.sock
-v {{ gitea_runner_data_dir }}:/data -v {{ gitea_runner_data_dir }}:/data
{{ gitea_runner_docker_image }}:{{ gitea_runner_version | regex_replace('^v', '') }} daemon {{ gitea_runner_docker_image }}:{{ gitea_runner_version | regex_replace('^v', '') }} daemon
--config /data/config.toml --config /data/config.yaml
register: docker_run register: docker_run
changed_when: docker_run.rc == 0 changed_when: docker_run.rc == 0
ansible/roles/gitea-runner/templates/gitea-runner-config.toml.j2
-3
View File
@@ -1,3 +0,0 @@
log.level = "{{ gitea_runner_log_level }}"
runner.file = "{{ gitea_runner_file }}"
container.label = "{{ gitea_runner_container_label }}"
ansible/roles/gitea-runner/templates/gitea-runner-config.yaml.j2
+8
View File
@@ -0,0 +1,8 @@
log:
level: "{{ gitea_runner_log_level }}"
runner:
file: "{{ gitea_runner_file }}"
container:
label: "{{ gitea_runner_container_label }}"
ansible/roles/gitea-runner/templates/gitea-runner.service.j2
+1 -1
View File
@@ -5,7 +5,7 @@ Requires=docker.service
[Service] [Service]
Type=simple Type=simple
ExecStart={{ gitea_runner_binary_path }} daemon --config {{ gitea_runner_config_dir }}/config.toml ExecStart={{ gitea_runner_binary_path }} daemon --config {{ gitea_runner_config_dir }}/config.yaml
WorkingDirectory={{ gitea_runner_data_dir }} WorkingDirectory={{ gitea_runner_data_dir }}
Restart=always Restart=always
RestartSec={{ gitea_runner_service_restart_sec }} RestartSec={{ gitea_runner_service_restart_sec }}