diff --git a/group_vars/all.yml b/group_vars/all.yml index 5478180e..e67a913f 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -64,6 +64,36 @@ - .tmux.conf - .gitconfig - .vimrc + ### mgrote.install_packages + programs_common: + - locales + - build-essential + - ntp + - htop + - git + - dnsutils + - nano + - mc + - cifs-utils + - netdiscover + - tree + - curl + - logrotate + - ncdu + - net-tools + - apt-transport-https + - neofetch + - ntpdate + - acl + - vim + programs_only_physical: + - hddtemp + - ipmitool + - powertop + - s-tui + programs_only_vms: + - qemu-guest-agent + - open-vm-tools # Ansible Variablen ### User diff --git a/group_vars/jenkins.yml b/group_vars/jenkins.yml index cab1576a..9cd8989a 100644 --- a/group_vars/jenkins.yml +++ b/group_vars/jenkins.yml @@ -4,9 +4,6 @@ jenkins_http_port: 8080 jenkins_admin_username: "{{ lookup('keepass', 'jenkins_admin_name', 'password') }}" jenkins_admin_password: "{{ lookup('keepass', 'jenkins_admin_password', 'password') }}" -# jenkins_plugins: -# - name: ansible -# - name: docker jenkins_plugins_install_dependencies: true jenkins_plugins_state: latest jenkins_java_options: "-Djenkins.install.runSetupWizard=true" @@ -30,3 +27,6 @@ comment: 'jenkins' ### mgrote.restic restic_folders_to_backup: /usr/local /etc /root /home /var/lib/jenkins + ### mgrote.install_packages + programs_extra: + - sshpass diff --git a/roles/mgrote.install_packages/defaults/main.yml b/roles/mgrote.install_packages/defaults/main.yml index 96a2017f..dd6ade78 100644 --- a/roles/mgrote.install_packages/defaults/main.yml +++ b/roles/mgrote.install_packages/defaults/main.yml @@ -30,3 +30,4 @@ programs_only_vms: - qemu-guest-agent - open-vm-tools + programs_extra: diff --git a/roles/mgrote.install_packages/tasks/main.yml b/roles/mgrote.install_packages/tasks/main.yml index 8a989e46..6f65db5a 100644 --- a/roles/mgrote.install_packages/tasks/main.yml +++ b/roles/mgrote.install_packages/tasks/main.yml @@ -10,6 +10,13 @@ name: "{{ programs_common }}" state: present + - name: install extra-packages + become: yes + ansible.builtin.apt: + name: "{{ programs_extra }}" + state: present + when: programs_extra is defined + - name: install vm-packages become: yes ansible.builtin.apt: diff --git a/roles/mgrote.restic/tasks/main.yml b/roles/mgrote.restic/tasks/main.yml index 6dbf54cc..b10ac056 100644 --- a/roles/mgrote.restic/tasks/main.yml +++ b/roles/mgrote.restic/tasks/main.yml @@ -4,6 +4,7 @@ name: - restic - logrotate + - cifs-utils state: present - name: create /etc/restic