Fix dehydrated setup of notebook server

ansible/deploy-notebook.yml

@@ -1,13 +1,13 @@
 ---
 - name: Deploy notebook host
-  hosts: notebook.ooni.org
+  hosts: notebook1.htz-fsn.prod.ooni.nu
   become: true
   tags:
     - notebook
   vars:
     notebook_domain: "notebook.ooni.org"
     ssl_domains:
-      - "{{ inventory_hostname }}"
+      - notebook1.htz-fsn.prod.ooni.nu notebook.ooni.org
   roles:
     - nginx
     - dehydrated

ansible/host_vars/notebook.ooni.org → ansible/host_vars/notebook1.htz-fsn.prod.ooni.nu

@@ -162,8 +162,3 @@ clickhouse_default_users:
       - "127.0.0.1"
     profile: write
     quota: default
-
-# configure extra domains for dehydrated
-ssl_domains:
-  - notebook1.htz-fns.prod.ooni.nu
-  - notebook.ooni.org

ansible/inventory

@@ -5,7 +5,7 @@ ghs_ams
 ## Role tags
 
 [clickhouse]
-notebook.ooni.org
+notebook1.htz-fsn.prod.ooni.nu
 data1.htz-fsn.prod.ooni.nu
 data2.htz-fsn.prod.ooni.nu
 data3.htz-fsn.prod.ooni.nu

ansible/roles/notebook/templates/nginx-jupyterhub.j2

@@ -9,7 +9,13 @@ map $http_upgrade $connection_upgrade {
 server {
     listen 80;
     server_name {{ notebook_domain }};
-    return 301 https://$server_name$request_uri;
+    # Serve ACME challenge from disk
+    location ^~ /.well-known/acme-challenge {
+        alias /var/lib/dehydrated/acme-challenges;
+    }
+    location / {
+        return 301 https://$server_name$request_uri;
+    }
 }
 
 server {