diff --git a/roles/gitlab/tasks/nginx.yml b/roles/gitlab/tasks/nginx.yml index 4ac86e2..85eb8a7 100644 --- a/roles/gitlab/tasks/nginx.yml +++ b/roles/gitlab/tasks/nginx.yml @@ -1,17 +1,5 @@ --- -- name: Include ssl role - ansible.builtin.include_role: - name: alphanodes.setup.ssl - public: true - -- name: Include nginx role - ansible.builtin.include_role: - name: alphanodes.setup.nginx - public: true - vars: - nginx_with_websocket: true - - name: Set TLS files for letsencrypt ansible.builtin.set_fact: vhost_letsencrypt_cert: "{{ gitlab_vhost_letsencrypt_cert }}" diff --git a/roles/gitlab/tasks/setup.yml b/roles/gitlab/tasks/setup.yml index 78973fa..4ef3c39 100644 --- a/roles/gitlab/tasks/setup.yml +++ b/roles/gitlab/tasks/setup.yml @@ -28,6 +28,18 @@ ansible.builtin.include_role: name: alphanodes.setup.redis_server +- name: Include ssl role + ansible.builtin.include_role: + name: alphanodes.setup.ssl + public: true + +- name: Include nginx role + ansible.builtin.include_role: + name: alphanodes.setup.nginx + public: true + vars: + nginx_with_websocket: true + - name: Install required packages for gitlab ansible.builtin.apt: name: '{{ gitlab_packages }}'