From a118515d425b74136c0e0e868f2ea9573af77ded Mon Sep 17 00:00:00 2001
From: L3D <l3d@c3woc.de>
Date: Mon, 15 May 2023 16:18:32 +0200
Subject: [PATCH] Improve gitea gpg permissions and requirements

---
 README.md        | 22 ++++++++++++++++++++--
 galaxy.yml       |  4 ++--
 requirements.txt |  1 +
 requirements.yml |  2 +-
 roles/gitea      |  2 +-
 5 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 requirements.txt

diff --git a/README.md b/README.md
index 6a0a0ba..fc6a855 100644
--- a/README.md
+++ b/README.md
@@ -14,9 +14,15 @@ Here are all our ansible roles for installing git server.
 ## Using this Collection
 You can install the collection using ansible-galaxy by running:
 ```bash
-ansible-galaxy collection install l3d.git
+ansible-galaxy collection install l3d.git:1.0.7
 ```
 
+Remember you can to Upgrade to the latest version of the l3d.git collection using the ``--upgrade`` parameter:
+```bash
+ansible-galaxy collection install l3d.git --upgrade
+```
+
+
 Or you could clone this collection in your local ansible project for example to ``collections/ansible_collections/l3d/git/``. Make sure you checkout [git submodules](https://git-scm.com/docs/git-submodule) too. Example:
 ```
 # Clone git Repo with submodules to specified path
@@ -37,7 +43,7 @@ You can also list a collection in ``requirements.yml``:
 ---
 collections:
   - name: l3d.git
-    version: ">=1.0.6"
+    version: ">=1.0.7"
 ```
 
 ## Include roles in your playbook
@@ -58,3 +64,15 @@ Example Playbook using the l3d.git.gitea role:
     gitea_start_ssh: true
     gitea_fork: 'forgejo'
 ```
+
+## Requirements
+The roles in this collection using the ``ansible.builtin`` and ``community.general`` ansible Collections. To download the latest forgejo/gitea release we use json_query. This requires ``jmespath`` to be available.
+
+### Example Requirements Installation:
+```bash
+# galaxy requirements
+ansible-galaxy install -r requirements.yml --upgrade
+
+# pip requirements
+pip install -r requirements.txt
+```
diff --git a/galaxy.yml b/galaxy.yml
index 8fc2839..59a8587 100644
--- a/galaxy.yml
+++ b/galaxy.yml
@@ -9,7 +9,7 @@ namespace: l3d
 name: git
 
 # The version of the collection. Must be compatible with semantic versioning
-version: 1.0.6
+version: 1.0.7
 
 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection
 readme: README.md
@@ -48,7 +48,7 @@ tags:
 # L(specifiers,https://python-semanticversion.readthedocs.io/en/latest/#requirement-specification). Multiple version
 # range specifiers can be set and are separated by ','
 dependencies:
-  "community.general": ">=6.5.0"
+  "community.general": ">=7.0.0"
 
 # The URL of the originating SCM repository
 repository: https://github.com/roles-ansible/ansible_collection_git.git
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..65564ac
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1 @@
+jmespath >= 1.0.1
diff --git a/requirements.yml b/requirements.yml
index 704d4eb..65d4d54 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -1,4 +1,4 @@
 ---
 collections:
   - name: community.general
-    version: ">=6.5.0"
+    version: ">=7.0.0"
diff --git a/roles/gitea b/roles/gitea
index a48591b..5022106 160000
--- a/roles/gitea
+++ b/roles/gitea
@@ -1 +1 @@
-Subproject commit a48591bc4bf8121ff34ce6b59d4822d1b524db6c
+Subproject commit 502210624d942259a2c22b225944b3af784f4c70