Skip to content
This repository was archived by the owner on Oct 7, 2025. It is now read-only.
Merged
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
2 changes: 1 addition & 1 deletion roles/_meta/common_base/meta/main.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
dependencies:
- { role: debian/apt_extra_packages, apt_extra_packages: ["rsync", "python3-apt", "acl", "gnupg", "build-essential", "cron", "bsd-mailx", "vim", "unzip"] }
- { role: debian/apt_extra_packages, apt_extra_packages: ["rsync", "python3-apt", "acl", "gnupg", "build-essential", "cron", "bsd-mailx", "vim", "unzip", "ca-certificates"] }
- { role: debian/apt_extra_packages, apt_extra_packages: ["dnsutils", "telnet", "atop", "sysstat"], when: ( is_local is not defined or not is_local ) }
- role: debian/locales
- role: debian/user_root
Expand Down
2 changes: 1 addition & 1 deletion roles/debian/apache/tasks/domain.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
- name: Generates SSL keys.
ansible.builtin.include_role:
name: ssl
name: debian/ssl
when: domain.ssl is defined
vars:
ssl: "{{ domain.ssl }}"
Expand Down
4 changes: 2 additions & 2 deletions roles/debian/gitlab/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@

- name: Install the unattended-upgrades config.
ansible.builtin.include_role:
name: apt_unattended_upgrades
name: debian/apt_unattended_upgrades
when: apt_unattended_upgrades.enable

- name: Ensure Gitlab is installed.
Expand All @@ -62,7 +62,7 @@

- name: Generates SSL keys.
ansible.builtin.include_role:
name: ssl
name: debian/ssl
when: gitlab.ssl.enabled
vars:
ssl: "{{ gitlab.ssl | combine( { 'domain': gitlab.server_name } ) }}"
Expand Down
4 changes: 2 additions & 2 deletions roles/debian/gitlab_runner/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

- name: Install the unattended-upgrades config.
ansible.builtin.include_role:
name: apt_unattended_upgrades
name: debian/apt_unattended_upgrades
when: apt_unattended_upgrades.enable

- name: Ensure Gitlab Runner is installed.
Expand Down Expand Up @@ -135,7 +135,7 @@

- name: Run docker_ce role when Fargate driver to be installed.
ansible.builtin.include_role:
name: docker_ce
name: debian/docker_ce
when: gitlab_runner.install_fargate

- name: Add the ce-provision user to the docker group.
Expand Down
2 changes: 1 addition & 1 deletion roles/debian/jenkins/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

- name: Generates SSL keys.
ansible.builtin.include_role:
name: "{{ jenkins.ssl_handling }}"
name: debian/ssl
vars:
ssl:
domain: "{{ jenkins.server_name }}"
Expand Down
6 changes: 3 additions & 3 deletions roles/debian/ldap_server/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
- name: Stop slapd service.
ansible.builtin.include_role:
name: process_manager
name: debian/process_manager
when: ldap_server.slapd.purge
vars:
process_manager:
Expand Down Expand Up @@ -58,7 +58,7 @@

- name: Stop slapd service.
ansible.builtin.include_role:
name: process_manager
name: debian/process_manager
vars:
process_manager:
process_name: slapd
Expand Down Expand Up @@ -133,7 +133,7 @@

- name: Generate SSL keys if provided.
ansible.builtin.include_role:
name: ssl
name: debian/ssl
vars:
ssl: "{{ ldap_server.ssl }}"

Expand Down
2 changes: 1 addition & 1 deletion roles/debian/nginx/tasks/domain.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

- name: Generates SSL keys.
ansible.builtin.include_role:
name: ssl
name: debian/ssl
public: true
when: domain.ssl is defined
vars:
Expand Down
2 changes: 1 addition & 1 deletion roles/debian/nodejs/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

- name: Install the unattended-upgrades config.
ansible.builtin.include_role:
name: apt_unattended_upgrades
name: debian/apt_unattended_upgrades
when: apt_unattended_upgrades.enable

- name: Ensure NodeJS and Yarn are installed.
Expand Down
2 changes: 1 addition & 1 deletion roles/debian/ossec/tasks/ossec-server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@

- name: Generates SSL keys.
ansible.builtin.include_role:
name: ssl
name: debian/ssl
vars:
ssl: "{{ ossec.ssl }}"

Expand Down
2 changes: 1 addition & 1 deletion roles/debian/php-cli/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@

- name: Setup composer.
ansible.builtin.include_role:
name: php_composer
name: debian/php_composer
6 changes: 3 additions & 3 deletions roles/debian/php-common/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

- name: Install the unattended-upgrades config.
ansible.builtin.include_role:
name: apt_unattended_upgrades
name: debian/apt_unattended_upgrades
when: apt_unattended_upgrades.enable

- name: Install PHP packages.
Expand Down Expand Up @@ -64,8 +64,8 @@

- name: Setup xdebug.
ansible.builtin.include_role:
name: php_xdebug
name: debian/php_xdebug

- name: Setup Blackfire.
ansible.builtin.include_role:
name: php_blackfire
name: debian/php_blackfire
2 changes: 1 addition & 1 deletion roles/debian/php-fpm/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

- name: Setup xdebug.
ansible.builtin.include_role:
name: php_xdebug
name: debian/php_xdebug

- name: Trigger overrides
ansible.builtin.include_role:
Expand Down
3 changes: 0 additions & 3 deletions roles/debian/php_blackfire/meta/main.yml

This file was deleted.

3 changes: 0 additions & 3 deletions roles/debian/php_xdebug/meta/main.yml

This file was deleted.

2 changes: 1 addition & 1 deletion roles/debian/squashfs/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

- name: Allow the deploy user to mount and unmount volumes.
ansible.builtin.include_role:
name: sudo_config
name: debian/sudo_config
vars:
sudo_config:
entity_name: "{{ user_deploy.username }}"
Expand Down
2 changes: 1 addition & 1 deletion roles/debian/user_ansible/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

- name: Add user to sudoers.
ansible.builtin.include_role:
name: sudo_config
name: debian/sudo_config
vars:
sudo_config:
entity_name: "{{ user_ansible.username }}"
Expand Down
2 changes: 1 addition & 1 deletion roles/debian/user_deploy/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
- ansible.builtin.include_role:
name: user_ansible
name: debian/user_ansible
vars:
user_ansible: "{{ user_deploy }}"
2 changes: 1 addition & 1 deletion roles/debian/user_provision/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
- ansible.builtin.include_role:
name: user_ansible
name: debian/user_ansible
vars:
user_ansible: "{{ user_provision }}"