Configurable base URL

diff --git a/blog_experiment/blog/__main__.py b/blog_experiment/blog/__main__.py
index afe50c53924193a49b144a85542f020f159460ea..21033902856330ccb9b03aba7a77eef6899ee6ff 100644 (file)
--- a/blog_experiment/blog/__main__.py
+++ b/blog_experiment/blog/__main__.py
@@ -8,13 +8,19 @@ from bicephalus import ssl
 
 import blog
 
+from blog import meta
+
 
 def main():
     otel.configure_logging(logging.INFO)
 
     parser = argparse.ArgumentParser()
     parser.add_argument("--key-cert", nargs=2, metavar=("KEY", "CERT",), help="Path to a key and a file")
+    parser.add_argument("schema")
+    parser.add_argument("host")
     args = parser.parse_args()
+    meta.SCHEMA = args.schema
+    meta.HOST = args.host
 
     if args.key_cert:
         key, cert = args.key_cert

diff --git a/blog_experiment/blog/blog_pages.py b/blog_experiment/blog/blog_pages.py
index 132e56d268c170655308199ec75c819ad90322f7..788038549b7f491c6591f499b69bbd548741330a 100644 (file)
--- a/blog_experiment/blog/blog_pages.py
+++ b/blog_experiment/blog/blog_pages.py
@@ -64,7 +64,7 @@ class Entry:
                 url = gem_element.url
                 if url.startswith("gemini://"):
                     if url.startswith("gemini://alex.corcoles.net/"):
-                        url = url.replace("gemini://alex.corcoles.net/", meta.BASE_URL + "/")
+                        url = url.replace("gemini://alex.corcoles.net/", f"{meta.SCHEMA}://{meta.HOST}/")
                     else:
                         url = url.replace("gemini://", "https://portal.mozz.us/gemini/")
 
@@ -146,11 +146,11 @@ class Root(page.BasePage):
         fg = feed.FeedGenerator()
         fg.title(meta.TITLE)
         fg.subtitle(meta.SUBTITLE)
-        fg.link(href=meta.BASE_URL, rel="self")
+        fg.link(href=f"{meta.SCHEMA}://{meta.HOST}", rel="self")
 
         for entry in self.entries()[0:10]:
             fe = fg.add_entry()
-            url = f"{meta.BASE_URL}{entry.uri}"
+            url = f"{meta.SCHEMA}://{meta.HOST}/{entry.uri}"
             fe.link(href=url)
             fe.published(datetime.datetime.combine(entry.posted, datetime.datetime.min.time(), tzinfo=datetime.timezone.utc))
             fe.title(entry.title)

diff --git a/blog_experiment/blog/html.py b/blog_experiment/blog/html.py
index c7112ea8668974efc181b556b505c33a50f38e5a..5263ca9bdb7b4b56cc20597bb5eebe32d0e2b8e7 100644 (file)
--- a/blog_experiment/blog/html.py
+++ b/blog_experiment/blog/html.py
@@ -6,7 +6,7 @@ from blog import meta, pretty
 
 
 def html_template(*content, page_title=None):
-    title = [h.A(meta.TITLE, href=meta.BASE_URL)]
+    title = [h.A(meta.TITLE, href=f"{meta.SCHEMA}://{meta.HOST}")]
     if page_title:
         title += f" - {page_title}"
 
@@ -20,7 +20,7 @@ def html_template(*content, page_title=None):
         h.HTML(
             h.HEAD(
                 h.TITLE(meta.TITLE + (f" - {page_title}" if page_title else "")),
-                h.LINK(rel="alternate", type="application/rss+xml", title=meta.TITLE, href=f"{meta.BASE_URL}/feed/"),
+                h.LINK(rel="alternate", type="application/rss+xml", title=meta.TITLE, href=f"{meta.SCHEMA}://{meta.HOST}/feed/"),
             ),
             h.BODY(
                 h.H1(title),

diff --git a/blog_experiment/blog/meta.py b/blog_experiment/blog/meta.py
index 8ab088488071186590cee655e8fa2d6a0ce56397..e92b2acb946905386cc6abae22af666c18e27379 100644 (file)
--- a/blog_experiment/blog/meta.py
+++ b/blog_experiment/blog/meta.py
@@ -1,6 +1,7 @@
 TITLE = "El blog es mío"
 SUBTITLE = "Hay otros como él, pero este es el mío"
-BASE_URL = "https://blog.pdp7.net"
+HOST = None
+SCHEMA = None
 
 LINKS = (
     ("GitHub", "https://github.com/alexpdp7/"),

diff --git a/blog_experiment/k8s.yaml b/blog_experiment/k8s.yaml
index 3d31b5101b3e3306d642449ce8bf7a8e93dd3e4c..e497d876ae7725b0fbd016b3f0af9c9a48a88602 100644 (file)
--- a/blog_experiment/k8s.yaml
+++ b/blog_experiment/k8s.yaml
@@ -27,6 +27,8 @@ items:
           - python
           - -m
           - blog
+          - https
+          - blog.pdp7.net
           image: quay.io/alexpdp7/blog:latest
           imagePullPolicy: Always
           name: blog