From 02198c1de91df6c8d7676a3cdc58215d144186ba Mon Sep 17 00:00:00 2001 From: kllemen Date: Fri, 13 Sep 2024 14:55:09 +0200 Subject: [PATCH] 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