From c876181b17f879b29dc7b74a94c36664149b8fb9 Mon Sep 17 00:00:00 2001 From: polz Date: Fri, 8 Sep 2023 23:29:14 +0200 Subject: [PATCH] Linux po prvem installu --- roles/linroom/tasks/APS1-63279.yml | 5 ++--- roles/linroom/tasks/Android_Studio.yml | 3 ++- roles/linroom/tasks/JDK.yml | 12 ++++++++++-- roles/linroom/tasks/OracleJDK.yml | 4 ---- roles/linroom/tasks/PB-63707.yml | 6 +++--- roles/linroom/tasks/VP-63775.yml | 12 ++++++------ roles/linroom/tasks/fri_base.yml | 7 ------- roles/linroom/tasks/main.yml | 4 +++- roles/linroom/tasks/notepad++.yml | 5 +++++ roles/linroom/tasks/notepadpp.yml | 1 - roles/linroom/tasks/projectlibre.yml | 2 +- roles/winroom/tasks/JDK.yml | 2 +- 12 files changed, 33 insertions(+), 30 deletions(-) delete mode 100644 roles/linroom/tasks/OracleJDK.yml delete mode 100644 roles/linroom/tasks/notepadpp.yml diff --git a/roles/linroom/tasks/APS1-63279.yml b/roles/linroom/tasks/APS1-63279.yml index a4fa9a2..53c4ace 100644 --- a/roles/linroom/tasks/APS1-63279.yml +++ b/roles/linroom/tasks/APS1-63279.yml @@ -2,8 +2,7 @@ # bojan.zunkovic@fri.uni-lj.si, polz@fri.uni-lj.si # Windows, Java JDK, Eclipse # - include_tasks: JDK.yml -# - include_tasks: OracleJDK.yml # - include_tasks: Eclipse.yml -include_tasks: c_development.yml -include_tasks: vscode.yml +- include_tasks: c_development.yml +- include_tasks: vscode.yml diff --git a/roles/linroom/tasks/Android_Studio.yml b/roles/linroom/tasks/Android_Studio.yml index 4e21007..da7ceee 100644 --- a/roles/linroom/tasks/Android_Studio.yml +++ b/roles/linroom/tasks/Android_Studio.yml @@ -6,7 +6,8 @@ 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/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/JDK.yml b/roles/linroom/tasks/JDK.yml index c7bf763..c393c2f 100644 --- a/roles/linroom/tasks/JDK.yml +++ b/roles/linroom/tasks/JDK.yml @@ -19,6 +19,14 @@ state: latest -- name: Install Oracle Java +- name: Install Oracle Java dependencies apt: - deb: "https://download.oracle.com/java/19/latest/jdk-19_linux-x64_bin.deb" + 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/OracleJDK.yml b/roles/linroom/tasks/OracleJDK.yml deleted file mode 100644 index ca77f43..0000000 --- a/roles/linroom/tasks/OracleJDK.yml +++ /dev/null @@ -1,4 +0,0 @@ -- name: Install Oracle JDK 18 - apt: - deb: "https://download.oracle.com/java/18/latest/jdk-18_linux-x64_bin.deb" - diff --git a/roles/linroom/tasks/PB-63707.yml b/roles/linroom/tasks/PB-63707.yml index 22eea37..ed20365 100644 --- a/roles/linroom/tasks/PB-63707.yml +++ b/roles/linroom/tasks/PB-63707.yml @@ -1,11 +1,11 @@ # 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: dotnet6.yml - include_tasks: jupyter.yml -- include_tasks: JDK.yml - include_tasks: powerdesigner.yml -- include_tasks: mysql_workbench.yml -- include_tasks: mysql-odbc-connector.yml - include_tasks: notepad++.yml diff --git a/roles/linroom/tasks/VP-63775.yml b/roles/linroom/tasks/VP-63775.yml index 597d8be..bf39942 100644 --- a/roles/linroom/tasks/VP-63775.yml +++ b/roles/linroom/tasks/VP-63775.yml @@ -5,9 +5,9 @@ # Java (kar je bilo lani bo ok) in IntelliJ IDEA CE # maven # git -include_tasks: git.yml -include_tasks: maven.yml -include_tasks: IDEA.yml -include_tasks: JDK.yml -include_tasks: jupyter.yml -include_tasks: PyCharm.yml +- include_tasks: git.yml +- include_tasks: maven.yml +- include_tasks: IDEA.yml +- include_tasks: JDK.yml +- include_tasks: jupyter.yml +- include_tasks: PyCharm.yml diff --git a/roles/linroom/tasks/fri_base.yml b/roles/linroom/tasks/fri_base.yml index a35bed4..e018b53 100644 --- a/roles/linroom/tasks/fri_base.yml +++ b/roles/linroom/tasks/fri_base.yml @@ -104,10 +104,3 @@ - name: Enable Wake-on-LAN import_tasks: wake-on-lan.yml -- name: Join AD - shell: "realm join --user=ad.join@FRI1.UNI-LJ.SI --computer-ou=OU=Ucilnice FRI1.UNI-LJ.SI" - -- name: Fix SSSD config - template: - src: sssd.conf - dest: /etc/sssd/sssd.conf diff --git a/roles/linroom/tasks/main.yml b/roles/linroom/tasks/main.yml index bde6dea..a8de4b6 100644 --- a/roles/linroom/tasks/main.yml +++ b/roles/linroom/tasks/main.yml @@ -28,8 +28,8 @@ - import_tasks: OS-63709.yml - import_tasks: OS-63741.yml - import_tasks: OUI-63214.yml -- import_tasks: P2-63706.yml - import_tasks: P2-63278.yml +- import_tasks: P2-63706.yml - import_tasks: PA-63737.yml - import_tasks: PB-63707.yml - import_tasks: PB2-63713.yml @@ -45,6 +45,7 @@ - import_tasks: RK-63708.yml - import_tasks: RPOI-90066.yml - import_tasks: RZP-63523.yml +- import_tasks: SP-63255.yml - import_tasks: ST-63727.yml - import_tasks: SU-63519.yml - import_tasks: TINR-63740.yml @@ -54,5 +55,6 @@ - import_tasks: UV-63721.yml - import_tasks: UZ-63267.yml - import_tasks: VN-63728.yml +- import_tasks: VP-63775.yml - import_tasks: VPSA-63735.yml - import_tasks: VZR-63543.yml diff --git a/roles/linroom/tasks/notepad++.yml b/roles/linroom/tasks/notepad++.yml index 9e8a653..b45c1a2 100644 --- a/roles/linroom/tasks/notepad++.yml +++ b/roles/linroom/tasks/notepad++.yml @@ -11,3 +11,8 @@ apt: name: wine-binfmt state: latest +- name: Download and unpack Notepad++ + unarchive: + src: https://github.com/notepad-plus-plus/notepad-plus-plus/releases/download/v8.5.7/npp.8.5.7.portable.x64.7z + dest: /opt/notepad++ + remote_src: yes diff --git a/roles/linroom/tasks/notepadpp.yml b/roles/linroom/tasks/notepadpp.yml deleted file mode 100644 index 583351f..0000000 --- a/roles/linroom/tasks/notepadpp.yml +++ /dev/null @@ -1 +0,0 @@ -# TODO install Notepad++ diff --git a/roles/linroom/tasks/projectlibre.yml b/roles/linroom/tasks/projectlibre.yml index e06f1c5..518d209 100644 --- a/roles/linroom/tasks/projectlibre.yml +++ b/roles/linroom/tasks/projectlibre.yml @@ -1,3 +1,3 @@ - name: Install projectlibre apt: - deb: https://jztkft.dl.sourceforge.net/project/projectlibre/ProjectLibre/1.9.3/projectlibre_1.9.3-1.deb + deb: https://downloads.sourceforge.net/project/projectlibre/ProjectLibre/1.9.3/projectlibre_1.9.3-1.deb diff --git a/roles/winroom/tasks/JDK.yml b/roles/winroom/tasks/JDK.yml index a390bad..c3e3dc6 100644 --- a/roles/winroom/tasks/JDK.yml +++ b/roles/winroom/tasks/JDK.yml @@ -1,6 +1,6 @@ - name: Install Oracle JDK win_package: - path: https://download.oracle.com/java/19/latest/jdk-19_windows-x64_bin.msi + path: https://download.oracle.com/java/20/latest/jdk-20_windows-x64_bin.msi arguments: INSTALLLEVEL=3 - name: Find Java version