From 54cef3ec8dddabac674844a037fba873666f7f5a Mon Sep 17 00:00:00 2001 From: Bernhard Tittelbach Date: Tue, 15 Sep 2026 18:31:40 +0200 Subject: [PATCH] newest htdocs, and bugfix --- ansible/host_vars/vex2/main.yml | 4 ++-- ansible/roles/web/r3redirects/templates/r3.at.j2 | 4 ++++ .../web/r3status/templates/cache_realraum_imported_calendar.sh.j2 | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ansible/host_vars/vex2/main.yml b/ansible/host_vars/vex2/main.yml index cab1259..b41c44d 100644 --- a/ansible/host_vars/vex2/main.yml +++ b/ansible/host_vars/vex2/main.yml @@ -7,8 +7,8 @@ r3status_ics_path: /dev/shm/ics r3status_spaceapi_update_user_ssh_key: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJG4w4B95bogd2HOCZNY+OMx+fdo6iPI2tLUPu3RJOUp realraum@iotscripts.mgmt.realraum.at r3status_www_content: - url: 'https://github.com/realraum/infokiosk/archive/c2571da52f5c68d11d8d2e2d00a4580aea7b83e7.tar.gz' - sha256: '406844afd3ebc483ddbfc06a398182566579b9be0b935f83bcacfd2479cc54f5' + url: 'https://github.com/realraum/infokiosk/archive/94e29c6a342a455bdef5a4088aa51dcd38e4e101.tar.gz' + sha256: 'f8b97765fa331aad0b26e0357644af83fb0c1794702fecfdae6918e3c05cee5c' acmetool_directory_server: "{{ acmetool_directory_server_le_live }}" diff --git a/ansible/roles/web/r3redirects/templates/r3.at.j2 b/ansible/roles/web/r3redirects/templates/r3.at.j2 index af4c7ff..2ff7364 100644 --- a/ansible/roles/web/r3redirects/templates/r3.at.j2 +++ b/ansible/roles/web/r3redirects/templates/r3.at.j2 @@ -53,6 +53,10 @@ server { return 302 "https://git.realraum.at/?p=documents.git;a=blob;f=vereinsordnung/vereinsordnung.pdf"; } + location = /cal { + return 302 "https://laut.realraum.at"; + } + location = / { return 302 https://realraum.at/; } diff --git a/ansible/roles/web/r3status/templates/cache_realraum_imported_calendar.sh.j2 b/ansible/roles/web/r3status/templates/cache_realraum_imported_calendar.sh.j2 index c722c53..5255559 100755 --- a/ansible/roles/web/r3status/templates/cache_realraum_imported_calendar.sh.j2 +++ b/ansible/roles/web/r3status/templates/cache_realraum_imported_calendar.sh.j2 @@ -60,7 +60,7 @@ for t in "${publish[@]}"; do local src_varname="${t}_ICAL_SRC" local altnames_varname="${t}_ALTERNATE_FILE_NAMES" local d="${(P)dst_varname}" - local -a altnames=${(P)altnames_varname} + local -a altnames=( ${(P)altnames_varname} ) get_merge_ics "${DL_PATH}/${d}" ${(P)src_varname} \ && sed -i '/^GEO:/d;/^METHOD:PUBLISH/d;s/^\(DTSTAMP:[0-9A-Z]\+\)/\1Z/' "${DL_PATH}/${d}" \ -- 1.7.10.4