From 775c389c45819808d242b321c2ff50313ba2277d Mon Sep 17 00:00:00 2001
From: nazunalika <tucklesepk@gmail.com>
Date: Wed, 16 Mar 2022 00:30:42 -0700
Subject: [PATCH] should be possible to use httpd module for certs

---
 adhoc-create-org.yml | 5 ++++-
 role-gitea.yml       | 4 +++-
 tests/test.yml       | 5 +++--
 vars/common.yml      | 3 ++-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/adhoc-create-org.yml b/adhoc-create-org.yml
index b50b076..96748ef 100644
--- a/adhoc-create-org.yml
+++ b/adhoc-create-org.yml
@@ -1,6 +1,6 @@
 ---
 # This playbook is meant to be used with callable variables, like adhoc or AWX.
-# What: Creates an organization/group in Gitea
+# What: Creates an organization/group in Gitea, relying on the gitea collection
 # What is expected:
 - name: Create Gitea Organization or Group
   hosts: all
@@ -8,5 +8,8 @@
   vars_files:
     - "vars/common.yml"
 
+  # Create org
+  # Optionally assign user as part of owner team
+  # Remove automated account
   tasks:
 ...
diff --git a/role-gitea.yml b/role-gitea.yml
index c199d51..f7ea0aa 100644
--- a/role-gitea.yml
+++ b/role-gitea.yml
@@ -1,4 +1,6 @@
 ---
+# This does not use the gitea collection to install. Instead, we are installing
+# from our own packages built for EL/Fedora in Copr.
 - name: Setup Gitea
   hosts: all
   become: true
@@ -27,7 +29,7 @@
   roles:
     - role: rockylinux.ipagetcert
       state: present
-      when: gitea_web_config_certs|bool
+      when: gitea_web_config_certs_internal|bool
 
   tasks:
     - name: Install and Configure Gitea
diff --git a/tests/test.yml b/tests/test.yml
index 27fe873..8564475 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -1,5 +1,6 @@
 ---
 - hosts: localhost
-  remote_user: root
+  become: true
   tasks:
-    - import_tasks: example.yml
+    - import_tasks: gitea.yml
+...
diff --git a/vars/common.yml b/vars/common.yml
index a897bf4..bf6c2ef 100644
--- a/vars/common.yml
+++ b/vars/common.yml
@@ -2,7 +2,8 @@
 gitea_web_install: "httpd"
 gitea_web_username: "{% if gitea_web_install == 'httpd' %}apache{% else %}{{ gitea_web_install }}{% endif %}"
 gitea_web_config: "true"
-gitea_web_config_certs: "false"
+gitea_web_config_certs_internal: "false"
+gitea_web_config_certs_external: "false"
 gitea_themes: "auto,gitea,arc-green,gitea-blue,gitea-modern,carbonred,darkred,pitchblack"
 gitea_basename: "git.resf.org"
 gitea_automation_user: "rockyautomation"