From 062f0b49450f942c9920543b281752afd5a1cec9 Mon Sep 17 00:00:00 2001 From: staffadmin Date: Thu, 23 Nov 2023 14:21:02 +0100 Subject: [PATCH] Remove apt role to use grog one --- all.yml | 2 +- group_vars/controller.yml | 6 ++++++ group_vars/kubernetes.yml | 5 ++--- roles/requirements.yml | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/all.yml b/all.yml index 36147f5..bf6a884 100644 --- a/all.yml +++ b/all.yml @@ -26,7 +26,7 @@ roles: - { role: grog.management-user, tags: user } - { role: willshersystems.sshd, tags: ssh } - - { role: claranet.apt, tags: apt } + - { role: grog.package, tags: package } - { role: robertdebock.fail2ban, tags: ban } - { role: nickhammond.logrotate, tags: log } - { role: geerlingguy.pip, tags: pip } diff --git a/group_vars/controller.yml b/group_vars/controller.yml index 5f595b0..7491963 100644 --- a/group_vars/controller.yml +++ b/group_vars/controller.yml @@ -1,4 +1,10 @@ --- + +package_list: + - name: python3-pip + - name: proxychains + + ######## # USER # ######## diff --git a/group_vars/kubernetes.yml b/group_vars/kubernetes.yml index aa2ed9f..0c00627 100644 --- a/group_vars/kubernetes.yml +++ b/group_vars/kubernetes.yml @@ -1,7 +1,6 @@ --- -apt_packages: - - name: openssh-server - - name: proxychains +package_list: + - name: python3-pip sshd_skip_defaults: true sshd_config_file: /etc/ssh/sshd_config diff --git a/roles/requirements.yml b/roles/requirements.yml index 624bcaa..ff77309 100644 --- a/roles/requirements.yml +++ b/roles/requirements.yml @@ -20,7 +20,7 @@ # SSH server side - src: willshersystems.sshd # PACKAGE -- src: claranet.apt +- src: GROG.package # IPTABLES - src: geerlingguy.firewall # LOG ROTATE