nomad

commit 361b763cad0ee0c9486244bd887697b9d1ea775e
parent eb23920815cff415b11e06523a1c82743c4adb27
Author: Andreas Gruhler <agruhl@gmx.ch>
Date:   Fri, 21 Mar 2025 23:19:30 +0100

fix: global-domain and api port

Diffstat:
M
hcl/default/meta/templates/config.ini.tmpl
 | 
9
++++++---
M
hcl/default/todo/README.md
 | 
8
++++++++
M
hcl/default/todo/templates/config.ini.tmpl
 | 
2
+-
M
hcl/default/todo/todo.nomad
 | 
2
+-

4 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/hcl/default/meta/templates/config.ini.tmpl b/hcl/default/meta/templates/config.ini.tmpl
@@ -49,7 +49,7 @@ security-address=contact@p0c.ch
 # The global domain of the site. If unset, the global domain will be determined
 # from the service URL: each service is assumed to be a sub-domain of the global
 # domain, i.e. of the form `meta.globaldomain.com`.
-global-domain=
+global-domain=p0c.ch
 #
 # Path to static asses (default PREFIX from make installation)
 # https://git.sr.ht/~sircmpwn/core.sr.ht/tree/master/item/Makefile
@@ -135,7 +135,7 @@ webhooks=redis://{{ env "NOMAD_ADDR_redis" }}/1
 #
 # Origin URL for the API
 # By default, the API port is 100 more than the web port
-api-origin=http://{{ env "NOMAD_ADDR_api" }}
+#api-origin=http://{{ env "NOMAD_ADDR_api" }}
 
 [meta.sr.ht::api]
 #
@@ -171,7 +171,7 @@ internal-ipnet=127.0.0.0/8,::1/128,192.168.0.0/16,10.0.0.0/8
 registration=no
 #
 # Where to redirect new users upon registration
-onboarding-redirect=https://todo.p0c.ch
+onboarding-redirect=https://meta.p0c.ch
 #
 # 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
@@ -238,3 +238,6 @@ user-group=
 # If unset, administrator status can be manually assigned from the web
 # interface.
 admin-group=wheel
+
+[todo.sr.ht]
+origin=https://todo.p0c.ch
diff --git a/hcl/default/todo/README.md b/hcl/default/todo/README.md
@@ -12,6 +12,14 @@ Deployment for todo.sr.ht:
 
 Copy sections from services into meta config.ini.
 
+> Take the todo.sr.ht specific blocks from config.example.ini and append them
+> to config.ini.
+https://emersion.fr/blog/2021/setting-up-sr.ht-for-local-development/
+
+## Mail setup
+
+https://drewdevault.com/2018/08/05/Local-mail-server.html
+
 ## Database schema and super user
 
 ```
diff --git a/hcl/default/todo/templates/config.ini.tmpl b/hcl/default/todo/templates/config.ini.tmpl
@@ -114,7 +114,7 @@ webhooks=redis://{{ env "NOMAD_ADDR_redis" }}/1
 # Origin URL for the API
 # Only needed if not run behind a reverse proxy, e.g. for local development.
 # By default, the API port is 100 more than the web port
-api-origin=http://{{ env "NOMAD_ADDR_api" }}
+#api-origin=http://{{ env "NOMAD_ADDR_api" }}
 
 [todo.sr.ht::mail]
 #
diff --git a/hcl/default/todo/todo.nomad b/hcl/default/todo/todo.nomad
@@ -24,7 +24,7 @@ job "todo" {
       port "web" {}
       port "api" {
         # todo: api-origin config.ini not working?
-        #to = 5103
+        to = 5103
       }
       port "redis" {
         to = 6379