From d50b7264d20d6522f0f46e0c4e052c2e3a97e5b6 Mon Sep 17 00:00:00 2001 From: polz Date: Mon, 11 Sep 2023 11:29:05 +0200 Subject: [PATCH] Urejanje seznama predmetov, programov --- roles/linroom/tasks/AAHRP-63263.yml | 4 +-- roles/linroom/tasks/ARP1-63545C.yml | 2 +- roles/linroom/tasks/EP-63249.yml | 2 +- roles/linroom/tasks/GIMP.yml | 4 --- roles/linroom/tasks/IS-63714.yml | 2 +- roles/linroom/tasks/IVZ-63521.yml | 4 +-- roles/linroom/tasks/KCR-63550.yml | 2 +- roles/linroom/tasks/P2-63278.yml | 2 +- roles/linroom/tasks/P2-63706.yml | 4 +-- roles/linroom/tasks/PB-63707.yml | 9 ++--- roles/linroom/tasks/PSP-63287.yml | 2 +- roles/linroom/tasks/RK-63209.yml | 4 +-- roles/linroom/tasks/RK-63708.yml | 4 +-- roles/linroom/tasks/RStudio.yml | 14 -------- roles/linroom/tasks/SML_NJ.yml | 13 ------- roles/linroom/tasks/ST-63727.yml | 2 +- roles/linroom/tasks/TUP-63226.yml | 4 +-- roles/linroom/tasks/UV-63721.yml | 6 ++-- roles/linroom/tasks/VP-63775.yml | 6 ++-- roles/linroom/tasks/Wireshark.yml | 10 ------ roles/linroom/tasks/android_studio.yml | 13 +++++++ .../tasks/{Eclipse.yml => eclipse.yml} | 0 roles/linroom/tasks/gns3.yml | 14 ++++++++ roles/linroom/tasks/gui_development.yml | 35 +++++++++++++++++++ roles/linroom/tasks/{IDEA.yml => idea.yml} | 0 roles/linroom/tasks/jdk.yml | 32 +++++++++++++++++ roles/linroom/tasks/pycharm.yml | 12 +++++++ roles/linroom/tasks/vscode.yml | 2 +- roles/linroom/tasks/xampp.yml | 3 ++ 29 files changed, 140 insertions(+), 71 deletions(-) delete mode 100644 roles/linroom/tasks/GIMP.yml delete mode 100644 roles/linroom/tasks/RStudio.yml delete mode 100644 roles/linroom/tasks/SML_NJ.yml delete mode 100644 roles/linroom/tasks/Wireshark.yml create mode 100644 roles/linroom/tasks/android_studio.yml rename roles/linroom/tasks/{Eclipse.yml => eclipse.yml} (100%) create mode 100644 roles/linroom/tasks/gns3.yml create mode 100644 roles/linroom/tasks/gui_development.yml rename roles/linroom/tasks/{IDEA.yml => idea.yml} (100%) create mode 100644 roles/linroom/tasks/jdk.yml create mode 100644 roles/linroom/tasks/pycharm.yml create mode 100644 roles/linroom/tasks/xampp.yml diff --git a/roles/linroom/tasks/AAHRP-63263.yml b/roles/linroom/tasks/AAHRP-63263.yml index 4bab28f..0e66b32 100644 --- a/roles/linroom/tasks/AAHRP-63263.yml +++ b/roles/linroom/tasks/AAHRP-63263.yml @@ -2,5 +2,5 @@ # matej.piculin@fri.uni-lj.si # Windows, Java JDK, Eclipse, R, RStudio - include_tasks: rstudio.yml -- include_tasks: Eclipse.yml -- include_tasks: JDK.yml +- include_tasks: eclipse.yml +- include_tasks: jdk.yml diff --git a/roles/linroom/tasks/ARP1-63545C.yml b/roles/linroom/tasks/ARP1-63545C.yml index 006c924..4c50bf0 100644 --- a/roles/linroom/tasks/ARP1-63545C.yml +++ b/roles/linroom/tasks/ARP1-63545C.yml @@ -1,4 +1,4 @@ # Aktualno raziskovalno področje 1 # Veljko.Pejovic@fri.uni-lj.si # Android Studio -- include_tasks: Android_Studio.yml +- include_tasks: android_studio.yml diff --git a/roles/linroom/tasks/EP-63249.yml b/roles/linroom/tasks/EP-63249.yml index 3d902c2..1cc049d 100644 --- a/roles/linroom/tasks/EP-63249.yml +++ b/roles/linroom/tasks/EP-63249.yml @@ -3,4 +3,4 @@ # Windows, VirtualBox, Android Studio # - include_tasks: virtualbox.yml -- include_tasks: Android_Studio.yml +- include_tasks: android_studio.yml diff --git a/roles/linroom/tasks/GIMP.yml b/roles/linroom/tasks/GIMP.yml deleted file mode 100644 index 405221e..0000000 --- a/roles/linroom/tasks/GIMP.yml +++ /dev/null @@ -1,4 +0,0 @@ -- name: Install GIMP - ansible.builtin.apt: - name: gimp - state: latest diff --git a/roles/linroom/tasks/IS-63714.yml b/roles/linroom/tasks/IS-63714.yml index b4f36eb..2dd62b0 100644 --- a/roles/linroom/tasks/IS-63714.yml +++ b/roles/linroom/tasks/IS-63714.yml @@ -6,5 +6,5 @@ - include_tasks: vscode.yml - include_tasks: dotnet6.yml - include_tasks: git.yml -- include_tasks: Android_Studio.yml +- include_tasks: android_studio.yml diff --git a/roles/linroom/tasks/IVZ-63521.yml b/roles/linroom/tasks/IVZ-63521.yml index fa776af..ca0a419 100644 --- a/roles/linroom/tasks/IVZ-63521.yml +++ b/roles/linroom/tasks/IVZ-63521.yml @@ -1,6 +1,6 @@ # Informacijska varnost in zasebnost # David.Jelenc@fri.uni-lj.si # Java JDK, IntelliJ IDEA, VirtualBox -- include_tasks: JDK.yml -- include_tasks: IDEA.yml +- include_tasks: jdk.yml +- include_tasks: idea.yml - include_tasks: virtualbox.yml diff --git a/roles/linroom/tasks/KCR-63550.yml b/roles/linroom/tasks/KCR-63550.yml index c22ea88..9fa8298 100644 --- a/roles/linroom/tasks/KCR-63550.yml +++ b/roles/linroom/tasks/KCR-63550.yml @@ -1,7 +1,7 @@ # Komunikacija človek računalnik # Ales.Smrdel@fri.uni-lj.si # Java JDK, Matlab, wfdb, Apache NetBeans -- include_tasks: JDK.yml +- include_tasks: jdk.yml - include_tasks: matlab.yml - include_tasks: wfdb.yml - include_tasks: netbeans.yml diff --git a/roles/linroom/tasks/P2-63278.yml b/roles/linroom/tasks/P2-63278.yml index 9934e0c..45b8e25 100644 --- a/roles/linroom/tasks/P2-63278.yml +++ b/roles/linroom/tasks/P2-63278.yml @@ -2,7 +2,7 @@ # bostjan.slivnik@fri.uni-lj.si # gedit, vscode, pdf viewer (evince), gcc, g++, make, JDK -- include_tasks: JDK.yml +- include_tasks: jdk.yml - include_tasks: gedit.yml - include_tasks: vscode.yml - include_tasks: c_development.yml diff --git a/roles/linroom/tasks/P2-63706.yml b/roles/linroom/tasks/P2-63706.yml index b1004e6..f704f51 100644 --- a/roles/linroom/tasks/P2-63706.yml +++ b/roles/linroom/tasks/P2-63706.yml @@ -2,6 +2,6 @@ # Tomaz.Dobravec@fri.uni-lj.si # Windows, Java JDK, IntelliJ IDEA, Apache NetBeans -- include_tasks: JDK.yml -- include_tasks: IDEA.yml +- include_tasks: jdk.yml +- include_tasks: idea.yml - include_tasks: netbeans.yml diff --git a/roles/linroom/tasks/PB-63707.yml b/roles/linroom/tasks/PB-63707.yml index ed20365..c142839 100644 --- a/roles/linroom/tasks/PB-63707.yml +++ b/roles/linroom/tasks/PB-63707.yml @@ -1,11 +1,12 @@ # Podatkovne baze # Ales.Jaklic@fri.uni-lj.si, matej.piculin@fri.uni-lj.si, Luka.Sajn@fri.uni-lj.si # Windows, Power designer 12.5, Java JDK, Python 3, dotnet6 SDK, Jupyter Notebook, Eclipse, MySql Workbench, MySQL ODBC Connector, Notepad++ -- include_tasks: mysql_workbench.yml -- include_tasks: JDK.yml -- include_tasks: mysql-odbc-connector.yml -- include_tasks: Eclipse.yml +- include_tasks: eclipse.yml - include_tasks: dotnet6.yml - include_tasks: jupyter.yml +- include_tasks: jdk.yml - include_tasks: powerdesigner.yml +- include_tasks: pyodbc.yml +- include_tasks: mysql_workbench.yml +- include_tasks: mysql-odbc-connector.yml - include_tasks: notepad++.yml diff --git a/roles/linroom/tasks/PSP-63287.yml b/roles/linroom/tasks/PSP-63287.yml index 7a9c97c..6e86917 100644 --- a/roles/linroom/tasks/PSP-63287.yml +++ b/roles/linroom/tasks/PSP-63287.yml @@ -2,5 +2,5 @@ # Veljko.Pejovic@fri.uni-lj.si # Android Studio, Arduino IDE -- include_tasks: Android_Studio.yml +- include_tasks: android_studio.yml - include_tasks: arduino.yml diff --git a/roles/linroom/tasks/RK-63209.yml b/roles/linroom/tasks/RK-63209.yml index bee15c1..fe7a9b8 100644 --- a/roles/linroom/tasks/RK-63209.yml +++ b/roles/linroom/tasks/RK-63209.yml @@ -2,8 +2,8 @@ # Ales.Jaklic@fri.uni-lj.si, Matjaz.Pancur@fri.uni-lj.si, Jure.Tuta@fri.uni-lj.si, Domen.Kosir@fri.uni-lj.si # GNU/Linux, GNS3, Docker, VS Code, wireshark, Java JDK, Python 3 - include_tasks: docker.yml -- include_tasks: GNS3.yml +- include_tasks: gns3.yml - include_tasks: vscode.yml - include_tasks: wireshark.yml -- include_tasks: JDK.yml +- include_tasks: jdk.yml diff --git a/roles/linroom/tasks/RK-63708.yml b/roles/linroom/tasks/RK-63708.yml index c3dea0d..d03d8c0 100644 --- a/roles/linroom/tasks/RK-63708.yml +++ b/roles/linroom/tasks/RK-63708.yml @@ -2,8 +2,8 @@ # Matjaz.Pancur@fri.uni-lj.si, Miha.Grohar@fri.uni-lj.si # GNU/Linux, GNS3, Docker, VS Code, wireshark, Java JDK, Python 3 - include_tasks: docker.yml -- include_tasks: GNS3.yml +- include_tasks: gns3.yml - include_tasks: vscode.yml - include_tasks: wireshark.yml -- include_tasks: JDK.yml +- include_tasks: jdk.yml diff --git a/roles/linroom/tasks/RStudio.yml b/roles/linroom/tasks/RStudio.yml deleted file mode 100644 index 95ae391..0000000 --- a/roles/linroom/tasks/RStudio.yml +++ /dev/null @@ -1,14 +0,0 @@ -- name: Add R repository - block: - - name: R repo - apt key - ansible.builtin.get_url: - url: https://cloud.r-project.org/bin/linux/ubuntu/marutter_pubkey.asc - dest: /etc/apt/trusted.gpg.d/cran_ubuntu_key.asc - - name: R repo - url - ansible.builtin.apt_repository: - repo: "deb https://cloud.r-project.org/bin/linux/ubuntu {{ansible_distribution_release}}-cran40/" - state: present -- name: Install R - ansible.builtin.apt: - name: r-base - state: latest diff --git a/roles/linroom/tasks/SML_NJ.yml b/roles/linroom/tasks/SML_NJ.yml deleted file mode 100644 index 7096389..0000000 --- a/roles/linroom/tasks/SML_NJ.yml +++ /dev/null @@ -1,13 +0,0 @@ -- name: Install SML/NJ - apt: - name: smlnj - state: latest -- name: Install SML/NJ - apt: - name: smlnj - state: latest -- name: Install Emacs extension for SML - apt: - name: elpa-sml-mode - state: latest - diff --git a/roles/linroom/tasks/ST-63727.yml b/roles/linroom/tasks/ST-63727.yml index 66e48a3..5fa86f8 100644 --- a/roles/linroom/tasks/ST-63727.yml +++ b/roles/linroom/tasks/ST-63727.yml @@ -2,4 +2,4 @@ # David.Jelenc@fri.uni-lj.si # Windows, VS Code, XAMPP - include_tasks: vscode.yml -- include_tasks: XAMPP.yml +- include_tasks: xampp.yml diff --git a/roles/linroom/tasks/TUP-63226.yml b/roles/linroom/tasks/TUP-63226.yml index 73bd12c..3239da9 100644 --- a/roles/linroom/tasks/TUP-63226.yml +++ b/roles/linroom/tasks/TUP-63226.yml @@ -1,10 +1,10 @@ # Tehnologija upravljanja podatkov # Luka.Sajn@fri.uni-lj.si # Windows, Power designer 12.5, Java JDK, Python 3, dotnet6 SDK, Jupyter Notebook, Eclipse, MySql Workbench, MySQL ODBC Connector, Notepad++ -- include_tasks: Eclipse.yml +- include_tasks: eclipse.yml - include_tasks: dotnet6.yml - include_tasks: jupyter.yml -- include_tasks: JDK.yml +- include_tasks: jdk.yml - include_tasks: powerdesigner.yml - include_tasks: mysql_workbench.yml - include_tasks: mysql-odbc-connector.yml diff --git a/roles/linroom/tasks/UV-63721.yml b/roles/linroom/tasks/UV-63721.yml index cf15c53..b7fb3c7 100644 --- a/roles/linroom/tasks/UV-63721.yml +++ b/roles/linroom/tasks/UV-63721.yml @@ -1,7 +1,7 @@ # Uporabniški vmesniki # Ales.Smrdel@fri.uni-lj.si # Windows, GNU/Linux, Java JDK, IntelliJ IDEA, javafx, SceneBuilder, X11 development, Wayland development, gtk+ development, glade, python -- include_tasks: JDK.yml -- include_tasks: IDEA.yml +- include_tasks: jdk.yml +- include_tasks: idea.yml - include_tasks: javafx.yml -- include_tasks: GUI_development.yml +- include_tasks: gui_development.yml diff --git a/roles/linroom/tasks/VP-63775.yml b/roles/linroom/tasks/VP-63775.yml index bf39942..e7c34e3 100644 --- a/roles/linroom/tasks/VP-63775.yml +++ b/roles/linroom/tasks/VP-63775.yml @@ -7,7 +7,7 @@ # git - include_tasks: git.yml - include_tasks: maven.yml -- include_tasks: IDEA.yml -- include_tasks: JDK.yml +- include_tasks: idea.yml +- include_tasks: jdk.yml - include_tasks: jupyter.yml -- include_tasks: PyCharm.yml +- include_tasks: pycharm.yml diff --git a/roles/linroom/tasks/Wireshark.yml b/roles/linroom/tasks/Wireshark.yml deleted file mode 100644 index fe4e91c..0000000 --- a/roles/linroom/tasks/Wireshark.yml +++ /dev/null @@ -1,10 +0,0 @@ -- name: Enable non-privileged users to run wireshark - ansible.builtin.debconf: - name: wireshark - question: wireshark-common/install-setuid - value: true - vtype: boolean -- name: "Install Wireshark" - apt: - name: wireshark-qt - state: latest diff --git a/roles/linroom/tasks/android_studio.yml b/roles/linroom/tasks/android_studio.yml new file mode 100644 index 0000000..da7ceee --- /dev/null +++ b/roles/linroom/tasks/android_studio.yml @@ -0,0 +1,13 @@ +- name: Install Android Studio + block: + - name: Create destination for Android Studio + file: + path: /opt/Android_Studio + state: directory + - name: Download and unpack Android Studio + unarchive: + # src: https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2021.3.1.16/android-studio-2021.3.1.16-linux.tar.gz + src: https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2022.3.1.19/android-studio-2022.3.1.19-linux.tar.gz + creates: /opt/Android_Studio/android-studio/build.txt + dest: /opt/Android_Studio + remote_src: yes diff --git a/roles/linroom/tasks/Eclipse.yml b/roles/linroom/tasks/eclipse.yml similarity index 100% rename from roles/linroom/tasks/Eclipse.yml rename to roles/linroom/tasks/eclipse.yml diff --git a/roles/linroom/tasks/gns3.yml b/roles/linroom/tasks/gns3.yml new file mode 100644 index 0000000..1e42fc6 --- /dev/null +++ b/roles/linroom/tasks/gns3.yml @@ -0,0 +1,14 @@ +- 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/gui_development.yml b/roles/linroom/tasks/gui_development.yml new file mode 100644 index 0000000..a47bfc0 --- /dev/null +++ b/roles/linroom/tasks/gui_development.yml @@ -0,0 +1,35 @@ +- name: Install X11 development + apt: + name: + - libx11-dev + - libxext-dev + - x11-utils + state: latest + +- name: Install GTK development + apt: + name: + - libgtk-4-dev + - libgtk-3-dev + - libgtkmm-3.0-dev + state: latest + +- name: Install Wayland development + apt: + name: + - libwayland-dev + - libwlroots-dev + - qt6-wayland-dev + - qt6-wayland-dev-tools + - weston + state: latest + +- name: Install Glade + apt: + name: glade + state: latest + +- name: Install QT Creator + apt: + name: qtcreator + state: latest diff --git a/roles/linroom/tasks/IDEA.yml b/roles/linroom/tasks/idea.yml similarity index 100% rename from roles/linroom/tasks/IDEA.yml rename to roles/linroom/tasks/idea.yml diff --git a/roles/linroom/tasks/jdk.yml b/roles/linroom/tasks/jdk.yml new file mode 100644 index 0000000..c393c2f --- /dev/null +++ b/roles/linroom/tasks/jdk.yml @@ -0,0 +1,32 @@ +- name: Install OpenJDK 18 + apt: + name: openjdk-18-jdk + state: latest + +- name: Install OpenJDK 19 + apt: + name: openjdk-19-jdk + state: latest + +- name: Install OpenJDK 11 + apt: + name: openjdk-11-jdk + state: latest + +- name: Install default JDK + apt: + name: default-jdk + state: latest + + +- name: Install Oracle Java dependencies + apt: + name: + - libc6-i386 + - libc6-x32 + state: latest + +- name: Install Oracle JDK 20 + apt: + deb: "https://download.oracle.com/java/20/latest/jdk-20_linux-x64_bin.deb" + diff --git a/roles/linroom/tasks/pycharm.yml b/roles/linroom/tasks/pycharm.yml new file mode 100644 index 0000000..b85c36b --- /dev/null +++ b/roles/linroom/tasks/pycharm.yml @@ -0,0 +1,12 @@ +- name: Install PyCharm + block: + - name: Create destination for JetBrains PyCharm + file: + path: /opt/PyCharm + state: directory + - name: Download and unpack JetBrains PyCharm + unarchive: + src: https://download.jetbrains.com/python/pycharm-community-2023.2.1.tar.gz + dest: /opt/PyCharm + creates: /opt/PyCharm/pycharm-community-2023.2.1/build.txt + remote_src: yes diff --git a/roles/linroom/tasks/vscode.yml b/roles/linroom/tasks/vscode.yml index 78b0679..08ae21d 100644 --- a/roles/linroom/tasks/vscode.yml +++ b/roles/linroom/tasks/vscode.yml @@ -17,5 +17,5 @@ - name: Install VS Code extensions command: code --no-sandbox --user-data-dir "/usr/share/code/resources/app" --extensions-dir "/usr/share/code/resources/app/extensions" --install-extension "{{ item }}" - loop: {{VSCode_Extensions}} + loop: "{{VSCode_Extensions}}" notify: fix VS code extensions diff --git a/roles/linroom/tasks/xampp.yml b/roles/linroom/tasks/xampp.yml new file mode 100644 index 0000000..4a7facf --- /dev/null +++ b/roles/linroom/tasks/xampp.yml @@ -0,0 +1,3 @@ +- name: Install XAMPP + debug: + msg: Namesto XAMPP bi verjetno LAMP?