infrastructure/mono-infrastructure
7
0
Fork 0
mirror of https://github.com/rocky-linux/infrastructure synced 2024-11-25 14:41:28 +00:00
Code Issues Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
nazunalika 2021-07-18 15:17:49 -07:00
parent f5afcc6d44
commit 1a0cbb75e9
Signed by: label
GPG Key ID: 6735C0E1BD65D048
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ansible/playbooks/role-rocky-gitlab-ee.yml
View File

@ -30,9 +30,17 @@
state: present state: present
roles: roles:
- role: rockylinux.ipagetcert
state: present
when:
- "not gitlab_create_self_signed_cert|bool"
- "gitlab_ipa_cert|bool"
- role: geerlingguy.certbot - role: geerlingguy.certbot
state: present state: present
when: not gitlab_create_self_signed_cert when:
- "not gitlab_create_self_signed_cert|bool"
- "gitlab_certbot|bool"
- role: geerlingguy.gitlab - role: geerlingguy.gitlab
state: present state: present

6
ansible/playbooks/tasks/gitlab-reconfigure.yml
View File

@ -7,7 +7,7 @@
group: root group: root
mode: '0644' mode: '0644'
remote_src: true remote_src: true
when: not gitlab_create_self_signed_cert when: "not gitlab_create_self_signed_cert|bool"
- name: Copy keys from ipa-getcert directory - name: Copy keys from ipa-getcert directory
copy: copy:
@ -17,7 +17,7 @@
group: root group: root
mode: '0600' mode: '0600'
remote_src: true remote_src: true
when: not gitlab_create_self_signed_cert when: "not gitlab_create_self_signed_cert|bool"
- name: Symlink the IPA CA - name: Symlink the IPA CA
file: file:
@ -43,7 +43,7 @@
register: gitlab_ctl_result register: gitlab_ctl_result
changed_when: "gitlab_ctl_result.rc == 0" changed_when: "gitlab_ctl_result.rc == 0"
when: when:
- gitlab_reconfigure_only - "gitlab_reconfigure_only is defined and (gitlab_reconfigure_only|bool)"
- name: Add firewall rules - http/s - name: Add firewall rules - http/s
ansible.posix.firewalld: ansible.posix.firewalld:

2
ansible/playbooks/vars/gitlab.yml
View File

@ -18,6 +18,8 @@ gitlab_ssl_certificate: "/etc/gitlab/ssl/{{ gitlab_domain }}.crt"
gitlab_ssl_certificate_key: "/etc/gitlab/ssl/{{ gitlab_domain }}.key" gitlab_ssl_certificate_key: "/etc/gitlab/ssl/{{ gitlab_domain }}.key"
gitlab_ssl_cert: "/etc/pki/tls/certs/{{ gitlab_domain }}.crt" gitlab_ssl_cert: "/etc/pki/tls/certs/{{ gitlab_domain }}.crt"
gitlab_ssl_key: "/etc/pki/tls/private/{{ gitlab_domain }}.key" gitlab_ssl_key: "/etc/pki/tls/private/{{ gitlab_domain }}.key"
gitlab_ipa_cert: "true"
gitlab_certbot: "false"
# LDAP Configuration # LDAP Configuration
gitlab_ldap_enabled: "true" gitlab_ldap_enabled: "true"