From 28248516b0c0fa7c2bfa45381755664408cb2b36 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 7 Mar 2019 23:51:19 -0500 Subject: [PATCH 1/4] Update roles/gitea/README.rst Co-Authored-By: aidan-fitz --- roles/gitea/README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/gitea/README.rst b/roles/gitea/README.rst index c9b664d5f..be243e787 100644 --- a/roles/gitea/README.rst +++ b/roles/gitea/README.rst @@ -7,7 +7,7 @@ This Ansible role installs Gitea - a self-hosted Git service written in Go. Using It -------- -Gitea should be accessible at http://box/gitea/. +Gitea should be accessible at http://box/gitea Configuration ------------- From d86c985f7c077f32ee76d186d2827864423d1c63 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 7 Mar 2019 23:52:07 -0500 Subject: [PATCH 2/4] Update roles/gitea/tasks/install.yml Co-Authored-By: aidan-fitz --- roles/gitea/tasks/install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/gitea/tasks/install.yml b/roles/gitea/tasks/install.yml index c6bfefdaa..4f4a3c1ad 100644 --- a/roles/gitea/tasks/install.yml +++ b/roles/gitea/tasks/install.yml @@ -160,7 +160,7 @@ state: absent when: not gitea_enabled and is_debuntu -- name: Restart Apache, so it picks up the new aliases +- name: Restart Apache ({{ apache_service }}) to enable/disable http://box/gitea service: name: "{{ apache_service }}" state: restarted From eea7bea300d02d7712b39cb2b015872ce4fd38d8 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 7 Mar 2019 23:52:19 -0500 Subject: [PATCH 3/4] Update vars/local_vars_medium.yml Co-Authored-By: aidan-fitz --- vars/local_vars_medium.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml index 25a9f879b..2908b81f4 100644 --- a/vars/local_vars_medium.yml +++ b/vars/local_vars_medium.yml @@ -180,7 +180,7 @@ elgg_enabled: True ejabberd_install: False ejabberd_enabled: False -gitea_install: True +gitea_install: False gitea_enabled: False # Lokole (email for rural communities) from https://ascoderu.ca From 73d945e278f0648adaabf476d01a0ed2927d148d Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 7 Mar 2019 23:54:11 -0500 Subject: [PATCH 4/4] Apply suggestions from code review Co-Authored-By: aidan-fitz --- roles/gitea/tasks/main.yml | 2 +- vars/default_vars.yml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/roles/gitea/tasks/main.yml b/roles/gitea/tasks/main.yml index 211db861b..e75a9f12a 100644 --- a/roles/gitea/tasks/main.yml +++ b/roles/gitea/tasks/main.yml @@ -1,3 +1,3 @@ -- name: Include the install playbook +- name: Install Gitea {{ gitea_version }} if gitea_install include_tasks: install.yml when: gitea_install diff --git a/vars/default_vars.yml b/vars/default_vars.yml index b4f3a6d43..6d3c48598 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -298,7 +298,6 @@ nodered_enabled: False nodered_port: 1880 nodered_web_path: nodered -# Nextcloud nextcloud_install: False nextcloud_enabled: False