Skip to content

Commit

Permalink
Merge pull request #477 from deNBI/dev
Browse files Browse the repository at this point in the history 
Dev
  • Loading branch information
@dweinholz
dweinholz authored Oct 2, 2024
2 parents 1b3a3fa + 644232d commit 6591fad
Show file tree
Hide file tree
Showing 9 changed files with 185 additions and 174 deletions.
4 changes: 4 additions & 0 deletions guacamole/roles/guacamole/tasks/010-guacamole.yml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
---
- name: Add Jammy repository for ubuntu 24

Check failure on line 2 in guacamole/roles/guacamole/tasks/010-guacamole.yml

View workflow job for this annotation

GitHub Actions / build

fqcn[action-core] 

Use FQCN for builtin module actions (apt_repository).

Check failure on line 2 in guacamole/roles/guacamole/tasks/010-guacamole.yml

View workflow job for this annotation

GitHub Actions / build

fqcn[action-core] 

Use FQCN for builtin module actions (apt_repository).
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
Expand Down
317 changes: 151 additions & 166 deletions guacamole/roles/guacamole/templates/user-mapping.xml.j2
View file
Original file line number Diff line number Diff line change
@@ -1,186 +1,171 @@
<user-mapping>

<authorize
username="{{ guac_user }}"
password="{{ guac_password }}">
<authorize
username="denbi"
password="denbi">


<connection name="Ubuntu Server (German Keyboard Layout)">
<protocol>rdp</protocol>
<param name="hostname">127.0.0.1</param>
<param name="port">3389</param>
<param name="server-layout">de-de-qwertz</param>
<param name="username">{{ default_user }}</param>
<param name="password">{{ default_password }}</param>
<connection name="Ubuntu Server (German Keyboard Layout)">
<protocol>rdp</protocol>
<param name="hostname">127.0.0.1</param>
<param name="port">3389</param>
<param name="server-layout">de-de-qwertz</param>
<param name="username">ubuntu</param>
<param name="password">denbi</param>
</connection>

<connection name="Ubuntu Server (US Keyboard Layout)">
<protocol>rdp</protocol>
<param name="hostname">127.0.0.1</param>
<param name="port">3389</param>
<param name="server-layout">en-gb-qwerty</param>
<param name="username">{{ default_user }}</param>
<param name="password">{{ default_password }}</param>
<protocol>rdp</protocol>
<param name="hostname">127.0.0.1</param>
<param name="port">3389</param>
<param name="server-layout">en-us-qwerty</param>
<param name="username">ubuntu</param>
<param name="password">denbi</param>
</connection>

<connection name="Ubuntu Server (UK Keyboard Layout)">
<protocol>rdp</protocol>
<param name="hostname">127.0.0.1</param>
<param name="port">3389</param>
<param name="server-layout">en-gb-qwerty</param>
<param name="username">{{ default_user }}</param>
<param name="password">{{ default_password }}</param>
<connection name="Ubuntu Server (UK Keyboard Layout)">
<protocol>rdp</protocol>
<param name="hostname">127.0.0.1</param>
<param name="port">3389</param>
<param name="server-layout">en-gb-qwerty</param>
<param name="username">ubuntu</param>
<param name="password">denbi</param>
</connection>

<connection name="Ubuntu Server (French Keyboard Layout)">
<protocol>rdp</protocol>
<param name="hostname">127.0.0.1</param>
<param name="port">3389</param>
<param name="server-layout">fr-fr-azerty</param>
<param name="username">ubuntu</param>
<param name="password">denbi</param>
</connection>

<connection name="Ubuntu Server (French Keyboard Layout)">
<protocol>rdp</protocol>
<param name="hostname">127.0.0.1</param>
<param name="port">3389</param>
<param name="server-layout">fr-fr-azerty</param>
<param name="username">{{ default_user }}</param>
<param name="password">{{ default_password }}</param>
</connection>


<connection name="Ubuntu Server (Spanish Keyboard Layout)">
<protocol>rdp</protocol>
<param name="hostname">127.0.0.1</param>
<param name="port">3389</param>
<param name="server-layout">es-es-qwerty</param>
<param name="username">{{ default_user }}</param>
<param name="password">{{ default_password }}</param>
<protocol>rdp</protocol>
<param name="hostname">127.0.0.1</param>
<param name="port">3389</param>
<param name="server-layout">es-es-qwerty</param>
<param name="username">ubuntu</param>
<param name="password">denbi</param>
</connection>

<connection name="Ubuntu Server (Latin America Keyboard Layout)">
<protocol>rdp</protocol>
<param name="hostname">127.0.0.1</param>
<param name="port">3389</param>
<param name="server-layout">es-latam-qwerty</param>
<param name="username">{{ default_user }}</param>
<param name="password">{{ default_password }}</param>
<protocol>rdp</protocol>
<param name="hostname">127.0.0.1</param>
<param name="port">3389</param>
<param name="server-layout">es-latam-qwerty</param>
<param name="username">ubuntu</param>
<param name="password">denbi</param>
</connection>


<connection name="Ubuntu Server (Italian Keyboard Layout)">
<protocol>rdp</protocol>
<param name="hostname">127.0.0.1</param>
<param name="port">3389</param>
<param name="server-layout">it-it-qwerty</param>
<param name="username">{{ default_user }}</param>
<param name="password">{{ default_password }}</param>
</connection>

<connection name="Ubuntu Server (Portugese Keyboard Layout)">
<protocol>rdp</protocol>
<param name="hostname">127.0.0.1</param>
<param name="port">3389</param>
<param name="server-layout">pt-pt-qwerty</param>
<param name="username">{{ default_user }}</param>
<param name="password">{{ default_password }}</param>
</connection>


<connection name="Ubuntu Server (Portugese - Portugal Keyboard Layout)">
<protocol>rdp</protocol>
<param name="hostname">127.0.0.1</param>
<param name="port">3389</param>
<param name="server-layout">pt-pt-qwerty</param>
<param name="username">{{ default_user }}</param>
<param name="password">{{ default_password }}</param>
</connection>

<connection name="Ubuntu Server (Portugese - Brazil Keyboard Layout)">
<protocol>rdp</protocol>
<param name="hostname">127.0.0.1</param>
<param name="port">3389</param>
<param name="server-layout">pt-br-qwerty</param>
<param name="username">{{ default_user }}</param>
<param name="password">{{ default_password }}</param>
</connection>


<connection name="Ubuntu Server (Dutch Keyboard Layout)">
<protocol>rdp</protocol>
<param name="hostname">127.0.0.1</param>
<param name="port">3389</param>
<param name="server-layout">nl-nl-qwerty</param>
<param name="username">{{ default_user }}</param>
<param name="password">{{ default_password }}</param>
</connection>

<connection name="Ubuntu Server (Danish Keyboard Layout)">
<protocol>rdp</protocol>
<param name="hostname">127.0.0.1</param>
<param name="port">3389</param>
<param name="server-layout">da-dk-qwerty</param>
<param name="username">{{ default_user }}</param>
<param name="password">{{ default_password }}</param>
</connection>

<connection name="Ubuntu Server (Norwegian Keyboard Layout)">
<protocol>rdp</protocol>
<param name="hostname">127.0.0.1</param>
<param name="port">3389</param>
<param name="server-layout">no-no-qwerty</param>
<param name="username">{{ default_user }}</param>
<param name="password">{{ default_password }}</param>
</connection>
<connection name="Ubuntu Server (Swedish Keyboard Layout)">
<protocol>rdp</protocol>
<param name="hostname">127.0.0.1</param>
<param name="port">3389</param>
<param name="server-layout">sv-se-qwerty</param>
<param name="username">{{ default_user }}</param>
<param name="password">{{ default_password }}</param>
</connection>

<connection name="Ubuntu Server (Finnish Keyboard Layout)">
<protocol>rdp</protocol>
<param name="hostname">127.0.0.1</param>
<param name="port">3389</param>
<param name="server-layout">fi-fi-qwerty</param>
<param name="username">{{ default_user }}</param>
<param name="password">{{ default_password }}</param>
</connection>

<connection name="Ubuntu Server (Japanese Keyboard Layout)">
<protocol>rdp</protocol>
<param name="hostname">127.0.0.1</param>
<param name="port">3389</param>
<param name="server-layout">ja-jp-qwerty</param>
<param name="username">{{ default_user }}</param>
<param name="password">{{ default_password }}</param>
</connection>

<connection name="Ubuntu Server (Korean Keyboard Layout)">
<protocol>rdp</protocol>
<param name="hostname">127.0.0.1</param>
<param name="port">3389</param>
<param name="server-layout">ko-kr-qwerty</param>
<param name="username">{{ default_user }}</param>
<param name="password">{{ default_password }}</param>
</connection>

<connection name="Ubuntu Server (Chinese (Simplified) Keyboard Layout)">
<protocol>rdp</protocol>
<param name="hostname">127.0.0.1</param>
<param name="port">3389</param>
<param name="server-layout">zh-cn-qwerty</param>
<param name="username">{{ default_user }}</param>
<param name="password">{{ default_password }}</param>
</connection>


<connection name="Ubuntu Server (Russian Keyboard Layout)">
<protocol>rdp</protocol>
<param name="hostname">127.0.0.1</param>
<param name="port">3389</param>
<param name="server-layout">ru-ru-qwerty</param>
<param name="username">{{ default_user }}</param>
<param name="password">{{ default_password }}</param>
</connection>
</authorize>

<protocol>rdp</protocol>
<param name="hostname">127.0.0.1</param>
<param name="port">3389</param>
<param name="server-layout">it-it-qwerty</param>
<param name="username">ubuntu</param>
<param name="password">denbi</param>
</connection>

<connection name="Ubuntu Server (Portuguese Keyboard Layout)">
<protocol>rdp</protocol>
<param name="hostname">127.0.0.1</param>
<param name="port">3389</param>
<param name="server-layout">pt-pt-qwerty</param>
<param name="username">ubuntu</param>
<param name="password">denbi</param>
</connection>

<connection name="Ubuntu Server (Portuguese - Brazil Keyboard Layout)">
<protocol>rdp</protocol>
<param name="hostname">127.0.0.1</param>
<param name="port">3389</param>
<param name="server-layout">pt-br-qwerty</param>
<param name="username">ubuntu</param>
<param name="password">denbi</param>
</connection>

<connection name="Ubuntu Server (Dutch Keyboard Layout)">
<protocol>rdp</protocol>
<param name="hostname">127.0.0.1</param>
<param name="port">3389</param>
<param name="server-layout">nl-nl-qwerty</param>
<param name="username">ubuntu</param>
<param name="password">denbi</param>
</connection>

<connection name="Ubuntu Server (Danish Keyboard Layout)">
<protocol>rdp</protocol>
<param name="hostname">127.0.0.1</param>
<param name="port">3389</param>
<param name="server-layout">da-dk-qwerty</param>
<param name="username">ubuntu</param>
<param name="password">denbi</param>
</connection>

<connection name="Ubuntu Server (Norwegian Keyboard Layout)">
<protocol>rdp</protocol>
<param name="hostname">127.0.0.1</param>
<param name="port">3389</param>
<param name="server-layout">no-no-qwerty</param>
<param name="username">ubuntu</param>
<param name="password">denbi</param>
</connection>

<connection name="Ubuntu Server (Swedish Keyboard Layout)">
<protocol>rdp</protocol>
<param name="hostname">127.0.0.1</param>
<param name="port">3389</param>
<param name="server-layout">sv-se-qwerty</param>
<param name="username">ubuntu</param>
<param name="password">denbi</param>
</connection>

<connection name="Ubuntu Server (Finnish Keyboard Layout)">
<protocol>rdp</protocol>
<param name="hostname">127.0.0.1</param>
<param name="port">3389</param>
<param name="server-layout">fi-fi-qwerty</param>
<param name="username">ubuntu</param>
<param name="password">denbi</param>
</connection>

<connection name="Ubuntu Server (Japanese Keyboard Layout)">
<protocol>rdp</protocol>
<param name="hostname">127.0.0.1</param>
<param name="port">3389</param>
<param name="server-layout">ja-jp-qwerty</param>
<param name="username">ubuntu</param>
<param name="password">denbi</param>
</connection>

<connection name="Ubuntu Server (Korean Keyboard Layout)">
<protocol>rdp</protocol>
<param name="hostname">127.0.0.1</param>
<param name="port">3389</param>
<param name="server-layout">ko-kr-qwerty</param>
<param name="username">ubuntu</param>
<param name="password">denbi</param>
</connection>

<connection name="Ubuntu Server (Chinese (Simplified) Keyboard Layout)">
<protocol>rdp</protocol>
<param name="hostname">127.0.0.1</param>
<param name="port">3389</param>
<param name="server-layout">zh-cn-qwerty</param>
<param name="username">ubuntu</param>
<param name="password">denbi</param>
</connection>

<connection name="Ubuntu Server (Russian Keyboard Layout)">
<protocol>rdp</protocol>
<param name="hostname">127.0.0.1</param>
<param name="port">3389</param>
<param name="server-layout">ru-ru-qwerty</param>
<param name="username">ubuntu</param>
<param name="password">denbi</param>
</connection>

</authorize>

</user-mapping>
6 changes: 3 additions & 3 deletions packer/requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -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
2 changes: 2 additions & 0 deletions packer/requirements.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ roles:
src: https://github.com/deNBI/autoscaling-ansible
version: 1.8.7

- name: andrewrothstein.conda-env

- name: geerlingguy.swap

collections:
Expand Down
22 changes: 21 additions & 1 deletion rstudio/rstudio.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,29 @@
include_role:
name: oefenweb.rstudio_server
vars:
rstudio_install: [r-base]
rstudio_install: [ r-base ]

Check failure on line 20 in rstudio/rstudio.yml

View workflow job for this annotation

GitHub Actions / build

yaml[brackets] 

Too many spaces inside brackets

Check failure on line 20 in rstudio/rstudio.yml

View workflow job for this annotation

GitHub Actions / build

yaml[brackets] 

Too many spaces inside brackets
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

Check failure on line 42 in rstudio/rstudio.yml

View workflow job for this annotation

GitHub Actions / build

yaml[truthy] 

Truthy value should be one of \[false, true]

Check failure on line 42 in rstudio/rstudio.yml

View workflow job for this annotation

GitHub Actions / build

yaml[truthy] 

Truthy value should be one of \[false, true]

- name: Copy session file if also installing rstudio
ansible.builtin.copy:
Expand Down
Loading

0 comments on commit 6591fad

Please sign in to comment.