From 2e79720dd9f8c00d5b03c2a9c8e5534a4b4797b5 Mon Sep 17 00:00:00 2001 From: L3D Date: Mon, 31 Jul 2023 19:03:04 +0200 Subject: [PATCH] Prepare archive --- .yamllint | 4 +- README.md | 81 +------------------- defaults/main.yml | 51 ------------- meta/main.yml | 4 +- tasks/editor.yml | 24 ------ tasks/keychain.yml | 26 ------- tasks/main.yml | 39 +--------- tasks/os_info.yml | 13 ---- tasks/packages.yml | 77 ------------------- tasks/sources.yml | 42 ----------- templates/apt.sources.list.j2 | 109 --------------------------- templates/apt.sources.list_legacy.j2 | 84 --------------------- vars/main.yml | 65 +--------------- 13 files changed, 9 insertions(+), 610 deletions(-) delete mode 100644 tasks/editor.yml delete mode 100644 tasks/keychain.yml delete mode 100644 tasks/os_info.yml delete mode 100644 tasks/packages.yml delete mode 100644 tasks/sources.yml delete mode 100644 templates/apt.sources.list.j2 delete mode 100644 templates/apt.sources.list_legacy.j2 diff --git a/.yamllint b/.yamllint index cb32cb1..3a85619 100644 --- a/.yamllint +++ b/.yamllint @@ -2,7 +2,7 @@ extends: default rules: - # 150 chars should be enough, but don't fail if a line is longer + # 1250 chars should be enough, but don't fail if a line is longer line-length: - max: 150 + max: 1250 level: warning diff --git a/README.md b/README.md index f09655e..9241db8 100644 --- a/README.md +++ b/README.md @@ -1,85 +1,6 @@ -[![MIT License](https://raw.githubusercontent.com/roles-ansible/ansible_role_base/master/.github/license.svg?sanitize=true)](https://github.com/roles-ansible/ansible_role_base/blob/master/LICENSE) | [![Ansible Lint check](https://github.com/roles-ansible/ansible_role_base/actions/workflows/ansible-linting-check.yml/badge.svg)](https://github.com/roles-ansible/ansible_role_base/actions/workflows/ansible-linting-check.yml) | [![Galaxy release](https://github.com/roles-ansible/ansible_role_base/actions/workflows/galaxy.yml/badge.svg)](https://github.com/roles-ansible/ansible_role_base/actions/workflows/galaxy.yml) - Ansible Role to install packages --------------------- A base ansible role that should run on common Linux systems. -This role adds more package sources to Debian. And installs some useful tools. This role adds more package sources to Debian. And installs some useful tools. The complete list of tools to install can be found in the [vars/main.yml](https://github.com/roles-ansible/ansible_role_base/blob/master/vars/main.yml). - -Optionally you can also set vim as the default editor and update all packages to ``latest``. - - -### variables: - -For a complete overview of all variables have a deeper look into the ``vars`` nd the ``defaults`` Folder!. - -```yml ---- -# install these additional packages -base__extra_packages: [] -# - foo -# - bar - -# should we add additional package source? -base__add_ethz: true - -# add nonfree/firmware packages? -base__pkg_non_free_firmware: true -base__pkg_contrib: true - -# add security repo -base__pkg_security: true - -# add Debian Volatile -base__pkg_updates: true - -# optionaly print some OS vars -base__print_os_vars: false - -# choose latest or present for package state -# set this to latest for updating all packages! -base__package_state: 'present' - -# should we update all packages? -base__upgrade_packages_to_latest_version: false - -# install keychain (ssh agent) -base__install_keychain: true - -# install vim (comand line editor) -base__install_vim: true - -# perform a simple versions check (true is recomended) -submodules_versioncheck: false -``` - -### testing -This role is tested with [these github-action](https://github.com/search?q=topic%3Acheck-ansible+topic%3Agithub-actions+org%3Aroles-ansible&type=Repositories) tests for different versions of differen linux systems. -If you want to find out more about our tests, please have a look at the github marketplace. - -| test status | Github Marketplace | -| :--------- | :---------------- | -| [![Galaxy release](https://github.com/roles-ansible/ansible_role_base/actions/workflows/galaxy.yml/badge.svg)](https://github.com/roles-ansible/ansible_role_base/actions/workflows/galaxy.yml) | [publish-ansible-role-to-galaxy](https://github.com/marketplace/actions/publish-ansible-role-to-galaxy) | -| [![Yamllint GitHub Actions](https://github.com/roles-ansible/ansible_role_base/actions/workflows/yamllint.yaml/badge.svg)](https://github.com/roles-ansible/ansible_role_base/actions/workflows/yamllint.yaml) | [yamllint-github-action](https://github.com/marketplace/actions/yamllint-github-action) | -| [![Ansible Lint check](https://github.com/roles-ansible/ansible_role_base/actions/workflows/ansible-linting-check.yml/badge.svg)](https://github.com/roles-ansible/ansible_role_base/actions/workflows/ansible-linting-check.yml) | [ansible-lint action](https://github.com/marketplace/actions/ansible-lint) -| [![Ansible check debian:latest](https://github.com/roles-ansible/ansible_role_base/actions/workflows/ansible-debian-latest.yml/badge.svg)](https://github.com/roles-ansible/ansible_role_base/actions/workflows/ansible-debian-latest.yml) | [ansible test with debian stable](https://github.com/marketplace/actions/check-ansible-debian-stable) | -| [![Ansible check debian:latest](https://github.com/roles-ansible/ansible_role_base/workflows/Ansible%20check%20debian:latest/badge.svg)](https://github.com/roles-ansible/ansible_role_base/actions?query=workflow%3A%22Ansible+check+debian%3Alatest%22) | [ansible test with debian latest](https://github.com/marketplace/actions/check-ansible-debian-latest) | -| [![Ansible check debian:sid](https://github.com/roles-ansible/ansible_role_base/actions/workflows/ansible-debian-sid.yml/badge.svg)](https://github.com/roles-ansible/ansible_role_base/actions/workflows/ansible-debian-sid.yml) | [ansible test with debian sid](https://github.com/marketplace/actions/check-ansible-debian-sid) | -| [![Ansible check debian:stable](https://github.com/roles-ansible/ansible_role_base/actions/workflows/ansible-debian-stable.yml/badge.svg)](https://github.com/roles-ansible/ansible_role_base/actions/workflows/ansible-debian-stable.yml) | [ansible test with debian stable](https://github.com/marketplace/actions/check-ansible-debian-stable) | -| [![Ansible check debian:buster](https://github.com/roles-ansible/ansible_role_base/actions/workflows/ansible-debian-buster.yml/badge.svg)](https://github.com/roles-ansible/ansible_role_base/actions/workflows/ansible-debian-buster.yml) | [ansible test with debian buster](https://github.com/marketplace/actions/check-ansible-debian-buster) | -| | | -| [![Ansible check archlinux:latest](https://github.com/roles-ansible/ansible_role_base/actions/workflows/ansible-archlinux-latest.yml/badge.svg)](https://github.com/roles-ansible/ansible_role_base/actions/workflows/ansible-archlinux-latest.yml) | [ansible test with archlinux latest](https://github.com/marketplace/actions/check-ansible-archlinux-latest) | -| | | -| [![Ansible check ubuntu:latest](https://github.com/roles-ansible/ansible_role_base/actions/workflows/ansible-ubuntu-latest.yml/badge.svg)](https://github.com/roles-ansible/ansible_role_base/actions/workflows/ansible-ubuntu-latest.yml) | [ansible test with ubuntu latest](https://github.com/marketplace/actions/check-ansible-ubuntu-latest) | -| [![Ansible check ubuntu:bionic](https://github.com/roles-ansible/ansible_role_base/actions/workflows/ansible-ubuntu-bionic.yml/badge.svg)](https://github.com/roles-ansible/ansible_role_base/actions/workflows/ansible-ubuntu-bionic.yml) | [ansible test with ubuntu bionic](https://github.com/marketplace/actions/check-ansible-ubuntu-bionic) | -| [![Ansible check ubuntu:trusty](https://github.com/roles-ansible/ansible_role_base/actions/workflows/ansible-ubuntu-trusty.yml/badge.svg)](https://github.com/roles-ansible/ansible_role_base/actions/workflows/ansible-ubuntu-trusty.yml) | [ansible test with ubuntu trusty](https://github.com/marketplace/actions/check-ansible-ubuntu-trusty) | -| | | -| [![Ansible check fedora:latest](https://github.com/roles-ansible/ansible_role_base/actions/workflows/ansible-fedora-latest.yml/badge.svg)](https://github.com/roles-ansible/ansible_role_base/actions/workflows/ansible-fedora-latest.yml) | [ansible test with fedora latest](https://github.com/marketplace/actions/check-ansible-fedora-latest) | -| [![Ansible check fedora:33](https://github.com/roles-ansible/ansible_role_base/actions/workflows/ansible-fedora-33.yml/badge.svg)](https://github.com/roles-ansible/ansible_role_base/actions/workflows/ansible-fedora-33.yml) | [ansible test with fedora 33](https://github.com/marketplace/actions/check-ansible-fedora-33) | -| [![Ansible check fedora:32](https://github.com/roles-ansible/ansible_role_base/actions/workflows/ansible-fedora-32.yml/badge.svg)](https://github.com/roles-ansible/ansible_role_base/actions/workflows/ansible-fedora-32.yml) | [ansible test with fedora 32](https://github.com/marketplace/actions/check-ansible-fedora-32) | -| [![Ansible check fedora:31](https://github.com/roles-ansible/ansible_role_base/actions/workflows/ansible-fedora-31.yml/badge.svg)](https://github.com/roles-ansible/ansible_role_base/actions/workflows/ansible-fedora-31.yml) | [ansible test with fedora 31](https://github.com/marketplace/actions/check-ansible-fedora-31) | -| | | -| [![Ansible check centos:latest](https://github.com/roles-ansible/ansible_role_base/actions/workflows/ansible-centos-latest.yml/badge.svg)](https://github.com/roles-ansible/ansible_role_base/actions/workflows/ansible-centos-latest.yml) | [ansible test with centos latest](https://github.com/marketplace/actions/check-ansible-centos-latest) | -| [![Ansible check centos:centos8](https://github.com/roles-ansible/ansible_role_base/actions/workflows/ansible-centos-centos8.yml/badge.svg)](https://github.com/roles-ansible/ansible_role_base/actions/workflows/ansible-centos-centos8.yml) | [ansible test with centos centos8](https://github.com/marketplace/actions/check-ansible-centos-centos8) | -| [![Ansible check centos:centos7](https://github.com/roles-ansible/ansible_role_base/actions/workflows/ansible-centos-centos7.yml/badge.svg)](https://github.com/roles-ansible/ansible_role_base/actions/workflows/ansible-centos-centos7.yml) | [ansible test with centos centos7](https://github.com/marketplace/actions/check-ansible-centos-centos7) | +Please have a look at https://github.com/roles-ansible/ansible_role_packages.git for a new version of this role. diff --git a/defaults/main.yml b/defaults/main.yml index 5a90c01..ab1886a 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,54 +1,3 @@ --- -# install these additional packages -base__extra_packages: [] -# - foo -# - bar - -# should we add additional package source? -base__add_ethz: true -# add nonfree/firmware packages? -base__pkg_non_free_firmware: true -base__pkg_contrib: true -base__pkg_backports: false - -# add security repo -base__pkg_security: true - -# add Debian Volatile -base__pkg_updates: true - -# optionaly print some OS vars -base__print_os_vars: "{{ print_os_vars }}" - -# choose latest or present for package state -# set this to latest for updating all packages! -base__package_state: 'present' - -# should we update all packages? -base__upgrade_packages_to_latest_version: "{{ upgrade_packages_to_latest_version }}" - -# install keycain to have a awesome ssh agent -base__install_keychain: true - -# install vim as awesome command line editor -base__install_vim: true - -# directlink to keychain becaus RHEL do not provide it... -_base__keychain_rpm: 'http://packages.psychotic.ninja/7/base/x86_64/RPMS//keychain-2.8.0-3.el7.psychotic.noarch.rpm' - - -# LEGACY VARS -# ++ WILL BE REMOVED SOON ++ -# add eth zurich apt source - -# do we want the latest package version or just upgrade manually? -upgrade_packages_to_latest_version: false - -# print os variables -print_os_vars: false - -# mailx for debian (recomended for unattended_upgrades role -base__install_mailx: true - # version management submodules_versioncheck: false diff --git a/meta/main.yml b/meta/main.yml index 3c3b751..e26aaa5 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -1,7 +1,7 @@ --- galaxy_info: - author: l3d - description: Ansible role to install some base packages and make some base configuration on all common linux systems + author: do1jlr + description: old archived Ansible role that installed some base packages and made some base configuration on common linux systems role_name: base license: MIT min_ansible_version: "2.11" diff --git a/tasks/editor.yml b/tasks/editor.yml deleted file mode 100644 index 6b5c9d7..0000000 --- a/tasks/editor.yml +++ /dev/null @@ -1,24 +0,0 @@ ---- -- name: Vim is our editor - become: true - community.general.alternatives: - name: editor - path: /usr/bin/vim.basic - when: - - base__install_vim | bool - - ansible_distribution != 'CentOS' - - ansible_distribution != 'RedHat' - - ansible_distribution != 'Archlinux' - failed_when: false - -- name: Vim is our editor - become: true - community.general.alternatives: - name: editor - path: /usr/bin/vim - when: - - base__install_vim | bool - - ansible_distribution == 'CentOS' - - ansible_distribution == 'RedHat' - - ansible_distribution == 'Archlinux' - failed_when: false diff --git a/tasks/keychain.yml b/tasks/keychain.yml deleted file mode 100644 index 6bbcc4f..0000000 --- a/tasks/keychain.yml +++ /dev/null @@ -1,26 +0,0 @@ ---- -- name: Update apt cache - become: true - ansible.builtin.apt: - cache_valid_time: 3600 - update_cache: true - when: - - ansible_pkg_mgr == "apt" - -- name: Install keychain to support ssh agent - become: true - ansible.builtin.package: - name: keychain - state: "{{ base__package_state }}" - when: - - ansible_os_family != 'RedHat' - -- name: Install keychain on centos - become: true - ansible.builtin.yum: - name: - - "{{ _base__keychain_rpm }}" - - libselinux-python - state: "{{ base__package_state }}" - when: - - ansible_os_family == 'RedHat' and ansible_distribution_version | float <= 7 diff --git a/tasks/main.yml b/tasks/main.yml index ed9bf6c..51114e9 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,41 +1,8 @@ --- -- name: Optional print os infos - ansible.builtin.include_tasks: os_info.yml - when: print_os_vars | bool - - name: Optional versionscheck ansible.builtin.include_tasks: versioncheck.yml when: submodules_versioncheck | bool -- name: Optional add apt sources - ansible.builtin.include_tasks: sources.yml - when: - - base__add_ethz | bool - - ansible_architecture == 'x86_64' - - ansible_distribution == 'Debian' and ansible_distribution_version | float >= 8 - - ansible_pkg_mgr == "apt" - -- name: Install packages - ansible.builtin.include_tasks: packages.yml - -- name: Upgrade all packages to latest - become: true - ansible.builtin.package: - name: "*" - state: "{{ base__package_state }}" - when: - - base__upgrade_packages_to_latest_version|bool - -- name: Optional configure editor - ansible.builtin.include_tasks: editor.yml - when: base__install_vim | bool - -- name: Optional install keychain - ansible.builtin.include_tasks: keychain.yml - when: base__install_keychain | bool - -- name: Install optional packages - become: true - ansible.builtin.package: - name: "{{ base__extra_packages }}" - state: present +- name: Not maintained anymore + ansible.builtin.fail: + msg: "Sorry, this role is Archive. New Role available at https://galaxy.ansible.com/l3d/packages - https://github.com/roles-ansible/ansible_role_packages.git" diff --git a/tasks/os_info.yml b/tasks/os_info.yml deleted file mode 100644 index 0bb8573..0000000 --- a/tasks/os_info.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -- name: Print OS Infos - ansible.builtin.debug: - msg: | - ansible_os_family = '{{ ansible_os_family }}' - ansible_distribution = '{{ ansible_distribution }}' - ansible_distribution_version = '{{ ansible_distribution_version }}' - ansible_distribution_release = '{{ ansible_distribution_release }}' - ansible_machine = '{{ ansible_machine }}' - - inventory_hostname = '{{ inventory_hostname }}' - ansible_hostname = '{{ ansible_hostname }}' - ansible_fqdn = '{{ ansible_fqdn }}' diff --git a/tasks/packages.yml b/tasks/packages.yml deleted file mode 100644 index f985b1d..0000000 --- a/tasks/packages.yml +++ /dev/null @@ -1,77 +0,0 @@ ---- -- name: Update repo-cache for debian/ubuntu - become: true - ansible.builtin.apt: - update_cache: true - cache_valid_time: 3600 - when: - - ansible_pkg_mgr == "apt" - -- name: Update repo-cache for debian/ubuntu - become: true - ansible.builtin.dnf: - update_cache: true - when: - - ansible_os_family == 'RedHat' and ansible_distribution_version | float >= 8 - -- name: Install base packages for all operating systems - become: true - ansible.builtin.package: - name: "{{ base__packages }}" - state: "{{ base__package_state }}" - -- name: Install python3 for all non-legacy systems - become: true - ansible.builtin.package: - name: "{{ base__python3_packages }}" - state: "{{ base__package_state }}" - when: | - ansible_distribution == 'Ubuntu' and ansible_distribution_version | float >= 16.0 or - ansible_os_family == 'RedHat' and ansible_distribution_version | float >= 7 or - ansible_distribution == 'Debian' and ansible_distribution_version | float >= 7 - -- name: Install python for systems where python3 packages are renamed to python - become: true - ansible.builtin.package: - name: "{{ base__python_packages }}" - state: "{{ base__package_state }}" - when: ansible_os_family == 'Archlinux' - -- name: Install packages for all non-legacy systems - become: true - ansible.builtin.package: - name: "{{ base__modern_packages }}" - state: "{{ base__package_state }}" - when: | - ansible_distribution == 'Ubuntu' and ansible_distribution_version | float >= 16.0 or - ansible_os_family == 'RedHat' and ansible_distribution_version | float >= 7 or - ansible_distribution == 'Debian' and ansible_distribution_version | float >= 8 or - ansible_os_family == 'Archlinux' - -- name: Install packages for all non-legacy Debian/Ububntu systems - become: true - ansible.builtin.package: - name: "{{ base__debian_packages }}" - state: "{{ base__package_state }}" - when: | - ansible_distribution == 'Ubuntu' and ansible_distribution_version | float >= 16.0 or - ansible_distribution == 'Debian' and ansible_distribution_version | float >= 8 - -- name: Install packages for all reasonable non-legacy systems - become: true - ansible.builtin.package: - name: "{{ base__linux_packages }}" - state: "{{ base__package_state }}" - when: | - ansible_distribution == 'Ubuntu' and ansible_distribution_version | float >= 18.0 or - ansible_distribution == 'Fedora' and ansible_distribution_version | float >= 32 or - ansible_distribution == 'Debian' and ansible_distribution_version | float >= 9 or - ansible_os_family == 'Archlinux' - -- name: Install mailx on debian - become: true - ansible.builtin.package: - name: - - bsd-mailx - state: "{{ base__package_state }}" - when: ansible_distribution == 'Debian' and ansible_distribution_version | float >= 7 and base__install_mailx | bool diff --git a/tasks/sources.yml b/tasks/sources.yml deleted file mode 100644 index cca7530..0000000 --- a/tasks/sources.yml +++ /dev/null @@ -1,42 +0,0 @@ ---- -- name: Update repo-cache for Debian/Ubuntu - become: true - ansible.builtin.apt: - update_cache: true - cache_valid_time: 3600 - when: - - ansible_pkg_mgr == "apt" - -- name: Install requirements to add packages via https - become: true - ansible.builtin.apt: - package: - - debian-goodies - - apt-dater-host - - apt-transport-https - state: present - -- name: Add eth zurich apt for Debian Bullaeye (11) and later - become: true - ansible.builtin.template: - src: "templates/apt.sources.list.j2" - dest: '/etc/apt/sources.list.d/debian_ethz_ch_debian.list' - mode: 0644 - group: root - owner: root - notify: Run apt update - when: ansible_distribution_major_version > '10' - -- name: Add eth zurich apt for Debian Buster (10) and earlyer - become: true - ansible.builtin.template: - src: "templates/apt.sources.list_legacy.j2" - dest: '/etc/apt/sources.list.d/debian_ethz_ch_debian.list' - mode: 0644 - group: root - owner: root - notify: Run apt update - when: ansible_distribution_major_version < '11' - -- name: Force all notified handlers to run at this point, not waiting for normal sync points - ansible.builtin.meta: flush_handlers diff --git a/templates/apt.sources.list.j2 b/templates/apt.sources.list.j2 deleted file mode 100644 index ff6cbeb..0000000 --- a/templates/apt.sources.list.j2 +++ /dev/null @@ -1,109 +0,0 @@ -# Debian mirror der ETH Zürich -# https://debian.ethz.ch/ -# https://wiki.debianforum.de/Sources.list - -# HTTPS mirror: -deb https://debian.ethz.ch/debian {{ ansible_distribution_release }} main - {%- if base__pkg_contrib | bool -%} - {{- ' contrib' -}} - {%- endif -%} - {%- if base__pkg_non_free_firmware | bool -%} - {{- ' non-free' -}} - {%- if ansible_distribution_major_version >= '12' -%} - {{- ' non-free-firmware' -}} - {%- endif -%} - {%- endif -%} - {{- '\n' -}} -deb-src https://debian.ethz.ch/debian {{ ansible_distribution_release }} main - {%- if base__pkg_contrib | bool -%} - {{- ' contrib' -}} - {%- endif -%} - {%- if base__pkg_non_free_firmware | bool -%} - {{- ' non-free' -}} - {%- if ansible_distribution_major_version >= '12' -%} - {{- ' non-free-firmware' -}} - {%- endif -%} - {%- endif -%} - {{- '\n\n' -}} - -{%- if base__pkg_security | bool -%} -# Inofficial Debian Security Mirror -deb https://security.debian.ethz.ch/ {{ ansible_distribution_release }}-security main - {%- if base__pkg_contrib | bool -%} - {{- ' contrib' -}} - {%- endif -%} - {%- if base__pkg_non_free_firmware | bool -%} - {{- ' non-free' -}} - {%- if ansible_distribution_major_version >= '12' -%} - {{- ' non-free-firmware' -}} - {%- endif -%} - {%- endif -%} - {{- '\n' -}} -deb-src https://security.debian.ethz.ch/ {{ ansible_distribution_release }}-security main - {%- if base__pkg_contrib | bool -%} - {{- ' contrib' -}} - {%- endif -%} - {%- if base__pkg_non_free_firmware | bool -%} - {{- ' non-free' -}} - {%- if ansible_distribution_major_version >= '12' -%} - {{- ' non-free-firmware' -}} - {%- endif -%} - {%- endif -%} - {{- '\n\n' -}} -{%- endif -%} - -{%- if base__pkg_updates -%} -# {{ ansible_distribution_release }}-updates, previously known as 'volatile' -deb https://debian.ethz.ch/debian {{ ansible_distribution_release }}-updates main - {%- if base__pkg_contrib | bool -%} - {{- ' contrib' -}} - {%- endif -%} - {%- if base__pkg_non_free_firmware | bool -%} - {{- ' non-free' -}} - {%- if ansible_distribution_major_version >= '12' -%} - {{- ' non-free-firmware' -}} - {%- endif -%} - {%- endif -%} - {{- '\n' -}} -deb-src https://debian.ethz.ch/debian {{ ansible_distribution_release }}-updates main - {%- if base__pkg_contrib | bool -%} - {{- ' contrib' -}} - {%- endif -%} - {%- if base__pkg_non_free_firmware | bool -%} - {{- ' non-free' -}} - {%- if ansible_distribution_major_version >= '12' -%} - {{- ' non-free-firmware' -}} - {%- endif -%} - {%- endif -%} - {{- '\n\n' -}} -{%- endif -%} - -{%- if base__pkg_backports -%} -# {{ ansible_distribution_release }}-backports -deb https://debian.ethz.ch/debian {{ ansible_distribution_release }}-backports main - {%- if base__pkg_contrib | bool -%} - {{- ' contrib' -}} - {%- endif -%} - {%- if base__pkg_non_free_firmware | bool -%} - {{- ' non-free' -}} - {%- if ansible_distribution_major_version >= '12' -%} - {{- ' non-free-firmware' -}} - {%- endif -%} - {%- endif -%} - {{- '\n' -}} -deb-src https://debian.ethz.ch/debian {{ ansible_distribution_release }}-backports main - {%- if base__pkg_contrib | bool -%} - {{- ' contrib' -}} - {%- endif -%} - {%- if base__pkg_non_free_firmware | bool -%} - {{- ' non-free' -}} - {%- if ansible_distribution_major_version >= '12' -%} - {{- ' non-free-firmware' -}} - {%- endif -%} - {%- endif -%} - {{- '\n\n' -}} -{%- endif -%} - -# Contact for proplems with the mirror: -# https://readme.phys.ethz.ch/services/contact/ -# Or #isgphys on irc.phys.ethz.ch diff --git a/templates/apt.sources.list_legacy.j2 b/templates/apt.sources.list_legacy.j2 deleted file mode 100644 index 3c7090f..0000000 --- a/templates/apt.sources.list_legacy.j2 +++ /dev/null @@ -1,84 +0,0 @@ -# Debian mirror der ETH Zürich -# https://debian.ethz.ch/ - -# HTTPS mirror: -deb https://debian.ethz.ch/debian {{ ansible_distribution_release }} main - {%- if base__pkg_contrib | bool -%} - {{- ' contrib' -}} - {%- endif -%} - {%- if base__pkg_non_free_firmware | bool -%} - {{- ' non-free' -}} - {%- endif -%} - {{- '\n' -}} -deb-src https://debian.ethz.ch/debian {{ ansible_distribution_release }} main - {%- if base__pkg_contrib | bool -%} - {{- ' contrib' -}} - {%- endif -%} - {%- if base__pkg_non_free_firmware | bool -%} - {{- ' non-free' -}} - {%- endif -%} - {{- '\n\n' -}} - -{%- if base__pkg_security | bool -%} -# Inofficial Security Mirror -deb https://security.debian.ethz.ch/ {{ ansible_distribution_release }}/updates main - {%- if base__pkg_contrib | bool -%} - {{- ' contrib' -}} - {%- endif -%} - {%- if base__pkg_non_free_firmware | bool -%} - {{- ' non-free' -}} - {%- endif -%} - {{- '\n' -}} -deb-src https://security.debian.ethz.ch/ {{ ansible_distribution_release }}/updates main - {%- if base__pkg_contrib | bool -%} - {{- ' contrib' -}} - {%- endif -%} - {%- if base__pkg_non_free_firmware | bool -%} - {{- ' non-free' -}} - {%- endif -%} - {{- '\n\n' -}} -{%- endif -%} - -{%- if base__pkg_updates -%} -# {{ ansible_distribution_release }}-updates, previously known as 'volatile' -deb https://debian.ethz.ch/debian {{ ansible_distribution_release }}-updates main - {%- if base__pkg_contrib | bool -%} - {{- ' contrib' -}} - {%- endif -%} - {%- if base__pkg_non_free_firmware | bool -%} - {{- ' non-free' -}} - {%- endif -%} - {{- '\n' -}} -deb-src https://debian.ethz.ch/debian {{ ansible_distribution_release }}-updates main - {%- if base__pkg_contrib | bool -%} - {{- ' contrib' -}} - {%- endif -%} - {%- if base__pkg_non_free_firmware | bool -%} - {{- ' non-free' -}} - {%- endif -%} - {{- '\n\n' -}} -{%- endif -%} - -{%- if base__pkg_backports -%} -# {{ ansible_distribution_release }}-backports -deb https://debian.ethz.ch/debian {{ ansible_distribution_release }}-backports main - {%- if base__pkg_contrib | bool -%} - {{- ' contrib' -}} - {%- endif -%} - {%- if base__pkg_non_free_firmware | bool -%} - {{- ' non-free' -}} - {%- endif -%} - {{- '\n' -}} -deb-src https://debian.ethz.ch/debian {{ ansible_distribution_release }}-backports main - {%- if base__pkg_contrib | bool -%} - {{- ' contrib' -}} - {%- endif -%} - {%- if base__pkg_non_free_firmware | bool -%} - {{- ' non-free' -}} - {%- endif -%} - {{- '\n\n' -}} -{%- endif -%} - -# Contact for proplems with the mirror: -# https://readme.phys.ethz.ch/services/contact/ -# Or #isgphys on irc.phys.ethz.ch diff --git a/vars/main.yml b/vars/main.yml index 0e16318..e879072 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -1,66 +1,3 @@ --- -# must-have packages for all systems -base__packages: - - rsync - - tmux - - sudo - - ethtool - - vim - - nmap - - wget - - git - - bash-completion - - unzip - - net-tools - - gdisk - - lsof - - pwgen - -# packages for all non-legacy x86 systems -base__modern_packages: - - tcpdump - - sysstat -# - smartmontools - -# debian/ubuntu packages -base__debian_packages: - - debian-goodies - - molly-guard - - mtr-tiny - - knot-dnsutils - - fio - - apt-dater-host - - apt-transport-https - - aptitude - - python3-setuptools - - python3-apt - - ethstatus - -# modern python packages where python stands for python3 -base__python_packages: - - python-pip - - python - -# modern python packages -base__python3_packages: - - python3-pip - - python3 - -# packages for reasonable linux servers (not RHEL/Centos) -base__linux_packages: - - links - - ranger - - htop - - iotop - - iftop - - nethogs - - nload - - ncdu - - atop - - asciinema - - youtube-dl - - bzip2 - - jq - -playbook_version_number: 9019 +playbook_version_number: 9999 playbook_version_path: 'base-packages_roles-ansible_github.version'