From 3b7deeb8f05014bfb7f0550736c55f3163ffe0cb Mon Sep 17 00:00:00 2001
From: decfox <mehul@openobservatory.org>
Date: Wed, 11 Dec 2024 17:27:18 -0500
Subject: [PATCH] fix: eof errors

---
 ansible/deploy-clickhouse-proxy.yml           | 20 +++++++++----------
 ansible/deploy-clickhouse.yml                 |  6 +++---
 ansible/deploy-ooni-th.yml                    | 12 -----------
 ansible/host_vars/data3.htz-fsn.prod.ooni.nu  |  3 ++-
 ansible/inventory                             |  6 +++---
 ansible/roles/clickhouse_proxy/tasks/main.yml |  2 +-
 .../clickhouse_proxy/templates/99-stream.conf |  2 +-
 7 files changed, 20 insertions(+), 31 deletions(-)
 delete mode 100644 ansible/deploy-ooni-th.yml

diff --git a/ansible/deploy-clickhouse-proxy.yml b/ansible/deploy-clickhouse-proxy.yml
index 6d73c82..803b1b1 100644
--- a/ansible/deploy-clickhouse-proxy.yml
+++ b/ansible/deploy-clickhouse-proxy.yml
@@ -1,11 +1,11 @@
 ---
-- name: Deploy clickhouse proxy
-  hosts:
-    - clickhouseproxy.dev.ooni.io
-  roles:
-    - role: bootstrap
-    - role: nginx
-      tags: nginx
-    - role: clickhouse_proxy
-      vars: 
-        clickhouse_url: "" # fetch from AWS secrets
\ No newline at end of file
+## - name: Deploy clickhouse proxy
+  ## hosts:
+    ## - clickhouseproxy.dev.ooni.io
+  ## roles:
+    ## - role: bootstrap
+    ## - role: nginx
+      ## tags: nginx
+    ## - role: clickhouse_proxy
+      ## vars: 
+        ## clickhouse_url: "" # fetch from AWS secrets
diff --git a/ansible/deploy-clickhouse.yml b/ansible/deploy-clickhouse.yml
index c2d34cc..f6781fb 100644
--- a/ansible/deploy-clickhouse.yml
+++ b/ansible/deploy-clickhouse.yml
@@ -1,13 +1,13 @@
 ---
 - name: Deploy oonidata clickhouse hosts
   hosts:
-    - notebook.ooni.org
-    - data1.htz-fsn.prod.ooni.nu
+    # - notebook.ooni.org
+    # - data1.htz-fsn.prod.ooni.nu
     #- data2.htz-fsn.prod.ooni.nu
     - data3.htz-fsn.prod.ooni.nu
   become: true
   tags:
     - clickhouse
   roles:
-    - prometheus_node_exporter
+    # - prometheus_node_exporter
     - oonidata_clickhouse
diff --git a/ansible/deploy-ooni-th.yml b/ansible/deploy-ooni-th.yml
deleted file mode 100644
index 633cfc4..0000000
--- a/ansible/deploy-ooni-th.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-- name: Deploy webconnectivity test helpers
-  hosts:
-    - 0.do.th.dev.ooni.io
-    - 0.do.th.prod.ooni.io 
-    - 1.do.th.prod.ooni.io 
-    - 2.do.th.prod.ooni.io 
-  roles:
-    - role: bootstrap
-    - role: nginx
-      tags: nginx
-    - role: 
\ No newline at end of file
diff --git a/ansible/host_vars/data3.htz-fsn.prod.ooni.nu b/ansible/host_vars/data3.htz-fsn.prod.ooni.nu
index 502a005..661157a 100644
--- a/ansible/host_vars/data3.htz-fsn.prod.ooni.nu
+++ b/ansible/host_vars/data3.htz-fsn.prod.ooni.nu
@@ -1,4 +1,5 @@
 non_admin_usernames: [ ]
 clickhouse_base_path: /data/clickhouse
 clickhouse_custom_databases:
-  - name: test
\ No newline at end of file
+  - name: test
+ 
\ No newline at end of file
diff --git a/ansible/inventory b/ansible/inventory
index a44f8d4..e0b76da 100644
--- a/ansible/inventory
+++ b/ansible/inventory
@@ -5,9 +5,9 @@ ghs-ams
 ## Role tags
 
 [clickhouse]
-notebook.ooni.org
-data1.htz-fsn.prod.ooni.nu
-data2.htz-fsn.prod.ooni.nu
+# notebook.ooni.org
+# data1.htz-fsn.prod.ooni.nu
+# data2.htz-fsn.prod.ooni.nu
 data3.htz-fsn.prod.ooni.nu
 
 ## Location tags
diff --git a/ansible/roles/clickhouse_proxy/tasks/main.yml b/ansible/roles/clickhouse_proxy/tasks/main.yml
index fb6ea49..1697d13 100644
--- a/ansible/roles/clickhouse_proxy/tasks/main.yml
+++ b/ansible/roles/clickhouse_proxy/tasks/main.yml
@@ -8,4 +8,4 @@
     owner: root
   notify:
     - reload nginx
-    - restart nginx
\ No newline at end of file
+    - restart nginx
diff --git a/ansible/roles/clickhouse_proxy/templates/99-stream.conf b/ansible/roles/clickhouse_proxy/templates/99-stream.conf
index 1a9000f..c5b8062 100644
--- a/ansible/roles/clickhouse_proxy/templates/99-stream.conf
+++ b/ansible/roles/clickhouse_proxy/templates/99-stream.conf
@@ -10,4 +10,4 @@ stream {
     }
 
     error_log /var/log/nginx/error.log;
-}
\ No newline at end of file
+}