vex2: get ready to acme real certs

diff --git a/ansible/host_vars/vex2/dokuwiki.yml b/ansible/host_vars/vex2/dokuwiki.yml
index e29149c..5bbe0ae 100644 (file)
--- a/ansible/host_vars/vex2/dokuwiki.yml
+++ b/ansible/host_vars/vex2/dokuwiki.yml
@@ -1,9 +1,7 @@
 ---
 dokuwiki_urls:
-  - wiki2.realraum.at
   - doku.realraum.at
-#  - wiki.realraum.at
-#  - w.r3.at
+  - wiki2.realraum.at
 
 dokuwiki_plugins:
   diagram:

diff --git a/ansible/host_vars/vex2/main.yml b/ansible/host_vars/vex2/main.yml
index a483e37..01ce17d 100644 (file)
--- a/ansible/host_vars/vex2/main.yml
+++ b/ansible/host_vars/vex2/main.yml
@@ -2,8 +2,14 @@
 sshd_allowusers_host:
   - spaceapi
 
+r3status_spaceapi_path: /dev/shm/spaceapi
+r3status_ics_path: /dev/shm/ics
 r3status_spaceapi_update_user_ssh_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDcwqg/oohCV3sTFHODBPUViOaGsoKL2Vp5suNAdLFJz4pdhfH7n4eXzI/3Ork6mDrDZ8XNmDq9g6jERweWQmS37THL33N2RmyDFfpwyQog/pzvEB6U0BGE6VN2zmgmrmvVZNdhKh/E74dM/22abAt32I6xSJi8C2CfVshHaFzNAV8N4lmGMGi0QXNMkAZDaYG0iptRuZOoZarCkfRybyh8pFkHt4Hl/tWocMOihI1KsWtbIgRUdTTpGMXmxMd0k2t9am+NxiUlBIRE8aEc4nTqcZTqullddEAGoksuUCLc0yYbFCzpTkZ1lrU5+oQhZyPWgnJ7s2yK7M2luBSAle8T realraum@smsgw.realraum.at
 
 r3status_www_content:
   url: 'https://github.com/realraum/infokiosk/archive/b7df371f1854b506a63fd6fcd8fa75e8ddac4b6f.tar.gz'
   sha256: '5b097f5d5bcd7741b5d40b9184eb068a4a6be5364f6c54ef9b07b207f06c162f'
+
+
+acmetool_directory_server: "{{ acmetool_directory_server_le_live }}"
+

diff --git a/ansible/host_vars/vex2/realraumat.yaml b/ansible/host_vars/vex2/realraumat.yaml
index cfc1835..240de87 100644 (file)
--- a/ansible/host_vars/vex2/realraumat.yaml
+++ b/ansible/host_vars/vex2/realraumat.yaml
@@ -1,9 +1,21 @@
 ---
-r3at_urls:
-  - r3.at
-
-  
-wwwrealraum_urls:
-  - www.realraum.at
-  - realraum.at
+r3redirect_servers:
+  - name: r3.at
+    rootdir: /srv/r3.at/www/
+    urls:
+      - r3.at
+  - name: w.r3.at
+    rootdir: /srv/wiki.realraum.at/www/
+    urls:
+      - wiki.realraum.at
+      - w.r3.at
+  - name: sensors.realraum.at
+    rootdir: /srv/sensors.realraum.at/www/
+    urls:
+      - sensors.realraum.at
+  - name: www.realraum.at
+    rootdir: /srv/www.realraum.at/www/
+    urls:
+      - www.realraum.at
+      - realraum.at
 

diff --git a/ansible/roles/web/r3status/tasks/nginx.yml b/ansible/roles/web/r3status/tasks/nginx.yml
index f2302c7..1c0f7d8 100644 (file)
--- a/ansible/roles/web/r3status/tasks/nginx.yml
+++ b/ansible/roles/web/r3status/tasks/nginx.yml
@@ -39,8 +39,8 @@
 - name: make sure nginx config has been loaded
   meta: flush_handlers
 
-# - name: get certificate using acmetool
-#   import_role:
-#     name: acmetool/cert
-#   vars:
-#     acmetool_cert_name: status.realraum.at
+- name: get certificate using acmetool
+  import_role:
+    name: acmetool/cert
+  vars:
+    acmetool_cert_name: status.realraum.at