From 8b447b809af733c89ba8569ffa19f22bb1cc7c19 Mon Sep 17 00:00:00 2001 From: Aidan Fitzgerald Date: Thu, 7 Mar 2019 23:55:12 -0500 Subject: [PATCH] Apply more suggestions from code review --- roles/6-generic-apps/tasks/main.yml | 12 ++++++------ roles/gitea/defaults/main.yml | 3 +++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/roles/6-generic-apps/tasks/main.yml b/roles/6-generic-apps/tasks/main.yml index 4fcd4d494..8823f02ef 100644 --- a/roles/6-generic-apps/tasks/main.yml +++ b/roles/6-generic-apps/tasks/main.yml @@ -27,6 +27,12 @@ when: ejabberd_install tags: ejabberd +- name: GITEA + include_role: + name: gitea + when: gitea_install + tags: gitea + - name: LOKOLE include_role: name: lokole @@ -69,12 +75,6 @@ when: wordpress_install tags: wordpress -- name: GITEA - include_role: - name: gitea - when: gitea_install - tags: gitea - - name: Recording STAGE 6 HAS COMPLETED ==================== lineinfile: dest: "{{ iiab_env_file }}" diff --git a/roles/gitea/defaults/main.yml b/roles/gitea/defaults/main.yml index cffc63f89..f391cbd44 100644 --- a/roles/gitea/defaults/main.yml +++ b/roles/gitea/defaults/main.yml @@ -2,6 +2,9 @@ #gitea_install: True #gitea_enabled: True +# All above are set in: github.com/iiab/iiab/blob/master/vars/default_vars.yml +# If nec, change them by editing /etc/iiab/local_vars.yml prior to installing! + # Using @coolaj86's script as a template # https://git.coolaj86.com/coolaj86/gitea-installer.sh