From 7884b6e95d55157f65b01525149cd5ee27b7df5b Mon Sep 17 00:00:00 2001
From: nazunalika <tucklesepk@gmail.com>
Date: Sun, 27 Mar 2022 19:00:34 -0700
Subject: [PATCH] address more FQCN

---
 init-gitea-configure.yml |  4 ++--
 init-gitea-themes.yml    |  4 ++--
 init-gitea-update.yml    | 21 ++++++++-------------
 role-gitea.yml           |  4 ++--
 4 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/init-gitea-configure.yml b/init-gitea-configure.yml
index 0812fa5..c065557 100644
--- a/init-gitea-configure.yml
+++ b/init-gitea-configure.yml
@@ -10,7 +10,7 @@
       register: no_ansible
 
     - name: Verify if we can run ansible
-      assert:
+      ansible.builtin.assert:
         that:
           - "not no_ansible.stat.exists"
         success_msg: "We are able to run on this node"
@@ -27,7 +27,7 @@
 
   post_tasks:
     - name: Touching run file that ansible has ran here
-      file:
+      ansible.builtin.files:
         path: /var/log/ansible.run
         state: touch
         mode: '0644'
diff --git a/init-gitea-themes.yml b/init-gitea-themes.yml
index ccee6e8..60554bc 100644
--- a/init-gitea-themes.yml
+++ b/init-gitea-themes.yml
@@ -10,7 +10,7 @@
       register: no_ansible
 
     - name: Verify if we can run ansible
-      assert:
+      ansible.builtin.assert:
         that:
           - "not no_ansible.stat.exists"
         success_msg: "We are able to run on this node"
@@ -27,7 +27,7 @@
 
   post_tasks:
     - name: Touching run file that ansible has ran here
-      file:
+      ansible.builtin.files:
         path: /var/log/ansible.run
         state: touch
         mode: '0644'
diff --git a/init-gitea-update.yml b/init-gitea-update.yml
index 18672d7..8428f97 100644
--- a/init-gitea-update.yml
+++ b/init-gitea-update.yml
@@ -2,34 +2,29 @@
 - name: Update Gitea
   hosts: all
   become: true
+  vars:
+    gitea_upgrade: "true"
 
   pre_tasks:
     - name: Check if ansible cannot be run here
-      stat:
+      ansible.builtin.stat:
         path: /etc/no-ansible
       register: no_ansible
 
     - name: Verify if we can run ansible
-      assert:
+      ansible.builtin.assert:
         that:
           - "not no_ansible.stat.exists"
         success_msg: "We are able to run on this node"
         fail_msg: "/etc/no-ansible exists - skipping run on this node"
 
-    - name: Enable the proper copr for gitea
-      command: "dnf copr enable nalika/gitea -y"
-      check_mode: false
-      changed_when: "1 != 1"
-
-  tasks:
-    - name: Update Gitea
-      dnf:
-        name: gitea
-        state: latest
+  roles:
+    - role: lazyutilitynet.ansible_gitea.gitea_install
+      state: present
 
   post_tasks:
     - name: Touching run file that ansible has ran here
-      file:
+      ansible.builtin.file:
         path: /var/log/ansible.run
         state: touch
         mode: '0644'
diff --git a/role-gitea.yml b/role-gitea.yml
index da51913..62de161 100644
--- a/role-gitea.yml
+++ b/role-gitea.yml
@@ -15,7 +15,7 @@
       register: no_ansible
 
     - name: Verify if we can run ansible
-      assert:
+      ansible.builtin.assert:
         that:
           - "not no_ansible.stat.exists"
         success_msg: "We are able to run on this node"
@@ -40,7 +40,7 @@
 
   post_tasks:
     - name: Touching run file that ansible has ran here
-      file:
+      ansible.builtin.files:
         path: /var/log/ansible.run
         state: touch
         mode: '0644'