From a90db23d5c985da8ea6a08335d1b149193eaeb4f Mon Sep 17 00:00:00 2001 From: kllemen Date: Fri, 13 Sep 2024 14:33:01 +0200 Subject: [PATCH 1/7] duplicate GNS3.yml removed --- roles/linroom/tasks/DF-63530.yml | 2 +- roles/linroom/tasks/GNS3.yml | 15 --------------- roles/linroom/tasks/KPOV-63716.yml | 2 +- roles/winroom/tasks/DF-63530.yml | 2 +- roles/winroom/tasks/GNS3.yml | 4 ---- roles/winroom/tasks/KPOV-63716.yml | 2 +- 6 files changed, 4 insertions(+), 23 deletions(-) delete mode 100644 roles/linroom/tasks/GNS3.yml delete mode 100644 roles/winroom/tasks/GNS3.yml diff --git a/roles/linroom/tasks/DF-63530.yml b/roles/linroom/tasks/DF-63530.yml index 5e24a7a..ae8557c 100644 --- a/roles/linroom/tasks/DF-63530.yml +++ b/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 diff --git a/roles/linroom/tasks/GNS3.yml b/roles/linroom/tasks/GNS3.yml deleted file mode 100644 index df2807d..0000000 --- a/roles/linroom/tasks/GNS3.yml +++ /dev/null @@ -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 - diff --git a/roles/linroom/tasks/KPOV-63716.yml b/roles/linroom/tasks/KPOV-63716.yml index 5411878..19bfd45 100644 --- a/roles/linroom/tasks/KPOV-63716.yml +++ b/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 diff --git a/roles/winroom/tasks/DF-63530.yml b/roles/winroom/tasks/DF-63530.yml index 5e24a7a..ae8557c 100644 --- a/roles/winroom/tasks/DF-63530.yml +++ b/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 diff --git a/roles/winroom/tasks/GNS3.yml b/roles/winroom/tasks/GNS3.yml deleted file mode 100644 index 2cc5ce3..0000000 --- a/roles/winroom/tasks/GNS3.yml +++ /dev/null @@ -1,4 +0,0 @@ -- name: GNS3 na Windows ne deluje - debug: - msg: "GNS3 na Windows zaenkrat ne vklapljamo" - diff --git a/roles/winroom/tasks/KPOV-63716.yml b/roles/winroom/tasks/KPOV-63716.yml index 5411878..248eefc 100644 --- a/roles/winroom/tasks/KPOV-63716.yml +++ b/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 From 02198c1de91df6c8d7676a3cdc58215d144186ba Mon Sep 17 00:00:00 2001 From: kllemen Date: Fri, 13 Sep 2024 14:55:09 +0200 Subject: [PATCH 2/7] KIRV cleanup --- roles/KRV-63528/meta/main.yml | 11 ++++++----- roles/linroom/tasks/KRV-63528.yml | 5 +++-- roles/linroom/tasks/sagemath.yml | 17 +++++++++-------- roles/sagemath/tasks/main_lin.yml | 17 +++++++++-------- roles/sagemath/tasks/main_win.yml | 1 - roles/winroom/tasks/KRV-63528.yml | 7 ------- roles/winroom/tasks/all_classes.yml | 1 - roles/winroom/tasks/openssl.yml | 4 ---- roles/winroom/tasks/sagemath.yml | 1 - 9 files changed, 27 insertions(+), 37 deletions(-) delete mode 100644 roles/sagemath/tasks/main_win.yml delete mode 100644 roles/winroom/tasks/KRV-63528.yml delete mode 100644 roles/winroom/tasks/openssl.yml delete mode 100644 roles/winroom/tasks/sagemath.yml diff --git a/roles/KRV-63528/meta/main.yml b/roles/KRV-63528/meta/main.yml index 96bd0ff..36b64c6 100644 --- a/roles/KRV-63528/meta/main.yml +++ b/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 - - role: jupyter - - role: openssl + +# 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 diff --git a/roles/linroom/tasks/KRV-63528.yml b/roles/linroom/tasks/KRV-63528.yml index 3d5690e..36b64c6 100644 --- a/roles/linroom/tasks/KRV-63528.yml +++ b/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 diff --git a/roles/linroom/tasks/sagemath.yml b/roles/linroom/tasks/sagemath.yml index 9b757ef..f7607d8 100644 --- a/roles/linroom/tasks/sagemath.yml +++ b/roles/linroom/tasks/sagemath.yml @@ -1,9 +1,10 @@ -- name: Install SageMath - apt: - name: sagemath - state: latest +# # SageMath se se prevede za Ubutnu 24.04: https://github.com/sagemath/sage/issues/38051#issuecomment-2123452861 +# - name: Install SageMath +# apt: +# name: sagemath +# state: latest -- name: Install SageMath - Jupyter - apt: - name: sagemath-jupyter - state: latest +# - name: Install SageMath - Jupyter +# apt: +# name: sagemath-jupyter +# state: latest diff --git a/roles/sagemath/tasks/main_lin.yml b/roles/sagemath/tasks/main_lin.yml index 9b757ef..f7607d8 100644 --- a/roles/sagemath/tasks/main_lin.yml +++ b/roles/sagemath/tasks/main_lin.yml @@ -1,9 +1,10 @@ -- name: Install SageMath - apt: - name: sagemath - state: latest +# # SageMath se se prevede za Ubutnu 24.04: https://github.com/sagemath/sage/issues/38051#issuecomment-2123452861 +# - name: Install SageMath +# apt: +# name: sagemath +# state: latest -- name: Install SageMath - Jupyter - apt: - name: sagemath-jupyter - state: latest +# - name: Install SageMath - Jupyter +# apt: +# name: sagemath-jupyter +# state: latest diff --git a/roles/sagemath/tasks/main_win.yml b/roles/sagemath/tasks/main_win.yml deleted file mode 100644 index 4640904..0000000 --- a/roles/sagemath/tasks/main_win.yml +++ /dev/null @@ -1 +0,0 @@ -# TODO diff --git a/roles/winroom/tasks/KRV-63528.yml b/roles/winroom/tasks/KRV-63528.yml deleted file mode 100644 index 3d5690e..0000000 --- a/roles/winroom/tasks/KRV-63528.yml +++ /dev/null @@ -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 diff --git a/roles/winroom/tasks/all_classes.yml b/roles/winroom/tasks/all_classes.yml index 534b7af..b99be79 100644 --- a/roles/winroom/tasks/all_classes.yml +++ b/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 diff --git a/roles/winroom/tasks/openssl.yml b/roles/winroom/tasks/openssl.yml deleted file mode 100644 index 9687d1b..0000000 --- a/roles/winroom/tasks/openssl.yml +++ /dev/null @@ -1,4 +0,0 @@ -# We have it at least in git and msys2 but what the hell. -- name: Install OpenSSL - win_chocolatey: - name: openssl diff --git a/roles/winroom/tasks/sagemath.yml b/roles/winroom/tasks/sagemath.yml deleted file mode 100644 index 4640904..0000000 --- a/roles/winroom/tasks/sagemath.yml +++ /dev/null @@ -1 +0,0 @@ -# TODO From 4d2ba0d99925cd25e0a4391be89e4f4377e45088 Mon Sep 17 00:00:00 2001 From: kllemen Date: Fri, 13 Sep 2024 15:18:05 +0200 Subject: [PATCH 3/7] vscodevim.vim removed --- roles/vscode/tasks/vscode_extensions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/vscode/tasks/vscode_extensions.yml b/roles/vscode/tasks/vscode_extensions.yml index 7255502..3acb371 100644 --- a/roles/vscode/tasks/vscode_extensions.yml +++ b/roles/vscode/tasks/vscode_extensions.yml @@ -10,7 +10,7 @@ VSCode_Extensions: - 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 From dafd821af9ac111c6a6419a37812375ec0d5d411 Mon Sep 17 00:00:00 2001 From: kllemen Date: Fri, 13 Sep 2024 15:20:52 +0200 Subject: [PATCH 4/7] vscode-lldb never stops loading --- roles/vscode/tasks/vscode_extensions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/vscode/tasks/vscode_extensions.yml b/roles/vscode/tasks/vscode_extensions.yml index 3acb371..dfa6b79 100644 --- a/roles/vscode/tasks/vscode_extensions.yml +++ b/roles/vscode/tasks/vscode_extensions.yml @@ -22,4 +22,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 From ba865a90340d86601759fd3101ca027f7ca32377 Mon Sep 17 00:00:00 2001 From: kllemen Date: Fri, 13 Sep 2024 15:52:03 +0200 Subject: [PATCH 5/7] PPJ cleanup --- roles/haskell/tasks/main_win.yml | 42 +++++++++++------------ roles/linroom/tasks/PPJ-63220.yml | 2 +- roles/linroom/tasks/htop.yml | 0 roles/linroom/tasks/utop.yml | 4 +++ roles/linroom/tasks/vscode_extensions.yml | 4 +-- roles/vscode/tasks/vscode_extensions.yml | 4 +-- roles/winroom/tasks/PPJ-63220.yml | 11 ------ roles/winroom/tasks/haskell.yml | 42 +++++++++++------------ roles/winroom/tasks/vscode_extensions.yml | 4 --- 9 files changed, 49 insertions(+), 64 deletions(-) create mode 100644 roles/linroom/tasks/htop.yml create mode 100644 roles/linroom/tasks/utop.yml delete mode 100644 roles/winroom/tasks/PPJ-63220.yml diff --git a/roles/haskell/tasks/main_win.yml b/roles/haskell/tasks/main_win.yml index da6988e..882021a 100644 --- a/roles/haskell/tasks/main_win.yml +++ b/roles/haskell/tasks/main_win.yml @@ -1,25 +1,25 @@ -- name: Check Haskell install status - win_stat: - path: C:\ghcup\bin\ghc.exe - register: file +# - name: Check Haskell install status +# win_stat: +# path: C:\ghcup\bin\ghc.exe +# register: file -- when: not file.stat.exists - block: - - name: Download Haskell - win_get_url: - url: "https://www.haskell.org/ghcup/sh/bootstrap-haskell.ps1" - dest: 'C:\' - register: download +# - when: not file.stat.exists +# block: +# - name: Download Haskell +# win_get_url: +# url: "https://www.haskell.org/ghcup/sh/bootstrap-haskell.ps1" +# dest: 'C:\' +# register: download - - name: Install Haskell - win_command: powershell.exe {{ download.dest }} -InBash -ExistingMsys2Dir C:\msys64 +# - name: Install Haskell +# win_command: powershell.exe {{ download.dest }} -InBash -ExistingMsys2Dir C:\msys64 - - name: Add Haskell to PATH - win_path: - elements: - C:\ghcup\bin +# - name: Add Haskell to PATH +# win_path: +# elements: +# C:\ghcup\bin - - name: Remove temporary files - win_file: - path: "{{ download.dest }}" - state: absent +# - name: Remove temporary files +# win_file: +# path: "{{ download.dest }}" +# state: absent diff --git a/roles/linroom/tasks/PPJ-63220.yml b/roles/linroom/tasks/PPJ-63220.yml index 075a5cb..19f2ee3 100644 --- a/roles/linroom/tasks/PPJ-63220.yml +++ b/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 diff --git a/roles/linroom/tasks/htop.yml b/roles/linroom/tasks/htop.yml new file mode 100644 index 0000000..e69de29 diff --git a/roles/linroom/tasks/utop.yml b/roles/linroom/tasks/utop.yml new file mode 100644 index 0000000..38e38d2 --- /dev/null +++ b/roles/linroom/tasks/utop.yml @@ -0,0 +1,4 @@ +- name: Install utop + apt: + name: utop + state: latest diff --git a/roles/linroom/tasks/vscode_extensions.yml b/roles/linroom/tasks/vscode_extensions.yml index f42ef76..be886a8 100644 --- a/roles/linroom/tasks/vscode_extensions.yml +++ b/roles/linroom/tasks/vscode_extensions.yml @@ -1,9 +1,7 @@ VSCode_Extensions: - VisualStudioExptTeam.vscodeintellicode - - arthurwang.vsc-prolog - - dramforever.vscode-ghc-simple + - AmauryRabouan.new-vsc-prolog - eamodio.gitlens - - justusadam.language-haskell - ms-dotnettools.csdevkit # IS-63714 - ms-python.python - ms-vscode.cpptools diff --git a/roles/vscode/tasks/vscode_extensions.yml b/roles/vscode/tasks/vscode_extensions.yml index dfa6b79..5c47d87 100644 --- a/roles/vscode/tasks/vscode_extensions.yml +++ b/roles/vscode/tasks/vscode_extensions.yml @@ -1,9 +1,7 @@ VSCode_Extensions: - VisualStudioExptTeam.vscodeintellicode - - arthurwang.vsc-prolog - - dramforever.vscode-ghc-simple + - AmauryRabouan.new-vsc-prolog - eamodio.gitlens - - justusadam.language-haskell - ms-dotnettools.csdevkit # IS-63714 - ms-python.python - ms-vscode.cpptools diff --git a/roles/winroom/tasks/PPJ-63220.yml b/roles/winroom/tasks/PPJ-63220.yml deleted file mode 100644 index 075a5cb..0000000 --- a/roles/winroom/tasks/PPJ-63220.yml +++ /dev/null @@ -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 - diff --git a/roles/winroom/tasks/haskell.yml b/roles/winroom/tasks/haskell.yml index da6988e..882021a 100644 --- a/roles/winroom/tasks/haskell.yml +++ b/roles/winroom/tasks/haskell.yml @@ -1,25 +1,25 @@ -- name: Check Haskell install status - win_stat: - path: C:\ghcup\bin\ghc.exe - register: file +# - name: Check Haskell install status +# win_stat: +# path: C:\ghcup\bin\ghc.exe +# register: file -- when: not file.stat.exists - block: - - name: Download Haskell - win_get_url: - url: "https://www.haskell.org/ghcup/sh/bootstrap-haskell.ps1" - dest: 'C:\' - register: download +# - when: not file.stat.exists +# block: +# - name: Download Haskell +# win_get_url: +# url: "https://www.haskell.org/ghcup/sh/bootstrap-haskell.ps1" +# dest: 'C:\' +# register: download - - name: Install Haskell - win_command: powershell.exe {{ download.dest }} -InBash -ExistingMsys2Dir C:\msys64 +# - name: Install Haskell +# win_command: powershell.exe {{ download.dest }} -InBash -ExistingMsys2Dir C:\msys64 - - name: Add Haskell to PATH - win_path: - elements: - C:\ghcup\bin +# - name: Add Haskell to PATH +# win_path: +# elements: +# C:\ghcup\bin - - name: Remove temporary files - win_file: - path: "{{ download.dest }}" - state: absent +# - name: Remove temporary files +# win_file: +# path: "{{ download.dest }}" +# state: absent diff --git a/roles/winroom/tasks/vscode_extensions.yml b/roles/winroom/tasks/vscode_extensions.yml index f42ef76..3796ad4 100644 --- a/roles/winroom/tasks/vscode_extensions.yml +++ b/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 From a9154741a4a123fbfc53dd14500cdc268d23ef54 Mon Sep 17 00:00:00 2001 From: kllemen Date: Fri, 13 Sep 2024 16:02:10 +0200 Subject: [PATCH 6/7] Readline for SML (wip) --- roles/linroom/tasks/smlnj.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/roles/linroom/tasks/smlnj.yml b/roles/linroom/tasks/smlnj.yml index 7096389..04e9ce0 100644 --- a/roles/linroom/tasks/smlnj.yml +++ b/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 From e0861fd5eb96aba2cb35e5eacc29a8a197215d29 Mon Sep 17 00:00:00 2001 From: kllemen Date: Fri, 13 Sep 2024 16:05:52 +0200 Subject: [PATCH 7/7] PPJ ne rabi win --- roles/winroom/tasks/all_classes.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/roles/winroom/tasks/all_classes.yml b/roles/winroom/tasks/all_classes.yml index b99be79..1e4427e 100644 --- a/roles/winroom/tasks/all_classes.yml +++ b/roles/winroom/tasks/all_classes.yml @@ -31,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