diff --git a/roles/dns_adblocking/meta/main.yml b/roles/dns_adblocking/meta/main.yml deleted file mode 100644 index 22d67080..00000000 --- a/roles/dns_adblocking/meta/main.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -dependencies: - - { role: common, tags: common } - - role: dns_encryption - tags: dns_encryption - when: dns_encryption diff --git a/roles/dns_encryption/meta/main.yml b/roles/dns_encryption/meta/main.yml deleted file mode 100644 index 9119c109..00000000 --- a/roles/dns_encryption/meta/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -dependencies: - - role: common - tags: common diff --git a/roles/ssh_tunneling/meta/main.yml b/roles/ssh_tunneling/meta/main.yml deleted file mode 100644 index e985f927..00000000 --- a/roles/ssh_tunneling/meta/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -dependencies: - - { role: common, tags: common } diff --git a/roles/vpn/meta/main.yml b/roles/vpn/meta/main.yml index 22d67080..5f86e875 100644 --- a/roles/vpn/meta/main.yml +++ b/roles/vpn/meta/main.yml @@ -1,7 +1,6 @@ --- dependencies: - - { role: common, tags: common } - role: dns_encryption tags: dns_encryption when: dns_encryption diff --git a/roles/wireguard/meta/main.yml b/roles/wireguard/meta/main.yml deleted file mode 100644 index a766ccc1..00000000 --- a/roles/wireguard/meta/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -dependencies: - - { role: common, tags: common } diff --git a/server.yml b/server.yml index 0a53e474..379821df 100644 --- a/server.yml +++ b/server.yml @@ -8,6 +8,7 @@ - config.cfg roles: + - role: common - role: dns_adblocking when: algo_local_dns tags: dns_adblocking diff --git a/users.yml b/users.yml index 545c1bda..36f162f5 100644 --- a/users.yml +++ b/users.yml @@ -59,6 +59,7 @@ - "configs/{{ inventory_hostname }}/config.yml" roles: + - role: common - role: ssh_tunneling when: algo_ssh_tunneling - role: wireguard