Skip to content

Commit 93a90d8

Browse files
committed
debug
Signed-off-by: Norman Ziegner <[email protected]>
1 parent e5fbe34 commit 93a90d8

File tree

3 files changed

+27
-16
lines changed

3 files changed

+27
-16
lines changed

molecule/gitlab/prepare.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
- "sudo" # for `become` privilege escalation
3131
- "iproute2" # for gathering network facts
3232
- "python3-debian"
33+
- "ca-certificates"
3334
state: "present"
3435
update_cache: true
3536

roles/gitlab/tasks/install.yml

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,41 +14,45 @@
1414
- name: "Prepare Debian GitLab installation"
1515
when: "ansible_facts.os_family == 'Debian'"
1616
block:
17-
- name: "Remove APT GPG key"
17+
- name: "Remove GitLab APT GPG key from legacy trusted.gpg keyring"
1818
ansible.builtin.apt_key:
1919
url: "{{ gitlab_gpg_key_url }}"
2020
id: "{{ gitlab_gpg_key_id }}"
2121
state: "absent"
2222
when: "not gitlab_is_initial_dryrun"
2323

24+
- name: "Remove GitLab APT repository from sources.list"
25+
ansible.builtin.apt_repository:
26+
repo: "deb {{ gitlab_repo_url }} {{ ansible_facts.distribution_release }} main"
27+
state: "absent"
28+
filename: "gitlab_{{ gitlab_edition }}"
29+
30+
- name: "Remove GitLab source APT repository from sources.list"
31+
ansible.builtin.apt_repository:
32+
repo: "deb-src {{ gitlab_repo_url }} {{ ansible_facts.distribution_release }} main"
33+
state: "absent"
34+
filename: "gitlab_{{ gitlab_edition }}"
35+
2436
- name: "Add GitLab APT repository"
2537
ansible.builtin.deb822_repository:
2638
name: "{{ gitlab_edition }}"
27-
types: "deb"
39+
types:
40+
- "deb"
41+
- "deb-src"
2842
uris: "{{ gitlab_repo_url }}"
29-
suites: "{{ ansible_facts.distribution_release }}"
43+
suites: "{{ ansible_facts.distribution_release | lower }}"
3044
components: "main"
3145
signed_by: "{{ gitlab_gpg_key_url }}"
46+
architectures: "amd64"
3247
state: "present"
3348
mode: "0644"
3449
enabled: true
3550

36-
- name: "Remove GitLab source APT repository"
37-
ansible.builtin.apt_repository:
38-
repo: "deb-src {{ gitlab_repo_url }} {{ ansible_facts.distribution_release }} main"
39-
state: "absent"
40-
filename: "gitlab_{{ gitlab_edition }}"
41-
mode: "0644"
42-
4351
- name: "Update APT package cache"
4452
ansible.builtin.apt:
4553
update_cache: true
46-
cache_valid_time: 3600
47-
register: "gitlab_apt_cache"
4854
check_mode: false
49-
changed_when:
50-
- "gitlab_apt_cache.cache_updated"
51-
- "not ansible_check_mode"
55+
changed_when: false
5256

5357
- name: "Install GitLab on RedHat Like OS"
5458
when: "ansible_facts.os_family == 'RedHat'"

roles/zammad/tasks/install.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,19 @@
4040
name: "zammad"
4141
types: "deb"
4242
uris: "{{ zammad_repo_url }}"
43-
suites: "{{ ansible_distribution_version }}"
43+
suites: "{{ ansible_facts.distribution_version }}"
4444
components: "main"
4545
signed_by: "https://dl.packager.io/srv/zammad/zammad/key"
46+
architectures: "amd64"
4647
state: "present"
4748
mode: "0644"
4849
enabled: true
4950

51+
- name: "Update apt cache"
52+
ansible.builtin.apt:
53+
update_cache: true
54+
changed_when: false
55+
5056
- name: "Gather the package facts to check wether Zammad has already been installed"
5157
ansible.builtin.package_facts:
5258
manager: "auto"

0 commit comments

Comments
 (0)