From fbbfaf0655564ab36a7f38d6f85a10fd75712a4a Mon Sep 17 00:00:00 2001 From: Jakob Meier Date: Thu, 2 Nov 2023 14:39:15 +0100 Subject: [PATCH] Added internal ipnet variable, to allow case-by-case adjustment fixes bug where other services were unable to connect to the meta system --- group_vars/all/default.yml | 2 +- roles/git.sr.ht/tasks/config.yml | 2 +- roles/meta.sr.ht/tasks/config.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/group_vars/all/default.yml b/group_vars/all/default.yml index 259be6a..b7a7ccd 100644 --- a/group_vars/all/default.yml +++ b/group_vars/all/default.yml @@ -20,7 +20,7 @@ srht_smtp_password: "" srht_smtp_error_to: "" srht_smtp_error_from: "" srht_enable_registration: "yes" - +srht_ipnet: "127.0.0.0/8,::1/128,192.168.0.0/16,10.0.0.0/8,10.0.3.0/8" # before running, you have to copy the pgp private and public key # put the key id here diff --git a/roles/git.sr.ht/tasks/config.yml b/roles/git.sr.ht/tasks/config.yml index 95d6011..6342dde 100644 --- a/roles/git.sr.ht/tasks/config.yml +++ b/roles/git.sr.ht/tasks/config.yml @@ -69,7 +69,7 @@ # *.sr.ht services are running. # # Comma-separated, CIDR notation. - internal-ipnet=127.0.0.0/8,::1/128,192.168.0.0/16,10.0.0.0/8 + internal-ipnet={{ srht_ipnet }} [git.sr.ht::dispatch] # # The authorized keys hook uses this to dispatch to various handlers diff --git a/roles/meta.sr.ht/tasks/config.yml b/roles/meta.sr.ht/tasks/config.yml index eff85d2..4f79013 100644 --- a/roles/meta.sr.ht/tasks/config.yml +++ b/roles/meta.sr.ht/tasks/config.yml @@ -30,7 +30,7 @@ # # Origin URL for the API # By default, the API port is 100 more than the web port - #api-origin=http://127.0.0.1:5100 + api-origin=http://127.0.0.1:5100 [meta.sr.ht::api] # @@ -52,7 +52,7 @@ # *.sr.ht services are running. # # Comma-separated, CIDR notation. - internal-ipnet=127.0.0.0/8,::1/128,192.168.0.0/16,10.0.0.0/8 + internal-ipnet={{ srht_ipnet }} [meta.sr.ht::settings] # -- 2.38.5