GRM-12: fix: convert runner config from TOML to YAML format
This commit is contained in:
@@ -46,7 +46,7 @@
|
||||
|
||||
- name: Check config file exists
|
||||
ansible.builtin.stat:
|
||||
path: "{{ gitea_runner_config_dir }}/config.toml"
|
||||
path: "{{ gitea_runner_config_dir }}/config.yaml"
|
||||
register: config_stat
|
||||
|
||||
- name: Assert config file exists
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
|
||||
- name: Check config file exists in data directory
|
||||
ansible.builtin.stat:
|
||||
path: "{{ gitea_runner_data_dir }}/config.toml"
|
||||
path: "{{ gitea_runner_data_dir }}/config.yaml"
|
||||
register: config_stat
|
||||
|
||||
- name: Assert config file exists
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
- name: Create gitea_runner config file
|
||||
ansible.builtin.template:
|
||||
src: gitea-runner-config.toml.j2
|
||||
dest: "{{ gitea_runner_config_dir }}/config.toml"
|
||||
src: gitea-runner-config.yaml.j2
|
||||
dest: "{{ gitea_runner_config_dir }}/config.yaml"
|
||||
mode: "0644"
|
||||
notify: Restart gitea-runner
|
||||
|
||||
@@ -10,8 +10,8 @@
|
||||
|
||||
- name: Create gitea_runner config file in data directory
|
||||
ansible.builtin.template:
|
||||
src: gitea-runner-config.toml.j2
|
||||
dest: "{{ gitea_runner_data_dir }}/config.toml"
|
||||
src: gitea-runner-config.yaml.j2
|
||||
dest: "{{ gitea_runner_data_dir }}/config.yaml"
|
||||
mode: "0644"
|
||||
|
||||
- name: Pull gitea_runner image
|
||||
@@ -61,7 +61,7 @@
|
||||
-w /data
|
||||
{{ gitea_runner_docker_image }}:{{ gitea_runner_version | regex_replace('^v', '') }}
|
||||
daemon
|
||||
--config /data/config.toml
|
||||
--config /data/config.yaml
|
||||
when:
|
||||
- container_check.rc != 0
|
||||
- not skip_runner_registration
|
||||
|
||||
@@ -18,6 +18,6 @@
|
||||
-v /var/run/docker.sock:/var/run/docker.sock
|
||||
-v {{ gitea_runner_data_dir }}:/data
|
||||
{{ gitea_runner_docker_image }}:{{ gitea_runner_version | regex_replace('^v', '') }} daemon
|
||||
--config /data/config.toml
|
||||
--config /data/config.yaml
|
||||
register: docker_run
|
||||
changed_when: docker_run.rc == 0
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
log.level = "{{ gitea_runner_log_level }}"
|
||||
runner.file = "{{ gitea_runner_file }}"
|
||||
container.label = "{{ gitea_runner_container_label }}"
|
||||
@@ -0,0 +1,8 @@
|
||||
log:
|
||||
level: "{{ gitea_runner_log_level }}"
|
||||
|
||||
runner:
|
||||
file: "{{ gitea_runner_file }}"
|
||||
|
||||
container:
|
||||
label: "{{ gitea_runner_container_label }}"
|
||||
@@ -5,7 +5,7 @@ Requires=docker.service
|
||||
|
||||
[Service]
|
||||
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 }}
|
||||
Restart=always
|
||||
RestartSec={{ gitea_runner_service_restart_sec }}
|
||||
|
||||
Reference in New Issue
Block a user