Skip to content

Commit

Permalink
Bump ansible version
Browse files Browse the repository at this point in the history
  • Loading branch information
Philipp Boenninghausen committed Sep 13, 2024
1 parent 50318d4 commit b56a38e
Show file tree
Hide file tree
Showing 8 changed files with 59 additions and 55 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/socbed-systemtest-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions provisioning/ansible/roles/auditbeat/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -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
34 changes: 17 additions & 17 deletions provisioning/ansible/roles/configure_company_router/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
42 changes: 21 additions & 21 deletions provisioning/ansible/roles/configure_win10_client/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -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
12 changes: 8 additions & 4 deletions provisioning/ansible/roles/rsyslog_install_ipfire/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -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 }}"
6 changes: 3 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit b56a38e

Please sign in to comment.