From b178162cedcf98c46a685b382865b704ac956963 Mon Sep 17 00:00:00 2001
From: Opnxng <opnxng@tuta.io>
Date: Fri, 10 Nov 2023 03:38:57 +0800
Subject: [PATCH] Gitea: fixed runner

---
 setups/setup-gitea-netrc.yml | 20 +++-----------------
 setups/setup-runner.yml      |  6 ++++++
 vars/services.yml            |  5 ++++-
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/setups/setup-gitea-netrc.yml b/setups/setup-gitea-netrc.yml
index 2c7686d..8fe0c49 100644
--- a/setups/setup-gitea-netrc.yml
+++ b/setups/setup-gitea-netrc.yml
@@ -1,11 +1,11 @@
     - name: Remove existing .netrc
-      ansible.builtin.file:
+      file:
         path: "/home/{{ control_user }}/.netrc"
         state: absent
       delegate_to: "{{ control_host }}"
 
     - name: Remove existing .netrc.gpg
-      ansible.builtin.file:
+      file:
         path: "/home/{{ control_user }}/.netrc.gpg"
         state: absent
       delegate_to: "{{ control_host }}"
@@ -37,7 +37,7 @@
       delegate_to: "{{ control_host }}"
 
     - name: Remove .netrc
-      ansible.builtin.file:
+      file:
         path: "/home/{{ control_user }}/.netrc"
         state: absent
       delegate_to: "{{ control_host }}"
@@ -55,18 +55,4 @@
 
     - name: Use git-credential-netrc
       command: git config --global credential.helper "/usr/bin/git-credential-netrc -f ~/.netrc.gpg -v"
-      delegate_to: "{{ control_host }}"
-
-    - name: Install gnupg-agent
-      apt:
-        name:
-          - gnupg-agent
-        state: latest
-        install_recommends: false
-      delegate_to: "{{ control_host }}"
-      become: true
-
-    - name: Reminder to add to .profile or .bashrc
-      pause:
-        prompt: "Add entry: export GPG_TTY=$(tty)"
       delegate_to: "{{ control_host }}"
\ No newline at end of file
diff --git a/setups/setup-runner.yml b/setups/setup-runner.yml
index 8efe2dc..51b5cca 100644
--- a/setups/setup-runner.yml
+++ b/setups/setup-runner.yml
@@ -6,6 +6,12 @@
         group: 1000
         mode: 0755
 
+    - name: Remove existing daemon.json
+      file:
+        path: "{{ docker_dir }}/runner/daemon.json"
+        state: absent
+      become: true
+
     - name: Set up Docker daemon configuration file to solve DNS problems
       template:
         src: "conf/daemon.json.j2"
diff --git a/vars/services.yml b/vars/services.yml
index b2e0e5e..bf6c5be 100644
--- a/vars/services.yml
+++ b/vars/services.yml
@@ -1,6 +1,9 @@
+saetup:
+  oracle3:
+    - runner
 compose:
   oracle3:
-    - gitea
+    - runner
 
 # ----------------------------------------------------------------------------------------------------