diff options
author | Dmitry Ilvokhin <d@ilvokhin.com> | 2024-02-10 18:30:56 +0000 |
---|---|---|
committer | Dmitry Ilvokhin <d@ilvokhin.com> | 2024-02-10 18:30:56 +0000 |
commit | 8e77610c987857414e7623f8d5850bf900ac41ad (patch) | |
tree | 5bf962c12e16513eb31833cd323ce109226e6bb4 /roles | |
parent | 592bcf0a95fa3accf87b8f2ce927759a49de0ff5 (diff) | |
download | infra-8e77610c987857414e7623f8d5850bf900ac41ad.tar.gz infra-8e77610c987857414e7623f8d5850bf900ac41ad.tar.bz2 infra-8e77610c987857414e7623f8d5850bf900ac41ad.zip |
Move git dependencies into proper dependencies
Diffstat (limited to 'roles')
-rw-r--r-- | roles/cgit/meta/main.yml | 2 | ||||
-rw-r--r-- | roles/cgit/tasks/main.yml | 9 | ||||
-rw-r--r-- | roles/git/meta/main.yml | 7 | ||||
-rw-r--r-- | roles/git/tasks/main.yml | 13 |
4 files changed, 8 insertions, 23 deletions
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 |