From b711c5ba871ce5cbd38022bdaba4867e9a36b86f Mon Sep 17 00:00:00 2001 From: forest Date: Tue, 6 Feb 2024 17:06:25 -0600 Subject: [PATCH 01/13] try to fix grafana prometheus reverse proxy issue https://community.grafana.com/t/after-update-to-8-3-5-origin-not-allowed-behind-proxy/60598/6 --- .../mothership.cyberia.club/nginx/grafana.cyberia.club.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/ansible/files/mothership.cyberia.club/nginx/grafana.cyberia.club.conf b/ansible/files/mothership.cyberia.club/nginx/grafana.cyberia.club.conf index 0b2200d..c9e5707 100644 --- a/ansible/files/mothership.cyberia.club/nginx/grafana.cyberia.club.conf +++ b/ansible/files/mothership.cyberia.club/nginx/grafana.cyberia.club.conf @@ -18,6 +18,7 @@ server { location / { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $host; proxy_pass http://localhost:3000; } } -- 2.45.2 From a8eef0ca3ba559b16cd63ad03fd15ed4baf5e0d8 Mon Sep 17 00:00:00 2001 From: forest Date: Tue, 6 Feb 2024 17:13:11 -0600 Subject: [PATCH 02/13] The 'file' lookup had an issue accessing the file 'files/keys/zico.pub'. file not found --- ansible/group_vars/all | 1 - 1 file changed, 1 deletion(-) diff --git a/ansible/group_vars/all b/ansible/group_vars/all index b2f487d..edfbf50 100644 --- a/ansible/group_vars/all +++ b/ansible/group_vars/all @@ -4,7 +4,6 @@ operators: - j3s - forest - vvesley - - zico - queerposting - reese - nibz -- 2.45.2 From fb80e7cb9110f2f22713eb8dc81ae096bbece7c7 Mon Sep 17 00:00:00 2001 From: forest Date: Tue, 6 Feb 2024 17:16:53 -0600 Subject: [PATCH 03/13] try adding nginx to monitoringservers playbook .. ? --- ansible/site.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ansible/site.yml b/ansible/site.yml index 17822e6..b33b91b 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -58,6 +58,14 @@ - prometheus - grafana - blackbox_exporter + - role: nginx + tags: nginx + - role: uacme + tags: nginx + - role: nginx-custom-configs + tags: + - nginx-custom-configs + - nginx - name: setup CI (Continuous Integration) Servers hosts: ciservers -- 2.45.2 From a50a443d8aed0cded634b628c78d271abfa20dff Mon Sep 17 00:00:00 2001 From: forest Date: Sat, 27 Jul 2024 22:40:57 +0000 Subject: [PATCH 04/13] mara.pub --- ansible/files/keys/mara.pub | 1 + 1 file changed, 1 insertion(+) create mode 100644 ansible/files/keys/mara.pub diff --git a/ansible/files/keys/mara.pub b/ansible/files/keys/mara.pub new file mode 100644 index 0000000..50a0da4 --- /dev/null +++ b/ansible/files/keys/mara.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINVKUtUo/03o/oE71hf6hg2I1o8tvX59EU90jU4EzE7c mara@mara \ No newline at end of file -- 2.45.2 From 8c5b36d46c4b9f982668152878abbcc475772cc1 Mon Sep 17 00:00:00 2001 From: forest Date: Sat, 27 Jul 2024 22:42:35 +0000 Subject: [PATCH 05/13] make mara operator --- ansible/group_vars/all | 1 + 1 file changed, 1 insertion(+) diff --git a/ansible/group_vars/all b/ansible/group_vars/all index edfbf50..16b6215 100644 --- a/ansible/group_vars/all +++ b/ansible/group_vars/all @@ -8,6 +8,7 @@ operators: - reese - nibz - symys + - mara alpine_common_utilities: - ip6tables -- 2.45.2 From 5c98b9e6be42cf820e86a085f32791ae77407def Mon Sep 17 00:00:00 2001 From: forest Date: Sat, 3 Aug 2024 20:16:54 +0000 Subject: [PATCH 06/13] add Alena to ssh keys --- ansible/files/keys/alena.pub | 1 + 1 file changed, 1 insertion(+) create mode 100644 ansible/files/keys/alena.pub diff --git a/ansible/files/keys/alena.pub b/ansible/files/keys/alena.pub new file mode 100644 index 0000000..cd8b3f5 --- /dev/null +++ b/ansible/files/keys/alena.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDzQTzBpjSfiwrjqjtFE803fxNbK/PUUudd+meafUv4+3PYXBd8Xfr5xTF3zZuocvXzPr56/QY078Ti3hLKYfE/EsRACesowIF2rzDpkZBLZM9bZc/taIH3uMsTxSY0VxHLSdfAJfAo0/gyUcWV3qzHcAhpVTsDzwkLo6DCv37N1XbiPmPPbM/5apSI+CvkQIIPMnonw/Lw1u0+nTHnN4HtPkEo6DT3SuSC741/P8zbi2ilUZNcgPPDe3eu6iuVhxJkqKxj5JyYwJxT2LjasPVBxLKaayKZqaD+iwgCli4DHZIJMtcUdtXkYAHewLEXWa38nFmBkG3DVy+2sgW99mQ0nx9mj21chIRJ0HKW2OKL2W1iSo7P1310Z8reUfwc7b14LLSzsqGhTEppcVs/qD0QJ4V3wQMtF9EaoKJeOPsxyAOLcua1B0PwVtmeXK/xG++WuTY8ORmYbQMfUhJsAl6EsBFEQwyrox+bZvW20wwjD/9FrTrEDQ0wqYiXH9BWxjc= alena@alena \ No newline at end of file -- 2.45.2 From 9d15237c512af144943b58953dadf9ad24fa2c26 Mon Sep 17 00:00:00 2001 From: alena Date: Sat, 3 Aug 2024 20:27:45 +0000 Subject: [PATCH 07/13] add alena as operator --- ansible/group_vars/all | 1 + 1 file changed, 1 insertion(+) diff --git a/ansible/group_vars/all b/ansible/group_vars/all index 16b6215..23f7c0c 100644 --- a/ansible/group_vars/all +++ b/ansible/group_vars/all @@ -9,6 +9,7 @@ operators: - nibz - symys - mara + - alena alpine_common_utilities: - ip6tables -- 2.45.2 From b0fc32dbfd118224f882ff49d6f9d257078789de Mon Sep 17 00:00:00 2001 From: forest Date: Thu, 7 Nov 2024 10:46:34 -0600 Subject: [PATCH 08/13] add skh to headscale --- ansible/files/keys/skh.pub | 2 +- ansible/group_vars/headscaleservers | 4 ++++ ansible/hosts | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 ansible/group_vars/headscaleservers diff --git a/ansible/files/keys/skh.pub b/ansible/files/keys/skh.pub index 2eeaf09..8800fa7 100644 --- a/ansible/files/keys/skh.pub +++ b/ansible/files/keys/skh.pub @@ -1 +1 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH8vPQlmKbxHpQ6ndA6JqBdKpVhRCuPM31e3i6fhrxnp thelemur@thelemur +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBuXd//koNURteWh2ATHkpfZMo5m4mifYBL18oC+NdnV thelemur@thelemur diff --git a/ansible/group_vars/headscaleservers b/ansible/group_vars/headscaleservers new file mode 100644 index 0000000..6dd6820 --- /dev/null +++ b/ansible/group_vars/headscaleservers @@ -0,0 +1,4 @@ +--- + +service_operators: + - skh diff --git a/ansible/hosts b/ansible/hosts index f1e1aa6..7b78806 100644 --- a/ansible/hosts +++ b/ansible/hosts @@ -13,6 +13,9 @@ legion.cyberia.club [goatcounterservers] elliot.cyberia.club +[headscaleservers] +elliot.cyberia.club + [gancioservers] calendar.layerze.ro -- 2.45.2 From 3c29f221c19e8a9009297b9121a810a79572ae4e Mon Sep 17 00:00:00 2001 From: forest Date: Sat, 30 Nov 2024 07:00:46 +0000 Subject: [PATCH 09/13] old key --- ansible/files/keys/forest-old.pub | 1 + 1 file changed, 1 insertion(+) create mode 100644 ansible/files/keys/forest-old.pub diff --git a/ansible/files/keys/forest-old.pub b/ansible/files/keys/forest-old.pub new file mode 100644 index 0000000..5b64e52 --- /dev/null +++ b/ansible/files/keys/forest-old.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKD3XzZTbTteIgnaFY+fiiOl9EnNN+twyNchnWjCkYqv forest@tower \ No newline at end of file -- 2.45.2 From dac8cb6dc8fd1a2b04bc2cf6623aea1fc6db2c90 Mon Sep 17 00:00:00 2001 From: forest Date: Sat, 30 Nov 2024 07:01:13 +0000 Subject: [PATCH 10/13] new key --- ansible/files/keys/forest.pub | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/files/keys/forest.pub b/ansible/files/keys/forest.pub index 1711341..a6263de 100644 --- a/ansible/files/keys/forest.pub +++ b/ansible/files/keys/forest.pub @@ -1 +1 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKD3XzZTbTteIgnaFY+fiiOl9EnNN+twyNchnWjCkYqv forest@tower +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICj6+7Svou02AGcaP8BBmVW28dfJcqAadE6N6GWE9NBX forest@stinkpad -- 2.45.2 From 876ebbb568de7b7fc39b40040caf31695f1220bc Mon Sep 17 00:00:00 2001 From: forest Date: Sat, 30 Nov 2024 07:01:41 +0000 Subject: [PATCH 11/13] add old forest key user --- ansible/group_vars/all | 1 + 1 file changed, 1 insertion(+) diff --git a/ansible/group_vars/all b/ansible/group_vars/all index 23f7c0c..ae1e3aa 100644 --- a/ansible/group_vars/all +++ b/ansible/group_vars/all @@ -2,6 +2,7 @@ operators: - j3s + - forest-old - forest - vvesley - queerposting -- 2.45.2 From b4f3ffd8f44e0af5669cb517d4125a84fa09d65f Mon Sep 17 00:00:00 2001 From: forest Date: Wed, 4 Dec 2024 05:30:45 +0000 Subject: [PATCH 12/13] Update ansible/files/keys/forest.pub --- ansible/files/keys/forest.pub | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/files/keys/forest.pub b/ansible/files/keys/forest.pub index a6263de..f6acda3 100644 --- a/ansible/files/keys/forest.pub +++ b/ansible/files/keys/forest.pub @@ -1 +1 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICj6+7Svou02AGcaP8BBmVW28dfJcqAadE6N6GWE9NBX forest@stinkpad +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA/5WJOwVibff/fG/2pz2NoDCCuxDtUh0jgydyVWWd/Q forest@debian -- 2.45.2 From ef8970a76c5e99815112846026fee93fd4343f29 Mon Sep 17 00:00:00 2001 From: forest Date: Fri, 6 Dec 2024 01:27:43 -0600 Subject: [PATCH 13/13] add custom config for nullhex web server to support deliverability manager app --- .../nginx/nullhex.com.conf | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 ansible/files/domechild.cyberia.club/nginx/nullhex.com.conf diff --git a/ansible/files/domechild.cyberia.club/nginx/nullhex.com.conf b/ansible/files/domechild.cyberia.club/nginx/nullhex.com.conf new file mode 100644 index 0000000..13421ee --- /dev/null +++ b/ansible/files/domechild.cyberia.club/nginx/nullhex.com.conf @@ -0,0 +1,35 @@ +server { + listen 80; + server_name nullhex.com; + include /etc/nginx/snippets/letsencrypt.conf; + + location / { + return 302 https://$server_name$request_uri; + } +} + +server { + listen 443 ssl http2; + listen [::]:443 ssl http2; + server_name nullhex.com; + include /etc/nginx/snippets/ssl.conf; + + ssl_certificate /etc/ssl/uacme/nullhex.com/cert.pem; + ssl_certificate_key /etc/ssl/uacme/private/nullhex.com/key.pem; + + client_max_body_size 10M; + + gzip on; + gzip_types text/css; + + location / { + root /var/www/nullhex.com; + } + location /send { + proxy_pass http://localhost:9184/send; + } +} + + + + -- 2.45.2