Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion roles/gitlab/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ gitlab_edition: "gitlab-ee"
gitlab_version: ""
gitlab_release: ""
gitlab_gpg_key_url: "https://packages.gitlab.com/gitlab/{{ gitlab_edition }}/gpgkey"
gitlab_gpg_key_id: "F6403F6544A38863DAA0B6E03F01618A51312F3F"

# Do not display sensitive changes in diffs by default
gitlab_hide_sensitive_changes: true
Expand Down
4 changes: 2 additions & 2 deletions roles/gitlab/tasks/install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
enabled: true
gpgkey:
- "{{ gitlab_gpg_key_url }}"
- "{{ gitlab_gpg_key_url }}/gitlab-{{ gitlab_edition }}-3D645A26AB9FBD22.pub.gpg"
- "{{ gitlab_gpg_key_url }}/gitlab-{{ gitlab_edition }}-{{ gitlab_gpg_key_id }}.pub.gpg"
sslverify: true
sslcacert: "/etc/pki/tls/certs/ca-bundle.crt"
metadata_expire: "300"
Expand All @@ -86,7 +86,7 @@
enabled: true
gpgkey:
- "{{ gitlab_gpg_key_url }}"
- "{{ gitlab_gpg_key_url }}/gitlab-{{ gitlab_edition }}-3D645A26AB9FBD22.pub.gpg"
- "{{ gitlab_gpg_key_url }}/gitlab-{{ gitlab_edition }}-{{ gitlab_gpg_key_id }}.pub.gpg"
sslverify: true
sslcacert: "/etc/pki/tls/certs/ca-bundle.crt"
metadata_expire: "300"
Expand Down
1 change: 1 addition & 0 deletions roles/gitlab/vars/AlmaLinux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ gitlab_dependencies:
gitlab_repo_url: "https://packages.gitlab.com/gitlab/{{ gitlab_edition }}/el/{{ ansible_facts.distribution_major_version }}/$basearch"
gitlab_source_repo_url: "https://packages.gitlab.com/gitlab/{{ gitlab_edition }}/el/{{ ansible_facts.distribution_major_version }}/SRPMS"
gitlab_package_name: "{{ gitlab_edition + '-' + gitlab_version + '-' + gitlab_release if gitlab_version and gitlab_release else gitlab_edition }}"
gitlab_gpg_key_id: "CB947AD886C8E8FD"
1 change: 1 addition & 0 deletions roles/gitlab/vars/CentOS.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ gitlab_dependencies:
gitlab_repo_url: "https://packages.gitlab.com/gitlab/{{ gitlab_edition }}/el/{{ ansible_facts.distribution_major_version }}/$basearch"
gitlab_source_repo_url: "https://packages.gitlab.com/gitlab/{{ gitlab_edition }}/el/{{ ansible_facts.distribution_major_version }}/SRPMS"
gitlab_package_name: "{{ gitlab_edition + '-' + gitlab_version + '-' + gitlab_release if gitlab_version and gitlab_release else gitlab_edition }}"
gitlab_gpg_key_id: "CB947AD886C8E8FD"
1 change: 1 addition & 0 deletions roles/gitlab/vars/Debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ gitlab_dependencies:
- "tzdata"
gitlab_repo_url: "https://packages.gitlab.com/gitlab/{{ gitlab_edition }}/debian/"
gitlab_package_name: "{{ gitlab_edition + '=' + gitlab_version + '-' + gitlab_release if gitlab_version and gitlab_release else gitlab_edition }}"
gitlab_gpg_key_id: "F6403F6544A38863DAA0B6E03F01618A51312F3F"
1 change: 1 addition & 0 deletions roles/gitlab/vars/Ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ gitlab_dependencies:
- "tzdata"
gitlab_repo_url: "https://packages.gitlab.com/gitlab/{{ gitlab_edition }}/ubuntu/"
gitlab_package_name: "{{ gitlab_edition + '=' + gitlab_version + '-' + gitlab_release if gitlab_version and gitlab_release else gitlab_edition }}"
gitlab_gpg_key_id: "F6403F6544A38863DAA0B6E03F01618A51312F3F"