From 3d2f89b3bdda212c57975cc261ea8c9040aee159 Mon Sep 17 00:00:00 2001 From: binary Date: Mon, 18 Jan 2021 08:51:43 +0100 Subject: Refactor srht role with vars --- roles/srht/templates/config.ini.j2 | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'roles/srht/templates/config.ini.j2') diff --git a/roles/srht/templates/config.ini.j2 b/roles/srht/templates/config.ini.j2 index e3bca6a..26e167a 100644 --- a/roles/srht/templates/config.ini.j2 +++ b/roles/srht/templates/config.ini.j2 @@ -43,7 +43,7 @@ network-key={{ srht_key_network.stdout_lines[0] }} # be shared between nodes (e.g. git1.sr.ht and git2.sr.ht), but need not be # shared between services. It may be shared between services, however, with no # ill effect, if this better suits your infrastructure. -redis-host=redis://localhost +redis-host= [objects] # @@ -91,7 +91,8 @@ private-key={{ srht_key_webhook.stdout_lines[0] }} [meta.sr.ht] # # URL meta.sr.ht is being served at (protocol://domain) -origin=http://meta.git.{{ global.domain_name }} +#origin=http://meta.git.{{ global.domain_name }} +origin=http://192.168.5.61:81 # # Address and port to bind the debug server to debug-host=0.0.0.0 @@ -104,7 +105,7 @@ connection-string=postgresql://postgres@localhost/meta.sr.ht?sslmode=disable migrate-on-upgrade=yes # # The redis connection used for the webhooks worker -webhooks=redis://localhost:6379/1?sslmode=disable +webhooks=redis://localhost:6379/1 # # If "yes", the user will be sent the stock sourcehut welcome emails after # signup (requires cron to be configured properly). These are specific to the @@ -166,7 +167,7 @@ stripe-secret-key= # What authentication method to use. # builtin: use sr.ht builtin authentication # unix-pam: use Unix PAM authentication -#auth-method=builtin +auth-method=builtin [meta.sr.ht::auth::unix-pam] # @@ -195,12 +196,14 @@ user-group= # sourcehut even if they are not in the group specified in user-group. # If unset, administrator status can be manually assigned from the web # interface. -admin-group={{ group_root }} +#admin-group={{ group_root }} +admin-group= [git.sr.ht] # # URL git.sr.ht is being served at (protocol://domain) -origin=http://git.{{ global.domain_name }} +#origin=http://git.{{ global.domain_name }} +origin=http://192.168.5.61:82 # # Address and port to bind the debug server to debug-host=0.0.0.0 @@ -213,7 +216,7 @@ connection-string=postgresql://postgres@localhost/git.sr.ht?sslmode=disable migrate-on-upgrade=yes # # The redis connection used for the webhooks worker -webhooks=redis://localhost:6379/1?sslmode=disable +webhooks=redis://localhost:6379/1 # # A post-update script which is installed in every git repo. post-update-script=/usr/bin/gitsrht-update-hook @@ -269,7 +272,8 @@ internal-ipnet=127.0.0.0/8,::1/128,192.168.0.0/16,10.0.0.0/8 #/usr/bin/buildsrht-keys=builds:builds [hub.sr.ht] -origin=http://git.{{ global.domain_name }} +#origin=http://git.{{ global.domain_name }} +origin=http://192.168.5.61:80 oauth-client-id=CHANGEME oauth-client-secret=CHANGEME connection-string=postgresql://postgres@localhost/hub.sr.ht?sslmode=disable -- cgit v1.2.3