update file for the runner setup

inventory.ini

@@ -1,6 +1,6 @@
 # This file defines targets (hosts, groups, host-specific variables)
 [all]
-rocky10 ansible_host=10.17.3.36 ansible_user=groot ansible_become=true
+rocky10 ansible_host=10.17.3.215 ansible_user=groot ansible_become=true ansible_python_interpreter=/usr/bin/python3.12
 
 [gitrunner]
 rocky10

readme.md

@@ -7,12 +7,10 @@ To deploy a Rocky Linux virtual machine, please go to [this repository](https://
 ## Repository Structure
 
 ```
-.
 ├── ansible.cfg          # Ansible configuration settings
 ├── inventory.ini        # Host inventory definition
 ├── setup.yml            # Main playbook for Gitea Runner configuration
 ├── update.yml           # Playbook to ensure system is up-to-date
-
 ```
 
 ## Prerequisites
@@ -38,9 +36,10 @@ To deploy a Rocky Linux virtual machine, please go to [this repository](https://
    ls ~/.ssh/terraform_key
    ```
 
-3. **Run the playbook**:
+3. **Run the playbooks**:
    ```bash
-   ansible-playbook site.yml
+   ansible-playbook update.yml
+   ansible-playbook setup.yml
    ```
 
 ## What This Does

runner_setup.yml

@@ -0,0 +1,174 @@
+---
+- name: Initial one-time setup
+  hosts: gitrunner
+  become: yes
+  vars:
+    runner_name: "act_runner"
+    gitea_runner_version: "0.2.13"
+    
+  tasks:
+    - name: Create act runner user
+      user:
+        name: "{{ runner_name }}"
+        system: yes
+        shell: /bin/bash
+        home: "/var/lib/{{ runner_name }}"
+        create_home: no
+
+    - name: Create /etc/act_runner directory
+      file:
+        path: /etc/"{{ runner_name }}"
+        state: directory
+        owner: "{{ runner_name }}"
+        group: "{{ runner_name }}"
+        mode: '0755'
+
+    - name: Install Act Runner
+      uri:
+        url: "https://gitea.com/gitea/act_runner/releases/download/v{{ gitea_runner_version }}/act_runner-{{ gitea_runner_version }}-linux-amd64"
+        dest: "/usr/local/bin/act-runner"
+        mode: '0755'
+        status_code: 200
+        follow_redirects: all
+    
+    - name: Creat Act Runner configuration file
+      copy:
+        content: |
+          log:
+            # The level of logging, can be trace, debug, info, warn, error, fatal
+            level: info
+
+          runner:
+            # Where to store the registration result.
+            file: .runner
+            # Execute how many tasks concurrently at the same time.
+            capacity: 1
+            # Extra environment variables to run jobs.
+            #envs:
+            #  A_TEST_ENV_NAME_1: a_test_env_value_1
+            #  A_TEST_ENV_NAME_2: a_test_env_value_2
+            # Extra environment variables to run jobs from a file.
+            # It will be ignored if it's empty or the file doesn't exist.
+            env_file: .env
+            # The timeout for a job to be finished.
+            # Please note that the Gitea instance also has a timeout (3h by default) for the job.
+            # So the job could be stopped by the Gitea instance if it's timeout is shorter than this.
+            timeout: 1h
+            # The timeout for the runner to wait for running jobs to finish when shutting down.
+            # Any running jobs that haven't finished after this timeout will be cancelled.
+            shutdown_timeout: 0s
+            # Whether skip verifying the TLS certificate of the Gitea instance.
+            insecure: false
+            # The timeout for fetching the job from the Gitea instance.
+            fetch_timeout: 5s
+            # The interval for fetching the job from the Gitea instance.
+            fetch_interval: 2s
+            # The labels of a runner are used to determine which jobs the runner can run, and how to run them.
+            # Like: "macos-arm64:host" or "ubuntu-latest:docker://docker.gitea.com/runner-images:ubuntu-latest"
+            # Find more images provided by Gitea at https://gitea.com/docker.gitea.com/runner-images .
+            # If it's empty when registering, it will ask for inputting labels.
+            # If it's empty when execute `daemon`, will use labels in `.runner` file.
+            labels:
+              - "rocky-10:host:local"
+
+          cache:
+            # Enable cache server to use actions/cache.
+            enabled: true
+            # The directory to store the cache data.
+            # If it's empty, the cache data will be stored in $HOME/.cache/actcache.
+            dir: ""
+            # The host of the cache server.
+            # It's not for the address to listen, but the address to connect from job containers.
+            # So 0.0.0.0 is a bad choice, leave it empty to detect automatically.
+            host: ""
+            # The port of the cache server.
+            # 0 means to use a random available port.
+            port: 0
+            # The external cache server URL. Valid only when enable is true.
+            # If it's specified, act_runner will use this URL as the ACTIONS_CACHE_URL rather than start a server by itself.
+            # The URL should generally end with "/".
+            external_server: ""
+
+          container:
+            # Specifies the network to which the container will connect.
+            # Could be host, bridge or the name of a custom network.
+            # If it's empty, act_runner will create a network automatically.
+            network: ""
+            # Whether to use privileged mode or not when launching task containers (privileged mode is required for Docker-in-Docker).
+            privileged: false
+            # And other options to be used when the container is started (eg, --add-host=my.gitea.url:host-gateway).
+            options:
+            # The parent directory of a job's working directory.
+            # NOTE: There is no need to add the first '/' of the path as act_runner will add it automatically. 
+            # If the path starts with '/', the '/' will be trimmed.
+            # For example, if the parent directory is /path/to/my/dir, workdir_parent should be path/to/my/dir
+            # If it's empty, /workspace will be used.
+            workdir_parent:
+            # Volumes (including bind mounts) can be mounted to containers. Glob syntax is supported, see https://github.com/gobwas/glob
+            # You can specify multiple volumes. If the sequence is empty, no volumes can be mounted.
+            # For example, if you only allow containers to mount the `data` volume and all the json files in `/src`, you should change the config to:
+            # valid_volumes:
+            #   - data
+            #   - /src/*.json
+            # If you want to allow any volume, please use the following configuration:
+            # valid_volumes:
+            #   - '**'
+            valid_volumes: []
+            # overrides the docker client host with the specified one.
+            # If it's empty, act_runner will find an available docker host automatically.
+            # If it's "-", act_runner will find an available docker host automatically, but the docker host won't be mounted to the job containers and service containers.
+            # If it's not empty or "-", the specified docker host will be used. An error will be returned if it doesn't work.
+            docker_host: ""
+            # Pull docker image(s) even if already present
+            force_pull: true
+            # Rebuild docker image(s) even if already present
+            force_rebuild: false
+
+          host:
+            # The parent directory of a job's working directory.
+            # If it's empty, $HOME/.cache/act/ will be used.
+            workdir_parent:
+        dest: /etc/act_runner/config.yaml
+        mode: '0644'
+
+    - name: Register the runner with Gitea
+      command: >
+        /usr/local/bin/act-runner register 
+        --no-interactive 
+        --config /etc/act_runner/config.yaml 
+        --instance https://git.phyllo.me 
+        --token {{ registration_token }}
+      args:
+        chdir: /var/lib/{{ runner_name }}
+      become_user: "{{ runner_name }}"
+      changed_when: true
+
+    - name: Create Act Runner service file
+      copy:
+        content: |
+          [Unit]
+          Description=Gitea Actions Runner
+          After=network.target
+          
+          [Service]
+          Type=simple
+          User={{ runner_name }}
+          ExecStart=/usr/local/bin/act_runner daemon --config /etc/act_runner/config.yaml
+          ExecReload=/bin/kill -s HUP $MAINPID
+          WorkingDirectory=/var/lib/act_runner
+          TimeoutSec=0
+          Restart=always
+          RestartSec=10
+          User=act_runner
+          
+          [Install]
+          WantedBy=multi-user.target
+        dest: /etc/systemd/system/act-runner.service
+        mode: '0644'
+
+    - name: Ensure act-runner service is enabled and started
+      systemd:
+        name: act-runner
+        enabled: yes
+        state: started
+        daemon_reload: yes

setup.yml

@@ -1,10 +1,7 @@
 ---
-- name: Initial one-time setup
+- name: Initial generic setup
   hosts: gitrunner
   become: yes
-  vars:
-    runner_name: "gitea-runner"
-    gitea_runner_version: "0.2.13"
     
   tasks:
     - name: Install required packages
@@ -13,48 +10,12 @@
           - git
         state: present
 
-    - name: Create gitea runner user
+    - name: Check current hostname
-      user:
+      command: hostname
-        name: "{{ runner_name }}"
+      register: current_hostname
-        system: yes
+      changed_when: false
-        shell: /bin/bash
-        home: "/var/lib/{{ runner_name }}"
-        create_home: yes
 
-    - name: Set hostname to rocky10
+    - name: Set hostname to rocky10 (if needed)
       hostname:
         name: rocky10
-
+      when: current_hostname.stdout != "rocky10"
-    - name: Install Gitea Runner
-      uri:
-        url: "https://gitea.com/gitea/act_runner/releases/download/v{{ gitea_runner_version }}/act_runner-{{ gitea_runner_version }}-linux-amd64"
-        dest: "/usr/local/bin/gitea-runner"
-        mode: '0755'
-        status_code: 200
-        follow_redirects: all
-
-    - name: Create Gitea Runner service file
-      copy:
-        content: |
-          [Unit]
-          Description=Gitea Runner
-          After=network.target
-          
-          [Service]
-          Type=simple
-          User={{ runner_name }}
-          ExecStart=/usr/local/bin/gitea-runner
-          Restart=always
-          RestartSec=10
-          
-          [Install]
-          WantedBy=multi-user.target
-        dest: /etc/systemd/system/gitea-runner.service
-        mode: '0644'
-
-    - name: Ensure gitea-runner service is enabled and started
-      systemd:
-        name: gitea-runner
-        enabled: yes
-        state: started
-        daemon_reload: yes

update.yml

@@ -8,10 +8,30 @@
       yum:
         name: "*"
         state: latest
-        update_cache: yes
+        update_cache: yes  
     
-    - name: Force reboot after updates (safe for Rocky Linux)
+    - name: Check if reboot required (RedHat/CentOS)
+      command: needs-restarting -r
+      register: needs_restarting_output
+      changed_when: false
+      ignore_errors: true
+      when: ansible_os_family == "RedHat"
+    
+    - name: Check if reboot required (Debian/Ubuntu)
+      stat:
+        path: /var/run/reboot-required
+      register: reboot_required_file
+      when: ansible_os_family != "RedHat"
+    
+    - name: Reboot if required (RedHat/CentOS)
       reboot:
-        msg: "System reboot after package updates"
+      when: 
-        post_reboot_delay: 10
+        - ansible_os_family == "RedHat"
-        timeout: 300
+        - needs_restarting_output.rc == 1
+        - needs_restarting_output is defined
+    
+    - name: Reboot if required (Debian/Ubuntu)
+      reboot:
+      when: 
+        - ansible_os_family != "RedHat"
+        - reboot_required_file.stat.exists == true