From 590741d0018035bedd0c03b25f1fa6e68cfbc819 Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Sat, 15 Aug 2020 05:51:05 -0500
Subject: [PATCH] Rename Gitea root directory

---
 playbooks/webservers.yml      | 2 +-
 roles/gitea/defaults/main.yml | 2 +-
 roles/gitea/tasks/main.yml    | 4 ++--
 roles/gitea/templates/app.ini | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/playbooks/webservers.yml b/playbooks/webservers.yml
index 63a7f7e..9f7f877 100644
--- a/playbooks/webservers.yml
+++ b/playbooks/webservers.yml
@@ -46,7 +46,7 @@
       tags: [ backups ]
     - role: gitea
       vars:
-        gitea_root_directory: "/cold/gitea-repositories/"
+        gitea.root: "/cold/gitea-repositories/"
       tags: [ web, gitea ]
     - role: grafana
       tags: [ web, grafana ]
diff --git a/roles/gitea/defaults/main.yml b/roles/gitea/defaults/main.yml
index ccb850e..01119a0 100644
--- a/roles/gitea/defaults/main.yml
+++ b/roles/gitea/defaults/main.yml
@@ -1,5 +1,5 @@
 # vim:ft=ansible:
-gitea_root_directory: "/home/git/gitea-repositories"
+gitea.root: "/home/git/gitea-repositories"
 gitea.app_name: "Ansible Gitea"
 gitea_push_create_user: "true"
 gitea_push_create_org: "false"
diff --git a/roles/gitea/tasks/main.yml b/roles/gitea/tasks/main.yml
index cc4fd1e..19cdd2d 100644
--- a/roles/gitea/tasks/main.yml
+++ b/roles/gitea/tasks/main.yml
@@ -90,7 +90,7 @@
         mode: "0700"
         owner: git
         group: git
-        path: "{{ gitea_root_directory }}"
+        path: "{{ gitea.root }}"
     - name: Set up EFS mount
       block:
         - name: Install required packages
@@ -107,7 +107,7 @@
                 security_groups: [ "{{ gitea.efs.security_group }}" ]
           register: efs
         - name: Mount EFS
-          path: "{{ gitea_root_directory }}"
+          path: "{{ gitea.root }}"
           src: "{{ efs.efs.filesystem_address }}"
           fstype: nfs4
           opts: "nfsvers=4.1,rsize=1048576,wsize=1048576,hard,timeo=600,retrans=2,noresvport"
diff --git a/roles/gitea/templates/app.ini b/roles/gitea/templates/app.ini
index f21c4e6..d087a02 100644
--- a/roles/gitea/templates/app.ini
+++ b/roles/gitea/templates/app.ini
@@ -34,7 +34,7 @@ ENABLE_FEDERATED_AVATAR = false
 [repository]
 ENABLE_PUSH_CREATE_USER = {{ gitea_push_create_user }}
 ENABLE_PUSH_CREATE_ORG  = {{ gitea_push_create_org }}
-ROOT                    = {{ gitea_root_directory }}
+ROOT                    = {{ gitea.root }}
 
 [security]
 INTERNAL_TOKEN      = {{ gitea_internal_token.stdout }}