vex2: fixes

diff --git a/ansible/roles/web/r3redirects/defaults/main.yml b/ansible/roles/web/r3redirects/defaults/main.yml
index 677b963..4e34d4b 100644 (file)
--- a/ansible/roles/web/r3redirects/defaults/main.yml
+++ b/ansible/roles/web/r3redirects/defaults/main.yml
@@ -2,7 +2,7 @@
 r3at_urls:
   - r3.at
 
-wikirealraum.at_urls:
+wikirealraumat_urls:
   - wiki.realraum.at
   - w.r3.at
 

diff --git a/ansible/roles/web/r3redirects/templates/w.r3.at.j2 b/ansible/roles/web/r3redirects/templates/w.r3.at.j2
index 9eb2696..dcace8c 100644 (file)
--- a/ansible/roles/web/r3redirects/templates/w.r3.at.j2
+++ b/ansible/roles/web/r3redirects/templates/w.r3.at.j2
@@ -2,12 +2,12 @@ server {
     listen [::]:443 ssl;
     listen 443 ssl;
 
-    server_name {{ wikirealraum | join(' ') }};
+    server_name {{ wikirealraumat_urls | join(' ') }};
 
     include snippets/acmetool.conf;
     include snippets/ssl.conf;
-    ssl_certificate /var/lib/acme/live/{{ wikirealraum[0] }}/fullchain;
-    ssl_certificate_key /var/lib/acme/live/{{ wikirealraum[0] }}/privkey;
+    ssl_certificate /var/lib/acme/live/{{ wikirealraumat_urls[0] }}/fullchain;
+    ssl_certificate_key /var/lib/acme/live/{{ wikirealraumat_urls[0] }}/privkey;
     include snippets/hsts.conf;
 
     include snippets/security-headers.conf;

diff --git a/ansible/roles/web/r3status/tasks/main.yml b/ansible/roles/web/r3status/tasks/main.yml
index b4a5a39..77837a2 100644 (file)
--- a/ansible/roles/web/r3status/tasks/main.yml
+++ b/ansible/roles/web/r3status/tasks/main.yml
@@ -27,10 +27,9 @@
     dest: /etc/systemd/system/{{ item }}
     mode: 0644
 
-- name: install copy grical caching services
+- name: start copy grical caching timer
   loop:
     - cache_realraum_imported_calendar.timer
-    - cache_realraum_imported_calendar.service
   ansible.builtin.systemd:
     name: "{{ item }}"
     state: started

diff --git a/ansible/roles/web/r3status/templates/cache_realraum_imported_calendar.service.j2 b/ansible/roles/web/r3status/templates/cache_realraum_imported_calendar.service.j2
index 9712e84..30d32ef 100644 (file)
--- a/ansible/roles/web/r3status/templates/cache_realraum_imported_calendar.service.j2
+++ b/ansible/roles/web/r3status/templates/cache_realraum_imported_calendar.service.j2
@@ -3,7 +3,6 @@ Description=grical ics caching service
 
 [Service]
 Type=oneshot
-WorkingDirectory={{ r3status_ics_path }}
 ExecStart=/usr/local/bin/cache_realraum_imported_calendar.sh
 User=spaceapi
 

diff --git a/ansible/roles/web/realraumat/templates/www.realraum.at.j2 b/ansible/roles/web/realraumat/templates/www.realraum.at.j2
index fdbf2cf..0c18db3 100644 (file)
--- a/ansible/roles/web/realraumat/templates/www.realraum.at.j2
+++ b/ansible/roles/web/realraumat/templates/www.realraum.at.j2
@@ -99,18 +99,6 @@ server {
         return 302 https://status.realraum.at/vis.js; # planned: 301
     }
 
-    location = /logo-re_open_100x100.png {
-        return 302 https://status.realraum.at/logo-re_open_100x100.png; # planned: 301
-    }
-
-    location = /logo-re_empty_100x100.png {
-        return 302 https://status.realraum.at/logo-re_empty_100x100.png; # planned: 301
-    }
-
-    location = /logo-red_250x250.png {
-        return 302 https://status.realraum.at/logo-red_250x250.png; # planned: 301
-    }
-
     error_page 404 /404.html;
 
 }