diff --git a/guacamole/roles/guacamole/tasks/010-guacamole.yml b/guacamole/roles/guacamole/tasks/010-guacamole.yml index 87836433..948ea17a 100644 --- a/guacamole/roles/guacamole/tasks/010-guacamole.yml +++ b/guacamole/roles/guacamole/tasks/010-guacamole.yml @@ -1,4 +1,8 @@ --- +- name: Add Jammy repository for ubuntu 24 + apt_repository: + repo: "deb http://archive.ubuntu.com/ubuntu/ jammy main universe" + state: present - name: Install needed libraries and tools ansible.builtin.apt: update_cache: true diff --git a/guacamole/roles/guacamole/templates/user-mapping.xml.j2 b/guacamole/roles/guacamole/templates/user-mapping.xml.j2 index 5fa40757..7e81e218 100644 --- a/guacamole/roles/guacamole/templates/user-mapping.xml.j2 +++ b/guacamole/roles/guacamole/templates/user-mapping.xml.j2 @@ -1,186 +1,171 @@ - + - - - rdp - 127.0.0.1 - 3389 - de-de-qwertz - {{ default_user }} - {{ default_password }} + + rdp + 127.0.0.1 + 3389 + de-de-qwertz + ubuntu + denbi - rdp - 127.0.0.1 - 3389 - en-gb-qwerty - {{ default_user }} - {{ default_password }} + rdp + 127.0.0.1 + 3389 + en-us-qwerty + ubuntu + denbi - - rdp - 127.0.0.1 - 3389 - en-gb-qwerty - {{ default_user }} - {{ default_password }} + + rdp + 127.0.0.1 + 3389 + en-gb-qwerty + ubuntu + denbi + + rdp + 127.0.0.1 + 3389 + fr-fr-azerty + ubuntu + denbi - - rdp - 127.0.0.1 - 3389 - fr-fr-azerty - {{ default_user }} - {{ default_password }} - - - - rdp - 127.0.0.1 - 3389 - es-es-qwerty - {{ default_user }} - {{ default_password }} + rdp + 127.0.0.1 + 3389 + es-es-qwerty + ubuntu + denbi + - rdp - 127.0.0.1 - 3389 - es-latam-qwerty - {{ default_user }} - {{ default_password }} + rdp + 127.0.0.1 + 3389 + es-latam-qwerty + ubuntu + denbi - - rdp - 127.0.0.1 - 3389 - it-it-qwerty - {{ default_user }} - {{ default_password }} - - - - rdp - 127.0.0.1 - 3389 - pt-pt-qwerty - {{ default_user }} - {{ default_password }} - - - - - rdp - 127.0.0.1 - 3389 - pt-pt-qwerty - {{ default_user }} - {{ default_password }} - - - - rdp - 127.0.0.1 - 3389 - pt-br-qwerty - {{ default_user }} - {{ default_password }} - - - - - rdp - 127.0.0.1 - 3389 - nl-nl-qwerty - {{ default_user }} - {{ default_password }} - - - - rdp - 127.0.0.1 - 3389 - da-dk-qwerty - {{ default_user }} - {{ default_password }} - - - - rdp - 127.0.0.1 - 3389 - no-no-qwerty - {{ default_user }} - {{ default_password }} - - - rdp - 127.0.0.1 - 3389 - sv-se-qwerty - {{ default_user }} - {{ default_password }} - - - - rdp - 127.0.0.1 - 3389 - fi-fi-qwerty - {{ default_user }} - {{ default_password }} - - - - rdp - 127.0.0.1 - 3389 - ja-jp-qwerty - {{ default_user }} - {{ default_password }} - - - - rdp - 127.0.0.1 - 3389 - ko-kr-qwerty - {{ default_user }} - {{ default_password }} - - - - rdp - 127.0.0.1 - 3389 - zh-cn-qwerty - {{ default_user }} - {{ default_password }} - - - - - rdp - 127.0.0.1 - 3389 - ru-ru-qwerty - {{ default_user }} - {{ default_password }} - - - + rdp + 127.0.0.1 + 3389 + it-it-qwerty + ubuntu + denbi + + + + rdp + 127.0.0.1 + 3389 + pt-pt-qwerty + ubuntu + denbi + + + + rdp + 127.0.0.1 + 3389 + pt-br-qwerty + ubuntu + denbi + + + + rdp + 127.0.0.1 + 3389 + nl-nl-qwerty + ubuntu + denbi + + + + rdp + 127.0.0.1 + 3389 + da-dk-qwerty + ubuntu + denbi + + + + rdp + 127.0.0.1 + 3389 + no-no-qwerty + ubuntu + denbi + + + + rdp + 127.0.0.1 + 3389 + sv-se-qwerty + ubuntu + denbi + + + + rdp + 127.0.0.1 + 3389 + fi-fi-qwerty + ubuntu + denbi + + + + rdp + 127.0.0.1 + 3389 + ja-jp-qwerty + ubuntu + denbi + + + + rdp + 127.0.0.1 + 3389 + ko-kr-qwerty + ubuntu + denbi + + + + rdp + 127.0.0.1 + 3389 + zh-cn-qwerty + ubuntu + denbi + + + + rdp + 127.0.0.1 + 3389 + ru-ru-qwerty + ubuntu + denbi + + + diff --git a/packer/requirements.txt b/packer/requirements.txt index 02992ca7..b019dec8 100644 --- a/packer/requirements.txt +++ b/packer/requirements.txt @@ -1,4 +1,4 @@ -openstacksdk==3.1.0 -ansible==9.8.0 -python-openstackclient==6.6.1 +openstacksdk==4.0.0 +ansible==10.4.0 +python-openstackclient==7.1.2 paramiko diff --git a/packer/requirements.yml b/packer/requirements.yml index d4d5d7b6..e4f9fe6c 100644 --- a/packer/requirements.yml +++ b/packer/requirements.yml @@ -16,6 +16,8 @@ roles: src: https://github.com/deNBI/autoscaling-ansible version: 1.8.7 + - name: andrewrothstein.conda-env + - name: geerlingguy.swap collections: diff --git a/rstudio/rstudio.yml b/rstudio/rstudio.yml index c95b660e..a59e64b7 100644 --- a/rstudio/rstudio.yml +++ b/rstudio/rstudio.yml @@ -17,9 +17,29 @@ include_role: name: oefenweb.rstudio_server vars: - rstudio_install: [r-base] + rstudio_install: [ r-base ] rstudio_server_version: "{{ rstudio_vars.RSTUDIO_VERSION | replace('v', '') | replace('+', '-') }}" when: not rstudio_vars.create_only_backend +- name: Install essential system packages + ansible.builtin.apt: + name: + - build-essential + - libcurl4-openssl-dev + - libssl-dev + - zlib1g-dev + - libpng-dev + - libjpeg-dev + - libtiff-dev + - libfreetype6-dev + - libfontconfig1-dev + - libmysqlclient-dev + - libsqlite3-dev + - libpq-dev + - libfribidi-dev + - libharfbuzz-dev + - libxml2-dev + state: present + become: yes - name: Copy session file if also installing rstudio ansible.builtin.copy: diff --git a/rstudio/rstudio_metadata.yml b/rstudio/rstudio_metadata.yml index 82c2cf32..5c244bb2 100644 --- a/rstudio/rstudio_metadata.yml +++ b/rstudio/rstudio_metadata.yml @@ -21,4 +21,4 @@ info_url: "" community_driven: false wiki_link: "https://cloud.denbi.de/wiki/simple_vm/customization/#rstudio" information_for_display: - version: v2024.04.2+764 + version: v2024.09.0+375 diff --git a/rstudio/rstudio_vars_file.yml b/rstudio/rstudio_vars_file.yml index 5580497d..ee589159 100644 --- a/rstudio/rstudio_vars_file.yml +++ b/rstudio/rstudio_vars_file.yml @@ -5,4 +5,4 @@ rstudio_vars: default_user: ubuntu default_password: simplevm RSESSION_FILE_PATH: /etc/rstudio/rsession.conf - RSTUDIO_VERSION: v2024.04.2+764 + RSTUDIO_VERSION: v2024.09.0+375 diff --git a/vscode/vscode_metadata.yml b/vscode/vscode_metadata.yml index 4eb8dba8..f36ed69a 100644 --- a/vscode/vscode_metadata.yml +++ b/vscode/vscode_metadata.yml @@ -18,4 +18,4 @@ wiki_link: "" logo_url: "https://cloud.denbi.de/static/images/vscode.png" info_url: "" information_for_display: - version: v4.92.2 + version: v4.93.1 diff --git a/vscode/vscode_vars_file.yml b/vscode/vscode_vars_file.yml index 317cfb57..5a84740e 100644 --- a/vscode/vscode_vars_file.yml +++ b/vscode/vscode_vars_file.yml @@ -1,6 +1,6 @@ --- vscode_vars: INSTALL_SCRIPT_URL: https://code-server.dev/install.sh - VSCODE_VERSION: v4.92.2 + VSCODE_VERSION: v4.93.1 DEFAULT_USER: ubuntu PORT: 3000