Merge branch 'main' into main

linsetup.yml

@@ -3,12 +3,16 @@
   become: true
   vars:
     ansible_port: 1001
+    ansible_ssh_extra_args: '-o ForwardX11=yes'
     # ansible_become_pass: '{{ lookup("env", "ANSIBLE_PASSWORD") }}'
     # ansible_password: '{{ lookup("env", "ANSIBLE_PASSWORD") }}'
+    installers: /mnt/ucilnice_d/install
     ansible_connection: 'ssh'
   vars_files:
     - vars/credentials.yml
     - vars/software_keys.yml
   roles:
-    # - all_classes
+    # - orange
-    - fri_base
+    - all_classes
+    # - fri_base
+    # - powerdesigner

roles/KRV-63528/meta/main.yml

@@ -1,7 +1,8 @@
 # Kriptografija in računalniška varnost
-# Klemen.Klanjscek@fri.uni-lj.si, Janos.Vidali@fri.uni-lj.si
+# Klemen.Klanjscek@fri.uni-lj.si
 # GNU/Linux, SageMath, Python 3, Jupyter Notebook, OpenSSL, OpenSSH client
-dependencies:
+
-  - role: sagemath
+# SageMath se se prevede za Ubutnu 24.04: https://github.com/sagemath/sage/issues/38051#issuecomment-2123452861
-  - role: jupyter
+# - include_tasks: sagemath.yml
-  - role: openssl
+- include_tasks: jupyter.yml
+- include_tasks: openssl.yml

roles/OR-63717/meta/main.yml

@@ -6,28 +6,8 @@ dependencies:
   - role: stm32cube
   - role: vscode
   - role: putty
-#  - role: ninja
+  - role: stm32duino
-#  - role: cmake
+  - role: ninja
-
+  - role: cmake
-#TODO Writable d:\RAVINOR directory
+  - role: gcc-arm
-
-- name: Create RAVINOR directory
-  win_file:
-    path: "D:\\RAVINOR"
-    state: directory
-
-- name: Create RAVINOR CubeIDE_Workspace directory
-  win_file:
-    path: "D:\\RAVINOR\\CubeIDE_Workspace"
-    state: directory
-
-- name: Create RAVINOR Delo directory
-  win_file:
-    path: "D:\\RAVINOR\\Delo"
-    state: directory
-
-- name: Create RAVINOR Logisim directory
-  win_file:
-    path: "D:\\RAVINOR\\Logisim"
-    state: directory
 

roles/P1-63277/meta/main.yml

@@ -0,0 +1,8 @@
+# Programiranje 1
+# luka.furst@fri.uni-lj.si
+# JDK, mono
+dependencies:
+  - role: jdk
+  - role: gedit
+  - role: mono
+  - role: vscode

roles/P1-63702/meta/main.yml

@@ -0,0 +1,7 @@
+# Programiranje 1
+# tomaz.hocevar@fri.uni-lj.si
+# vscode, gcc, g++
+dependencies:
+  - role: gedit
+  - role: vscode
+  - role: c_development

roles/RA-63703/meta/main.yml

@@ -5,6 +5,7 @@ dependencies:
   - role: stm32cube    (CubeMonitor sem vzel samo exe)
   - role: stm32duino
   - role: vscode
+  - role: putty
   - role: winidea
   - role: gcc-arm
   - role: git

roles/android_studio/tasks/androidsdk_packages.yml

@@ -1,7 +1,10 @@
 AndroidSDK_packages:
+  - add-ons;addon-google_apis-google-24
   - add-ons;addon-google_apis-google-24
   - build-tools;34.0.0-rc3
+  - build-tools;35.0.0
   - cmake;3.22.1
+  #- cmake;latest
   - cmdline-tools;latest
   - emulator
   - extras;android;m2repository
@@ -13,17 +16,21 @@ AndroidSDK_packages:
   - extras;google;market_licensing
   - extras;google;simulators
   - extras;google;webdriver
-  - extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2
+  # - extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2
-  - extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2
+  # - extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2
   - ndk-bundle
-  - patcher;v4
+  # - patcher;v4
   - platform-tools
   - platforms;android-34
+  - platforms;android-35
   - platforms;android-32
   - platforms;android-UpsideDownCakePrivacySandbox
   - skiaparser;3
+  - sources;android-35
   - sources;android-34
+  - system-images;android-35;google_apis;x86_64
   - system-images;android-34;google_apis;x86_64
   - system-images;android-32;google_apis;x86_64
+  - system-images;android-35;google_apis_playstore;x86_64
   - system-images;android-34;google_apis_playstore;x86_64
   - system-images;android-UpsideDownCakePrivacySandbox;google_apis_playstore;x86_64

roles/arduino/tasks/main_lin.yml

@@ -5,7 +5,7 @@
 
 - name: unpack Arduino
   unarchive:
-    src: https://downloads.arduino.cc/arduino-ide/arduino-ide_2.2.1_Linux_64bit.zip
+    src: https://downloads.arduino.cc/arduino-ide/arduino-ide_2.3.2_Linux_64bit.zip
     dest: /opt/Arduino
     remote_src: yes
 

roles/bayesfusion/tasks/main_lin.yml

@@ -1,10 +1,10 @@
 # TODO install BayesFusion.yml
 # https://download.bayesfusion.com/files.html?category=Academia#GeNIe
-- name: Install Wine
+#- name: Install Wine
-  apt:
+#  apt:
-    name: wine-development
+#    name: wine-development
-    state: latest
+#    state: latest
-- name: Install Wine binfmt support
+#- name: Install Wine binfmt support
-  apt:
+#  apt:
-    name: wine-binfmt
+#    name: wine-binfmt
-    state: latest
+#    state: latest

roles/cp2102_driver/tasks/main_win.yml

@@ -1,3 +1,4 @@
 - name: Install CP210x USB to UART Bridge VCP Drivers
   win_chocolatey:
+    ignore_checksums: true
     name: cp210x-vcp-drivers-win10

roles/docker/tasks/main_lin.yml

@@ -11,12 +11,12 @@
 
 - name: "Install docker"
   apt:
-    name: docker
+    name: docker.io
     state: latest
 
 - name: "Install docker-compose"
   apt:
-    name: docker-compose
+    name: docker-compose-v2
     state: latest
 
 

roles/firefox/tasks/main_lin.yml

@@ -20,3 +20,4 @@
     name:
       - firefox
     state: latest
+    allow_downgrade: True

roles/fri_base/tasks/main_lin.yml

@@ -1,3 +1,6 @@
+- name: Enable multiarch
+  command: dpkg --add-architecture i386
+
 - name: Install generally useful packages
   apt:
     name:
@@ -16,11 +19,13 @@
       - qutebrowser
       - chromium-browser
       - firefox
-      - qemu
+      - qemu-system-x86
       - qemu-kvm
       - qemu-utils
       - virt-manager
-      - wine-development
+      - wine
+      - wine32:i386
+      - wine-binfmt
       - dosbox
       - webext-ublock-origin-chromium
       - webext-ublock-origin-firefox
@@ -38,6 +43,9 @@
       - overlayroot
       - nfs-common
       - cifs-utils
+      - samba-vfs-modules-extra
+      - samba-vfs-modules
+      - smbclient
       - neovim-qt
       - binwalk
       - iotop
@@ -110,7 +118,7 @@
   mount:
     boot: true
     fstype: nfs
-    src: "10.32.254.16:/srv/nfs/clonezilla_images"
+    src: "ucilnicenfs.fri.uni-lj.si:/srv/nfs/clonezilla_images"
     path: /home/partimag
     state: mounted
     opts: defaults,nofail

roles/fri_base/tasks/main_win.yml

@@ -7,6 +7,12 @@
     name: HideFileExt
     data: 0
     type: dword
+- name: Allow SMB insecure guest access
+  win_regedit:
+    path: HKLM:\Software\Policies\Microsoft\Windows\LanmanWorkstation
+    name: AllowInsecureGuestAuth
+    data: 1
+    type: dword
 - name: Install PSCX
   community.windows.win_psmodule:
     name: Pscx

roles/haskell/tasks/main_lin.yml

@@ -1,6 +1,6 @@
-- name: install Haskell platform
+- name: install Emacs haskell mode
   apt:
-    name: haskell-platform
+    name: elpa-haskell-mode
     state: latest
 
 - name: install Haskell Tool Stack

roles/haskell/tasks/main_win.yml

@@ -1,25 +1,25 @@
-- name: Check Haskell install status
+# - name: Check Haskell install status
-  win_stat:
+#   win_stat:
-    path: C:\ghcup\bin\ghc.exe
+#     path: C:\ghcup\bin\ghc.exe
-  register: file
+#   register: file
 
-- when: not file.stat.exists
+# - when: not file.stat.exists
-  block:
+#   block:
-    - name: Download Haskell
+#     - name: Download Haskell
-      win_get_url:
+#       win_get_url:
-        url: "https://www.haskell.org/ghcup/sh/bootstrap-haskell.ps1"
+#         url: "https://www.haskell.org/ghcup/sh/bootstrap-haskell.ps1"
-        dest: 'C:\'
+#         dest: 'C:\'
-      register: download
+#       register: download
     
-    - name: Install Haskell
+#     - name: Install Haskell
-      win_command: powershell.exe {{ download.dest }} -InBash -ExistingMsys2Dir C:\msys64
+#       win_command: powershell.exe {{ download.dest }} -InBash -ExistingMsys2Dir C:\msys64
 
-    - name: Add Haskell to PATH
+#     - name: Add Haskell to PATH
-      win_path:
+#       win_path:
-        elements:
+#         elements:
-          C:\ghcup\bin
+#           C:\ghcup\bin
 
-    - name: Remove temporary files
+#     - name: Remove temporary files
-      win_file:
+#       win_file:
-        path: "{{ download.dest }}"
+#         path: "{{ download.dest }}"
-        state: absent
+#         state: absent

roles/jdk/tasks/main_lin.yml

@@ -1,11 +1,11 @@
-- name: Install OpenJDK 18
+- name: Install OpenJDK 21
   apt:
-    name: openjdk-18-jdk
+    name: openjdk-21-jdk
     state: latest
 
-- name: Install OpenJDK 19
+- name: Install OpenJDK 17
   apt:
-    name: openjdk-19-jdk
+    name: openjdk-17-jdk
     state: latest
 
 - name: Install OpenJDK 11
@@ -31,11 +31,11 @@
       - libc6-x32
     state: latest
 
-- name: Install Oracle JDK 20
+- name: Install Oracle JDK 22
   apt: 
-    deb: "https://download.oracle.com/java/20/latest/jdk-20_linux-x64_bin.deb"
+    deb: "https://download.oracle.com/java/22/latest/jdk-22_linux-x64_bin.deb"
 
 - name: Install Java docs
   apt: 
-    deb: "https://download.oracle.com/java/20/latest/jdk-20_linux-x64_bin.deb"
+    deb: "https://download.oracle.com/java/22/latest/jdk-22_linux-x64_bin.deb"
 

roles/linroom/tasks/DF-63530.yml

@@ -1,5 +1,5 @@
 # Digitalna forenzika
 # Aleks.Huc@fri.uni-lj.si, Gasper.FeleZorz@fri.uni-lj.si
 # Windows, GNU/Linux, GNS3, VirtualBox
-- include_tasks: GNS3.yml
+- include_tasks: gns3.yml
 - include_tasks: virtualbox.yml

roles/linroom/tasks/GNS3.yml

@@ -1,15 +0,0 @@
-- name: Add GNS3 repository
-  apt_repository:
-    repo: ppa:gns3/ppa
-    state: present
-    update_cache: True
-    validate_certs: False
-- name: Install gns3 server
-  ansible.builtin.apt:
-    name: gns3-server
-    state: latest
-- name: Install gns3 GUI
-  ansible.builtin.apt:
-    name: gns3-gui
-    state: latest
-

roles/linroom/tasks/KPOV-63716.yml

@@ -1,5 +1,5 @@
 # Komunikacijski protokoli in omrežna varnost
 # Aleks.Huc@fri.uni-lj.si, Gasper.FeleZorz@fri.uni-lj.si
 # Windows, GNU/Linux, GNS3, VirtualBox
-- include_tasks: GNS3.yml
+- include_tasks: gns3.yml
 - include_tasks: virtualbox.yml

roles/linroom/tasks/KRV-63528.yml

@@ -1,7 +1,8 @@
 # Kriptografija in računalniška varnost
-# Klemen.Klanjscek@fri.uni-lj.si, Janos.Vidali@fri.uni-lj.si
+# Klemen.Klanjscek@fri.uni-lj.si
 # GNU/Linux, SageMath, Python 3, Jupyter Notebook, OpenSSL, OpenSSH client
 
-- include_tasks: sagemath.yml
+# SageMath se se prevede za Ubutnu 24.04: https://github.com/sagemath/sage/issues/38051#issuecomment-2123452861
+# - include_tasks: sagemath.yml
 - include_tasks: jupyter.yml
 - include_tasks: openssl.yml

roles/linroom/tasks/PPJ-63220.yml

@@ -5,7 +5,7 @@
 - include_tasks: vscode.yml
 - include_tasks: ocaml.yml
 - include_tasks: eclipse.yml
-- include_tasks: haskell.yml
 - include_tasks: swi-prolog.yml
 - include_tasks: rlwrap.yml
+- include_tasks: utop.yml
 

roles/linroom/tasks/sagemath.yml

@@ -1,9 +1,10 @@
-- name: Install SageMath
+# # SageMath se se prevede za Ubutnu 24.04: https://github.com/sagemath/sage/issues/38051#issuecomment-2123452861
-  apt:
+# - name: Install SageMath
-    name: sagemath
+#   apt:
-    state: latest
+#     name: sagemath
+#     state: latest
 
-- name: Install SageMath - Jupyter
+# - name: Install SageMath - Jupyter
-  apt:
+#   apt:
-    name: sagemath-jupyter
+#     name: sagemath-jupyter
-    state: latest
+#     state: latest

roles/linroom/tasks/smlnj.yml

@@ -11,3 +11,8 @@
     name: elpa-sml-mode
     state: latest
 
+# - name: Readline for SML
+#   lineinfile:
+#     dest: "$HOME/.bashrc"
+#     line: "alias smlnj='rlwrap sml'"
+#     insertafter: EOF

roles/linroom/tasks/utop.yml

@@ -0,0 +1,4 @@
+- name: Install utop
+  apt:
+    name: utop
+    state: latest

roles/linroom/tasks/vscode_extensions.yml

@@ -1,9 +1,7 @@
 VSCode_Extensions:
   - VisualStudioExptTeam.vscodeintellicode
-  - arthurwang.vsc-prolog
+  - AmauryRabouan.new-vsc-prolog
-  - dramforever.vscode-ghc-simple
   - eamodio.gitlens
-  - justusadam.language-haskell
   - ms-dotnettools.csdevkit # IS-63714
   - ms-python.python
   - ms-vscode.cpptools

roles/logisim/tasks/main_lin.yml

@@ -7,6 +7,7 @@
       state: directory
   - name: Download and unpack Logisim
     unarchive:
-      src: https://altushost-swe.dl.sourceforge.net/project/circuit/2.7.x/2.7.1/logisim-generic-2.7.1.jar
+      src: https://deac-fra.dl.sourceforge.net/project/circuit/2.7.x/2.7.1/logisim-generic-2.7.1.jar
       dest: /opt/logisim
       remote_src: yes
+      creates: /opt/logisim/META-INF/MANIFEST.MF

roles/matlab/meta/main.yml

@@ -1,2 +1,2 @@
-dependencies:
+# dependencies:
-  - role: fri_base
+#   - role: fri_base

roles/matlab/tasks/main_win.yml

@@ -4,9 +4,13 @@
     license_path: \\ucilnicesmb.fri1.uni-lj.si\ucilnice_d\install\matlab\network.lic
     dest_dir: D:\matlab
 
+- name: Set ISO path
+  set_fact:
+    iso_path: "{{ installers }}\\matlab\\{{ target_version }}_Windows.iso"
+
 - name: Mount Matlab ISO
   win_disk_image:
-    image_path: "{{ installers }}\\matlab\\{{ target_version }}_Windows.iso"
+    image_path: "{{ iso_path }}"
     state: present
   register: disk_image
 
@@ -22,7 +26,7 @@
 
 - name: Unmount Matlab ISO
   win_disk_image:
-    image_path: "{{ installers }}\\matlab\\matlab-{{ target_version }}_windows.iso"
+    image_path: "{{ iso_path }}"
     state: absent
 
 # TODO MATLAB throws license error -83 when run

roles/mono/tasks/main_lin.yml

@@ -0,0 +1,4 @@
+- name: Install Mono
+  apt:
+    name: mono-devel
+    state: latest

roles/mono/tasks/main_win.yml

@@ -0,0 +1,3 @@
+- name: Do not install Mono
+  debug:
+    msg: "Do not install Mono"

roles/mysql_workbench/tasks/main_lin.yml

@@ -1,8 +1,8 @@
 - name: Download mysql workbench
   get_url:
-    url: https://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community_8.0.34-1ubuntu22.04_amd64.deb
+    url: https://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community_8.0.38-1ubuntu24.04_amd64.deb
-    dest: /tmp/mysql-workbench-community_8.0.34-1ubuntu22.04_amd64.deb
+    dest: /tmp/mysql-workbench-community_8.0.38-1ubuntu24.04_amd64.deb
     http_agent: "Wget/1.21.3"
 - name: Install mysql workbench
   apt:
-    deb: /tmp/mysql-workbench-community_8.0.34-1ubuntu22.04_amd64.deb
+    deb: /tmp/mysql-workbench-community_8.0.38-1ubuntu24.04_amd64.deb

roles/netbeans/tasks/main_win.yml

@@ -1,6 +1,6 @@
 - name: Set Netbeans version
   set_fact:
-    target_version: "19"
+    target_version: "22"
 
 - name: Install Netbeans
   win_package:

roles/notepad++/tasks/main_lin.yml

@@ -3,14 +3,14 @@
 - name: Install notepad++
   debug:
     msg: "Install Notepad++"
-- name: Install Wine
+#- name: Install Wine
-  apt:
+#  apt:
-    name: wine-development
+#    name: wine-development
-    state: latest
+#    state: latest
-- name: Install Wine binfmt support
+#- name: Install Wine binfmt support
-  apt:
+#  apt:
-    name: wine-binfmt
+#    name: wine-binfmt
-    state: latest
+#    state: latest
 
 - name: Create dir
   file:

roles/omnetpp/tasks/main_win.yml

@@ -23,7 +23,7 @@
         delete_archive: yes
 
     - name: Move OMNet++ to final location
-      win_command: cmd.exe /c move "C:\\omnetpp-{{ target_version }}" "{{ target_dir }}"
+      win_command: cmd.exe /c move "C:\omnetpp-{{ target_version }}" "{{ target_dir }}"
 
     - name: Create OMNet++ compile script
       win_copy:

roles/orange/tasks/main_lin.yml

@@ -1,4 +1,8 @@
+- name: Install pipx
+  apt:
+    name: pipx
+    state: latest
 - name: Install orange
   pip:
-    executable: pip3
+    executable: pipx
     name: orange3

roles/pelles-c/tasks/main_lin.yml

@@ -2,14 +2,14 @@
 - name: Install Pelles
   debug:
     msg: "Install Pelles-C"
-- name: Install Wine
+#- name: Install Wine
-  apt:
+#  apt:
-    name: wine-development
+#    name: wine-development
-    state: latest
+#    state: latest
-- name: Install Wine binfmt support
+#- name: Install Wine binfmt support
-  apt:
+#  apt:
-    name: wine-binfmt
+#    name: wine-binfmt
-    state: latest
+#    state: latest
 
 - name: Install icon
   block:

roles/powerdesigner/tasks/main_lin.yml

@@ -1,4 +1,2 @@
-- name: Install PowerDesigner
+# - name: Install PowerDesigner
-  win_package:
+#   command: "wine {{ installers }}/PowerDesigner\\ 12.5/cd1/Setup/setup.exe /s /f1\"Z:\\mnt\\ucilnice_d\\install\\PowerDesigner 12.5\\setup.iss\""
-    path: "{{ installers }}\\PowerDesigner 12.5\\cd1\\setup\\setup.exe"
-    arguments: "/s /f1\"{{ installers }}\\PowerDesigner 12.5\\setup.iss\""

roles/sagemath/tasks/main_lin.yml

@@ -1,9 +1,9 @@
-- name: Install SageMath
+# # SageMath se se prevede za Ubutnu 24.04: https://github.com/sagemath/sage/issues/38051#issuecomment-2123452861
-  apt:
+# - name: Install SageMath - Jupyter
-    name: sagemath
+#   apt:
-    state: latest
+#     name: sagemath-jupyter
+#     state: latest
 
-- name: Install SageMath - Jupyter
+- name: Do not install SageMath
-  apt:
+  debug:
-    name: sagemath-jupyter
+    msg: SageMath is not installable on Ubuntu 24.04 right now
-    state: latest

roles/sagemath/tasks/main_win.yml

@@ -1 +0,0 @@
-# TODO

roles/stm32cube/tasks/main_win.yml

@@ -7,24 +7,23 @@
   block:
     - name: Set download filenames
       set_fact:
-    #    cubemx_download_file: C:\CubeMX.exe
+        cubemx_download_file: C:\CubeMX.exe
         cubeprogrammer_download_file: C:\CubeProgrammer.exe
         cubemonitor_download_file: C:\CubeMonitor.exe
-    #    cufinder_download_file: C:\CUFinder.exe
+        cufinder_download_file: C:\CUFinder.exe
         cubeide_download_file: C:\st-stm32cubeide_1.16.0_21983_20240628_1741_x86_64.exe
-    # - name: Download CubeMX
+    - name: Download CubeMX
     #   # win_get_url:
-    #   win_command: wget "https://unilj-my.sharepoint.com/:u:/g/personal/rozman_fri1_uni-lj_si/EZhqHxJoAfdEjdlMu0uGWGcBOqrT0vTVv2_nhynWZ3fOwQ?e=ilAlzP&download=1" -O "{{ cubemx_download_file }}"
+      win_command: wget "https://unilj-my.sharepoint.com/:u:/g/personal/rozman_fri1_uni-lj_si/EZhqHxJoAfdEjdlMu0uGWGcBOqrT0vTVv2_nhynWZ3fOwQ?e=ilAlzP&download=1" -O "{{ cubemx_download_file }}"
     #   #dest: C:\CubeMX.exe
     #   #register: cubemx_download
-    #   args:
+      args:
-    #     creates: "{{ cubemx_download_file }}"
+        creates: "{{ cubemx_download_file }}"
 
-#    - name: Install CubeMX
+    #- name: Install CubeMX
-#      win_package:
+    #  win_package:
-        # path: "{{cubemx_download.dest}}"
+    #    path: "{{ cubemx_download_file }}"
-#        path: "{{ cubemx_download_file }}"
+    #    arguments: /S
-#        arguments: /S
 
     - name: Download CubeProgrammer
       win_command: wget "https://unilj-my.sharepoint.com/:u:/g/personal/rozman_fri1_uni-lj_si/EXHsKDjM6hVAuEGwEWcMyBEB6bHd3HuOP38D7Wjt41vjTw?e=7jatnu&download=1" -O "{{ cubeprogrammer_download_file }}"
@@ -34,10 +33,10 @@
       args:
         creates: "{{ cubeprogrammer_download_file }}"
 
-    # - name: Install CubeProgrammer
+    - name: Install CubeProgrammer
-    #   win_package:
+      win_package:
-    #     path: "{{ cubeprogrammer_download_file }}"
+        path: "{{ cubeprogrammer_download_file }}"
-    #     arguments: /S
+        arguments: /S
 
     - name: Download CubeMonitor
     # TODO 2024: only zip distributions exists in zip file
@@ -50,23 +49,23 @@
       args:
         creates: "{{ cubemonitor_download_file}}"
 
-    # - name: Install CubeMonitor
+    - name: Install CubeMonitor
-    #   win_package:
+      win_package:
-    #     path: "{{ cubemonitor_download_file }}"
+        path: "{{ cubemonitor_download_file }}"
-    #     arguments: /S
+        arguments: /S
 
-    # - name: Download STM CUFinder
+    - name: Download STM CUFinder
-    #   win_command: wget "https://unilj-my.sharepoint.com/:u:/g/personal/rozman_fri1_uni-lj_si/EfesbSW7EftDoSjtt-nr_eYBH_EBzXnysW0Lk1wnNzx2Mw?e=HSSmDz&download=1" -O "{{ cufinder_download_file }}"
+      win_command: wget "https://unilj-my.sharepoint.com/:u:/g/personal/rozman_fri1_uni-lj_si/EfesbSW7EftDoSjtt-nr_eYBH_EBzXnysW0Lk1wnNzx2Mw?e=HSSmDz&download=1" -O "{{ cufinder_download_file }}"
     #   #win_get_url:
     #   #  dest: C:\CUFinder.exe
     #   #register: cubecufinder_download
-    #   args:
+      args:
-    #     creates: "{{ cufinder_download_file }}"
+        creates: "{{ cufinder_download_file }}"
 
-#    - name: Install STM CUFinder
+    - name: Install STM CUFinder
-#      win_package:
+      win_package:
-#        path: "{{ cubecufinder_download_file }}"
+        path: "{{ cubecufinder_download_file }}"
-#        arguments: /S
+        arguments: /S
 
     - name: Download CubeIDE
       # win_get_url:
@@ -76,20 +75,20 @@
       args:
         creates: "{{ cubeide_download_file }}"
 
-#    - name: Install CubeIDE
+    - name: Install CubeIDE
-#      win_package:
+      win_package:
-#        path: "{{ cubeide_download_file }}"
+        path: "{{ cubeide_download_file }}"
-#        arguments: /S
+        arguments: /S
 # TODO test the installers
  
-#    - name: Set CubeIDE default workspace
+    - name: Set CubeIDE default workspace
-#      win_lineinfile:
+      win_lineinfile:
-#        path: C:\ST\STM32CubeIDE_1.10.1\STM32CubeIDE\stm32cubeide.ini
+        path: C:\ST\STM32CubeIDE_1.10.1\STM32CubeIDE\stm32cubeide.ini
-#        regexp: "osgi.instance.area.default"
+        regexp: "osgi.instance.area.default"
-#        line: "-Dosgi.instance.area.default=D:/RAVINOR/CubeIDE_Workspace"
+        line: "-Dosgi.instance.area.default=D:/RAVINOR/CubeIDE_Workspace"
 
     # Replace -installIU... with -list to get available packages.
-#    - name: Install QEMU
+    - name: Install QEMU
-#      win_command: stm32cubeidec.exe -application org.eclipse.equinox.p2.director -nosplash -repository https://download.eclipse.org/embed-cdt/updates/v6/ -installIU org.eclipse.embedcdt.debug.gdbjtag.qemu.feature.group
+      win_command: stm32cubeidec.exe -application org.eclipse.equinox.p2.director -nosplash -repository https://download.eclipse.org/embed-cdt/updates/v6/ -installIU org.eclipse.embedcdt.debug.gdbjtag.qemu.feature.group
-#      args:
+      args:
-#        chdir: C:\ST\STM32CubeIDE_1.10.1\STM32CubeIDE
+        chdir: C:\ST\STM32CubeIDE_1.10.1\STM32CubeIDE

roles/stm32duino/tasks/main_lin.yml

@@ -1,13 +1,14 @@
-- name: create destination
+#- name: create destination
-  file:
+#  file:
-    path: /opt/Arduino
+#    path: /opt/Arduino
-    state: directory
+#    state: directory
 
-- name: unpack Arduino
+# - name: unpack Arduino
-  unarchive:
+#  unarchive:
-    src: 
+#    src: 
-    dest: /opt/Arduino-cli
+#    dest: /opt/Arduino-cli
-    remote_src: yes
+#    remote_src: yes
 
 #- name: Add .json for new boards
-# 
+# https://github.com/stm32duino/BoardManagerFiles/raw/main/package_stmicroelectronics_index.json
+# TODO: write this task file!

roles/tensorflow/tasks/main_lin.yml

@@ -1,4 +1,4 @@
 - name: Install TensorFlow
   pip:
-    executable: pip3
+    executable: pipx
     name: tensorflow

roles/twincat3/tasks/main_lin.yml

@@ -1,2 +1,3 @@
 - name: Do not install TwinCat 3 on Linux
-  debug: Do not install TwinCat 3 on Linux
+  debug:
+    msg: Do not install TwinCat 3 on Linux

roles/twincat3/tasks/main_win.yml

@@ -1,5 +1,6 @@
 - name: Install TwinCat 3
-  win_chocolatey:
+  debug:
-    name: visualstudio2019community
+    msg: TODO - write twincat installer scripts
-
+  #win_package:
-# Maybe sometime use https://learn.microsoft.com/en-us/visualstudio/install/use-command-line-parameters-to-install-visual-studio?view=vs-2022 with the costlier version
+  #  path: "{{ installers }}\\TwinCat3\\setup\\setup.exe"
+  #  arguments: "/s /f1\"{{ installers }}\\PowerDesigner 12.5\\setup.iss\" /f2\"C:\\powerdesigner_log.iss\""

roles/unity/tasks/main_lin.yml

@@ -2,11 +2,11 @@
 - name: PowerDesigner
   debug:
     msg: "Unity"
-- name: Install Wine
+#- name: Install Wine
-  apt:
+#  apt:
-    name: wine-development
+#    name: wine-development
-    state: latest
+#    state: latest
-- name: Install Wine binfmt support
+#- name: Install Wine binfmt support
-  apt:
+#  apt:
-    name: wine-binfmt
+#    name: wine-binfmt
-    state: latest
+#    state: latest

roles/visualstudio/tasks/main_lin.yml

@@ -1,2 +0,0 @@
-- name: Do not install VisualStudio on Linux
-  debug: Do not install VisualStudio on Linux

roles/visualstudio/tasks/main_win.yml

@@ -1,5 +0,0 @@
-- name: Install Microsoft Visual Studio
-  win_chocolatey:
-    name: visualstudio2022community
-
-# Maybe sometime use https://learn.microsoft.com/en-us/visualstudio/install/use-command-line-parameters-to-install-visual-studio?view=vs-2022 with the costlier version

roles/visualstudio19/tasks/main_lin.yml

@@ -1,2 +1,3 @@
 - name: Do not install VisualStudio on Linux
-  debug: Do not install VisualStudio on Linux
+  debug:
+    msg: Do not install VisualStudio on Linux

roles/vscode/tasks/vscode_extensions.yml

@@ -1,16 +1,14 @@
 VSCode_Extensions:
   - VisualStudioExptTeam.vscodeintellicode
-  - arthurwang.vsc-prolog
+  - AmauryRabouan.new-vsc-prolog
-  - dramforever.vscode-ghc-simple
   - eamodio.gitlens
-  - justusadam.language-haskell
   - ms-dotnettools.csdevkit # IS-63714
   - ms-python.python
   - ms-vscode.cpptools
   - franneck94.c-cpp-runner
   - ritwickdey.LiveServer
   - ms-toolsai.jupyter
-  - vscodevim.vim
+  # - vscodevim.vim
   - ocamllabs.ocaml-platform
   - stonebuddha.vscode-better-sml
   - vscode-icons-team.vscode-icons
@@ -22,4 +20,4 @@ VSCode_Extensions:
   - platformio.platformio-ide # ORS-63218
   - stmicroelectronics.stm32-vscode-extension # RA-63703
   - danielpinto8zz6.c-cpp-compile-run
-  - vadimcn.vscode-lldb
+  # - vadimcn.vscode-lldb

roles/winroom/tasks/DF-63530.yml

@@ -1,5 +1,5 @@
 # Digitalna forenzika
 # Aleks.Huc@fri.uni-lj.si, Gasper.FeleZorz@fri.uni-lj.si
 # Windows, GNU/Linux, GNS3, VirtualBox
-- include_tasks: GNS3.yml
+- include_tasks: gns3.yml
 - include_tasks: virtualbox.yml

roles/winroom/tasks/GNS3.yml

@@ -1,4 +0,0 @@
-- name: GNS3 na Windows ne deluje
-  debug:
-    msg: "GNS3 na Windows zaenkrat ne vklapljamo"
-

roles/winroom/tasks/KPOV-63716.yml

@@ -1,5 +1,5 @@
 # Komunikacijski protokoli in omrežna varnost
 # Aleks.Huc@fri.uni-lj.si, Gasper.FeleZorz@fri.uni-lj.si
 # Windows, GNU/Linux, GNS3, VirtualBox
-- include_tasks: GNS3.yml
+- include_tasks: gns.yml
 - include_tasks: virtualbox.yml

roles/winroom/tasks/KRV-63528.yml

@@ -1,7 +0,0 @@
-# Kriptografija in računalniška varnost
-# Klemen.Klanjscek@fri.uni-lj.si, Janos.Vidali@fri.uni-lj.si
-# GNU/Linux, SageMath, Python 3, Jupyter Notebook, OpenSSL, OpenSSH client
-
-- include_tasks: sagemath.yml
-- include_tasks: jupyter.yml
-- include_tasks: openssl.yml

roles/winroom/tasks/PPJ-63220.yml

@@ -1,11 +0,0 @@
-# Principi programskih jezikov
-# Klemen.Klanjscek@fri.uni-lj.si
-# Windows, GNU/Linux, VS Code, Ocaml, Eclipse, Haskell, SWI-Prolog, rlwrap
-
-- include_tasks: vscode.yml
-- include_tasks: ocaml.yml
-- include_tasks: eclipse.yml
-- include_tasks: haskell.yml
-- include_tasks: swi-prolog.yml
-- include_tasks: rlwrap.yml
-

roles/winroom/tasks/all_classes.yml

@@ -13,7 +13,6 @@
 - import_tasks: IVZ-63521.yml
 - import_tasks: KCR-63550.yml
 - import_tasks: KPOV-63716.yml
-- import_tasks: KRV-63528.yml
 - import_tasks: MRO-63257.yml
 - import_tasks: MV-63288.yml
 - import_tasks: NDN-63729.yml
@@ -32,7 +31,6 @@
 - import_tasks: PB-63707.yml
 - import_tasks: PB2-63713.yml
 - import_tasks: PJC-63769.yml
-- import_tasks: PPJ-63220.yml
 - import_tasks: PS-63261.yml
 - import_tasks: PSP-63287.yml
 - import_tasks: PUI-63768.yml

roles/winroom/tasks/haskell.yml

@@ -1,25 +1,25 @@
-- name: Check Haskell install status
+# - name: Check Haskell install status
-  win_stat:
+#   win_stat:
-    path: C:\ghcup\bin\ghc.exe
+#     path: C:\ghcup\bin\ghc.exe
-  register: file
+#   register: file
 
-- when: not file.stat.exists
+# - when: not file.stat.exists
-  block:
+#   block:
-    - name: Download Haskell
+#     - name: Download Haskell
-      win_get_url:
+#       win_get_url:
-        url: "https://www.haskell.org/ghcup/sh/bootstrap-haskell.ps1"
+#         url: "https://www.haskell.org/ghcup/sh/bootstrap-haskell.ps1"
-        dest: 'C:\'
+#         dest: 'C:\'
-      register: download
+#       register: download
     
-    - name: Install Haskell
+#     - name: Install Haskell
-      win_command: powershell.exe {{ download.dest }} -InBash -ExistingMsys2Dir C:\msys64
+#       win_command: powershell.exe {{ download.dest }} -InBash -ExistingMsys2Dir C:\msys64
 
-    - name: Add Haskell to PATH
+#     - name: Add Haskell to PATH
-      win_path:
+#       win_path:
-        elements:
+#         elements:
-          C:\ghcup\bin
+#           C:\ghcup\bin
 
-    - name: Remove temporary files
+#     - name: Remove temporary files
-      win_file:
+#       win_file:
-        path: "{{ download.dest }}"
+#         path: "{{ download.dest }}"
-        state: absent
+#         state: absent

roles/winroom/tasks/openssl.yml

@@ -1,4 +0,0 @@
-# We have it at least in git and msys2 but what the hell.
-- name: Install OpenSSL
-  win_chocolatey:
-    name: openssl

roles/winroom/tasks/sagemath.yml

@@ -1 +0,0 @@
-# TODO

roles/winroom/tasks/vscode_extensions.yml

@@ -1,13 +1,9 @@
 VSCode_Extensions:
   - VisualStudioExptTeam.vscodeintellicode
-  - arthurwang.vsc-prolog
-  - dramforever.vscode-ghc-simple
   - eamodio.gitlens
-  - justusadam.language-haskell
   - ms-dotnettools.csdevkit # IS-63714
   - ms-python.python
   - ms-vscode.cpptools
-  - ocamllabs.ocaml-platform
   - stonebuddha.vscode-better-sml
   - vscode-icons-team.vscode-icons
   - vscjava.vscode-java-pack

roles/wireshark/tasks/main_lin.yml

@@ -6,5 +6,9 @@
     vtype: boolean
 - name: "Install Wireshark"
   apt:
-    name: wireshark-qt
+    name: wireshark
+    state: latest
+- name: "Install text-mode wireshark"
+  apt:
+    name: tshark
     state: latest

winsetup.yml

@@ -13,11 +13,10 @@
     - vars/credentials.yml
     - vars/software_keys.yml
   roles:
-    # - fri_base
-    - matlab
     # - all_classes
-    # - android_studio
+    # - stm32cube
-    # - octave
+    - android_studio
-    # - audacity
+    #- OR-63717
-    # - vmware_player
+    #- RA-63703
+    #- VN-63728