Fix paths

ooni · Dec 20, 2024 · 3cc34fd · 3cc34fd
1 parent 29bd0a7
commit 3cc34fd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/ansible/roles/oonidata_airflow/tasks/main.yml b/ansible/roles/oonidata_airflow/tasks/main.yml
@@ -33,7 +33,7 @@
     airflow_dags_folder: /opt/airflow/oonidata/dags/
     airflow_webserver_host: "127.0.0.1"
     airflow_webserver_port: 8080
-    airflow_webserver_base_url: "https://{{ airflow_public_fqdn }}/airflow"
+    airflow_webserver_base_url: "https://{{ airflow_public_fqdn }}"
     airflow_environment_extra_vars:
       - name: AIRFLOW_VAR_DATA_DIR
         value: "{{ airflow_app_home }}/data_dir"

diff --git a/ansible/roles/oonidata_airflow/templates/nginx-airflow.j2 b/ansible/roles/oonidata_airflow/templates/nginx-airflow.j2
@@ -10,18 +10,18 @@ server {
 
     include /etc/nginx/ssl_intermediate.conf;
 
-    ssl_certificate {{ tls_cert_dir }}/{{ airflow_public_fqdn }}/fullchain.pem;
-    ssl_certificate_key {{ tls_cert_dir }}/{{ airflow_public_fqdn }}/privkey.pem;
-    ssl_trusted_certificate {{ tls_cert_dir }}/{{ airflow_public_fqdn }}/chain.pem;
+    ssl_certificate {{ tls_cert_dir }}/{{ inventory_hostname }}/fullchain.pem;
+    ssl_certificate_key {{ tls_cert_dir }}/{{ inventory_hostname }}/privkey.pem;
+    ssl_trusted_certificate {{ tls_cert_dir }}/{{ inventory_hostname }}/chain.pem;
 
-    server_name _;
+    server_name {{ airflow_public_fqdn }};
     access_log  /var/log/nginx/{{ airflow_public_fqdn }}.access.log;
     error_log   /var/log/nginx/{{ airflow_public_fqdn }}.log warn;
 
     add_header Access-Control-Allow-Origin *;
 
     ## Airflow reverse proxy
-    location /airflow {
+    location / {
         proxy_pass http://127.0.0.1:8080;
 
         proxy_set_header X-Real-IP $remote_addr;