From b56a38eb2e8721a92d7ee4d5fffffd89d2b321a0 Mon Sep 17 00:00:00 2001 From: Philipp Boenninghausen Date: Fri, 13 Sep 2024 09:46:49 +0200 Subject: [PATCH] Bump ansible version --- .github/workflows/socbed-systemtest-dev.yml | 2 +- .../ansible/roles/auditbeat/tasks/main.yml | 6 +-- .../configure_company_router/tasks/main.yml | 34 +++++++-------- .../configure_internet_router/tasks/main.yml | 10 ++--- .../tasks/install_firefox.yml | 2 +- .../configure_win10_client/tasks/main.yml | 42 +++++++++---------- .../rsyslog_install_ipfire/tasks/main.yml | 12 ++++-- requirements.txt | 6 +-- 8 files changed, 59 insertions(+), 55 deletions(-) diff --git a/.github/workflows/socbed-systemtest-dev.yml b/.github/workflows/socbed-systemtest-dev.yml index bdb55fb..58ffddd 100644 --- a/.github/workflows/socbed-systemtest-dev.yml +++ b/.github/workflows/socbed-systemtest-dev.yml @@ -89,7 +89,7 @@ jobs: with: python-version: '3.12' - name: Install dependencies - run: pip install tox + run: pip install tox==4.18.1 - name: Ensure all machines are powered off run: ./tools/cleanup_failed_session diff --git a/provisioning/ansible/roles/auditbeat/tasks/main.yml b/provisioning/ansible/roles/auditbeat/tasks/main.yml index 4c5b7fd..0b7ec22 100644 --- a/provisioning/ansible/roles/auditbeat/tasks/main.yml +++ b/provisioning/ansible/roles/auditbeat/tasks/main.yml @@ -1,4 +1,4 @@ --- -- include: add_auditbeat_apt_repository.yml -- include: install_auditbeat.yml -- include: configure_auditbeat.yml +- include_tasks: add_auditbeat_apt_repository.yml +- include_tasks: install_auditbeat.yml +- include_tasks: configure_auditbeat.yml diff --git a/provisioning/ansible/roles/configure_company_router/tasks/main.yml b/provisioning/ansible/roles/configure_company_router/tasks/main.yml index 6c7daee..7f23075 100644 --- a/provisioning/ansible/roles/configure_company_router/tasks/main.yml +++ b/provisioning/ansible/roles/configure_company_router/tasks/main.yml @@ -1,17 +1,17 @@ -- include: configure_suricata.yml -- include: configure_dhcpd.yml -- include: configure_fwhosts_customservices.yml -- include: configure_hosts.yml -- include: configure_K00squid.yml -- include: configure_loggings_settings.yml -- include: configure_ntp.yml -- include: configure_proxy_advanced.yml -- include: configure_proxy_cachemgr.yml -- include: configure_proxy_settings.yml -- include: configure_proxy_viewersettings.yml -- include: configure_squid.yml -- include: configure_squid_cachemgr.yml -- include: configure_syslog.yml -- include: configure_time_settings.yml -- include: create_ipfire_proxy_enable.yml -- include: create_symbolic_link_for_syslog.yml +- include_tasks: configure_suricata.yml +- include_tasks: configure_dhcpd.yml +- include_tasks: configure_fwhosts_customservices.yml +- include_tasks: configure_hosts.yml +- include_tasks: configure_K00squid.yml +- include_tasks: configure_loggings_settings.yml +- include_tasks: configure_ntp.yml +- include_tasks: configure_proxy_advanced.yml +- include_tasks: configure_proxy_cachemgr.yml +- include_tasks: configure_proxy_settings.yml +- include_tasks: configure_proxy_viewersettings.yml +- include_tasks: configure_squid.yml +- include_tasks: configure_squid_cachemgr.yml +- include_tasks: configure_syslog.yml +- include_tasks: configure_time_settings.yml +- include_tasks: create_ipfire_proxy_enable.yml +- include_tasks: create_symbolic_link_for_syslog.yml diff --git a/provisioning/ansible/roles/configure_internet_router/tasks/main.yml b/provisioning/ansible/roles/configure_internet_router/tasks/main.yml index 5762450..27ef1d7 100644 --- a/provisioning/ansible/roles/configure_internet_router/tasks/main.yml +++ b/provisioning/ansible/roles/configure_internet_router/tasks/main.yml @@ -1,5 +1,5 @@ -- include: configure_etc_hosts.yml -- include: configure_etc_unbound_hosts.yml -- include: configure_hosts.yml -- include: configure_ntp.yml -- include: create_symbolic_link_for_syslog.yml +- include_tasks: configure_etc_hosts.yml +- include_tasks: configure_etc_unbound_hosts.yml +- include_tasks: configure_hosts.yml +- include_tasks: configure_ntp.yml +- include_tasks: create_symbolic_link_for_syslog.yml diff --git a/provisioning/ansible/roles/configure_win10_client/tasks/install_firefox.yml b/provisioning/ansible/roles/configure_win10_client/tasks/install_firefox.yml index 6fe7ee4..dabb3d7 100644 --- a/provisioning/ansible/roles/configure_win10_client/tasks/install_firefox.yml +++ b/provisioning/ansible/roles/configure_win10_client/tasks/install_firefox.yml @@ -23,4 +23,4 @@ src: files/win10_firefox/mozilla.cfg dest: C:\Program Files (x86)\Mozilla Firefox\mozilla.cfg -- include: set_default_browser.yml +- include_tasks: set_default_browser.yml diff --git a/provisioning/ansible/roles/configure_win10_client/tasks/main.yml b/provisioning/ansible/roles/configure_win10_client/tasks/main.yml index 679726e..4926ad9 100644 --- a/provisioning/ansible/roles/configure_win10_client/tasks/main.yml +++ b/provisioning/ansible/roles/configure_win10_client/tasks/main.yml @@ -1,21 +1,21 @@ -- include: setup_user.yml -- include: set_timezone.yml -- include: add_exclusion_folder.yml -- include: disable_firewall.yml -- include: disable_screen_lock.yml -- include: install_python.yml -- include: update_pip.yml -- include: install_pip_selenium.yml -- include: upload_assets.yml -- include: upload_userbehavior_src.yml -- include: install_firefox.yml -- include: disable_automatic_updates.yml -- include: run_init_tbf_client_on_boot.yml -- include: install_ssh_server.yml -- include: disable_ipv6.yml -- include: set_autostart.yml -- include: install_imdisk.yml -- include: set_logging_config.yml -- include: install_sysmon.yml -- include: install_winlogbeat.yml -- include: disable_defender.yml +- include_tasks: setup_user.yml +- include_tasks: set_timezone.yml +- include_tasks: add_exclusion_folder.yml +- include_tasks: disable_firewall.yml +- include_tasks: disable_screen_lock.yml +- include_tasks: install_python.yml +- include_tasks: update_pip.yml +- include_tasks: install_pip_selenium.yml +- include_tasks: upload_assets.yml +- include_tasks: upload_userbehavior_src.yml +- include_tasks: install_firefox.yml +- include_tasks: disable_automatic_updates.yml +- include_tasks: run_init_tbf_client_on_boot.yml +- include_tasks: install_ssh_server.yml +- include_tasks: disable_ipv6.yml +- include_tasks: set_autostart.yml +- include_tasks: install_imdisk.yml +- include_tasks: set_logging_config.yml +- include_tasks: install_sysmon.yml +- include_tasks: install_winlogbeat.yml +- include_tasks: disable_defender.yml diff --git a/provisioning/ansible/roles/rsyslog_install_ipfire/tasks/main.yml b/provisioning/ansible/roles/rsyslog_install_ipfire/tasks/main.yml index 399c132..de8f556 100644 --- a/provisioning/ansible/roles/rsyslog_install_ipfire/tasks/main.yml +++ b/provisioning/ansible/roles/rsyslog_install_ipfire/tasks/main.yml @@ -1,4 +1,8 @@ -- include: install.yml packet=libestr-0.1.11-1.ipfire -- include: install.yml packet=libfastjson-0.99.8-1.ipfire -- include: install.yml packet=liblogging-1.0.6-1.ipfire -- include: install.yml packet=rsyslog-8.1907.0-1.ipfire +- include_tasks: install.yml + with_items: + - libestr-0.1.11-1.ipfire + - libfastjson-0.99.8-1.ipfire + - liblogging-1.0.6-1.ipfire + - rsyslog-8.1907.0-1.ipfire + vars: + packet: "{{ item }}" diff --git a/requirements.txt b/requirements.txt index 236c171..76ea108 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,11 +1,11 @@ -ansible==5.1.0 -colorama==0.4.1 +ansible==10.4.0 +colorama==0.4.6 paramiko==2.11.0 pytest==8.3.3 pyvmomi==6.7.1.2018.12 pywinrm==0.4.1 selenium==4.3.0 -tox==3.7.0 +tox==4.18.1 veryprettytable==0.8.1 asyncio==3.4.3 setuptools~=74.1.2