From 988246ac66fbee88316681822c46d6621aeb586f Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Thu, 30 Apr 2020 13:08:15 -0500
Subject: [PATCH] Fix not including tasks to add user

---
 roles/gitea/handlers/main.yml          |  2 +-
 roles/gitea/tasks/add_default_user.yml | 53 +++++++++++++-------------
 2 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/roles/gitea/handlers/main.yml b/roles/gitea/handlers/main.yml
index 46e8b95..ef22b29 100644
--- a/roles/gitea/handlers/main.yml
+++ b/roles/gitea/handlers/main.yml
@@ -7,4 +7,4 @@
     name: gitea.service
     state: restarted
 - name: gitea add default user
-  import_tasks: tasks/add_default_user.yml
+  include_tasks: tasks/add_default_user.yml
diff --git a/roles/gitea/tasks/add_default_user.yml b/roles/gitea/tasks/add_default_user.yml
index 674fa7a..a679d39 100644
--- a/roles/gitea/tasks/add_default_user.yml
+++ b/roles/gitea/tasks/add_default_user.yml
@@ -2,32 +2,31 @@
 #!/usr/bin/ansible-playbook
 # vim:ft=ansible:
 ---
-- name: Create user
-  command:
-    argv:
-      - /usr/local/bin/gitea
-      - admin
-      - create-user
-      - --username
-      - "{{ gitea_admin_username }}"
-      - --password
-      - "{{ gitea_admin_password }}"
-      - --email
-      - "{{ gitea_admin_email }}"
-      - --config
-      - /etc/gitea/app.ini
-  become: yes
-  become_user: git
-- name: Promote user to admin
-  command:
-    argv:
-      - /usr/bin/mysql
-      - gitea
-      - -u
-      - gitea
-      - -p
-      - "{{ gitea_mysql_password }}"
-      - -e
-      - 'UPDATE user SET is_admin = 1 WHERE name = "{{ gitea_admin_username }}";'
+- block:
+    - name: Create user
+      command:
+        argv:
+          - /usr/local/bin/gitea
+          - admin
+          - create-user
+          - --username
+          - "{{ gitea_admin_username }}"
+          - --password
+          - "{{ gitea_admin_password }}"
+          - --email
+          - "{{ gitea_admin_email }}"
+          - --config
+          - /etc/gitea/app.ini
+    - name: Promote user to admin
+      command:
+        argv:
+          - /usr/bin/mysql
+          - gitea
+          - -u
+          - gitea
+          - -p
+          - "{{ gitea_mysql_password }}"
+          - -e
+          - 'UPDATE user SET is_admin = 1 WHERE name = "{{ gitea_admin_username }}";'
   become: yes
   become_user: git