From 8e77610c987857414e7623f8d5850bf900ac41ad Mon Sep 17 00:00:00 2001 From: Dmitry Ilvokhin Date: Sat, 10 Feb 2024 18:30:56 +0000 Subject: Move git dependencies into proper dependencies --- roles/cgit/meta/main.yml | 2 +- roles/cgit/tasks/main.yml | 9 --------- roles/git/meta/main.yml | 7 +++++++ roles/git/tasks/main.yml | 13 ------------- 4 files changed, 8 insertions(+), 23 deletions(-) create mode 100644 roles/git/meta/main.yml diff --git a/roles/cgit/meta/main.yml b/roles/cgit/meta/main.yml index 0134c20..c213084 100644 --- a/roles/cgit/meta/main.yml +++ b/roles/cgit/meta/main.yml @@ -1,4 +1,4 @@ dependencies: - - role: fcgiwrap - role: nginx + - role: fcgiwrap - role: git diff --git a/roles/cgit/tasks/main.yml b/roles/cgit/tasks/main.yml index e88ae11..f6e12f9 100644 --- a/roles/cgit/tasks/main.yml +++ b/roles/cgit/tasks/main.yml @@ -4,15 +4,6 @@ - cgit state: present -- ansible.builtin.include_role: - name: fcgiwrap - -- ansible.builtin.include_role: - name: nginx - -- ansible.builtin.include_role: - name: git - - name: Configure cgit for git.ilvokhin.com ansible.builtin.copy: src: files/cgitrc diff --git a/roles/git/meta/main.yml b/roles/git/meta/main.yml new file mode 100644 index 0000000..db5df62 --- /dev/null +++ b/roles/git/meta/main.yml @@ -0,0 +1,7 @@ +dependencies: + - role: certificate + vars: + domains: + - git.ilvokhin.com + - role: nginx + - role: fcgiwrap diff --git a/roles/git/tasks/main.yml b/roles/git/tasks/main.yml index 76d0722..49d52a6 100644 --- a/roles/git/tasks/main.yml +++ b/roles/git/tasks/main.yml @@ -71,19 +71,6 @@ enabled: yes state: started -- ansible.builtin.include_role: - name: fcgiwrap - -- name: Request SSL certificate for git.ilvokhin.com - ansible.builtin.include_role: - name: certificate - vars: - domains: - - git.ilvokhin.com - -- ansible.builtin.include_role: - name: nginx - - name: Setup auth directory for git ansible.builtin.file: path: /etc/nginx/auth/git -- cgit v1.2.3-70-g09d2