From b6413574a5d23f94dcd646c7b60939498a5f8fea Mon Sep 17 00:00:00 2001
From: Shai Berger <shai@platonix.com>
Date: Fri, 10 Jan 2025 18:06:12 +0200
Subject: [PATCH] Set deployment to read SITEURL from env var, and explain
 deployment

Fixes #24.
---
 .github/workflows/deploy.yml |  2 ++
 README.md                    | 54 ++++++++++++++++++++++++++++++++++--
 website_2024/publishconf.py  |  4 ++-
 3 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 6531be4..3f81d5d 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -79,6 +79,8 @@ jobs:
           git rm -rf ${{ env.OUTPUT_DIR }}
           cd website_2024/
           poetry run pelican ${{ env.INPUT_DIR }} -o ${{ env.OUTPUT_DIR }} -s ${{ env.PELICAN_CONF }}
+        env:
+          PLCN_SITEURL: ${{ vars.PLCN_SITEURL }}
 
       # - name: Copy output to /docs
       #   run: cp -r website_2024/output/* docs/
diff --git a/README.md b/README.md
index cf9c446..b59afb9 100644
--- a/README.md
+++ b/README.md
@@ -40,6 +40,58 @@ You can also use `make devserver` for the HTML, and `npm run watch`
 for the styling -- these create watchers which update the output as
 you change the source files.
 
+### Deployment
+
+This repo is set up to deploy by Github Actions, to a GitHub Pages
+page. On the main repo, this gets deployed to
+https://hamakor.github.io/pycon-il-2024/ which is proxied from
+https://pycon.org.il/2024 . For this proxy to work well, the `SITEURL`
+setting points to that latter URL, rather than directly to the GitHub
+Pages (as usual with Pelican, in publishing we set the URLs to
+absolute and not relative).
+
+The deploy operation is defined to trigger only on pushes to `main`.
+
+The configuration settings are defined in
+`website_2024/pelicanconf.py` (for development) and `publishconf.py`
+(for "production").
+
+Note that all explanations about Github here are valid at the time
+written, but Github may change their UI, or the way Pages and Actions
+work.
+
+#### Alternate Deployment
+
+The trivial case where you'd want an alternate deployment is when
+preparing changes in the website contents. Then, the only thing
+you really need to change is the `SITEURL`. The Github Action is
+set to read this from a Github Environment Variable `PLCN_SITEURL`,
+so you can just set that to your Github Pages site URL.
+
+To set environment variables in Github, go to your repository
+settings, select "Secrets and variables" (under "Security"),
+and in the submenu choose "Actions".
+
+In case you want your deployment to include the Speakers page, you
+also need to set two further variables: `PRETALX_API_TOKEN` and
+`PRETALX_EVENT_NAME`. They will fill the roles of `<api-token>` and
+`<event-slug>`, as described above.
+
+Note that these are all defined as variables, not secrets. This is
+generally OK -- variables are only visible to people who have access
+to your repo settings, and the log of actions (where the token is
+printed) is also not publicly accessible.
+
+In case you want your deployment to include other configuration
+changes which should not be part of the main deployment, you can put
+them in a file `alternateconf.py` next to `pelicanconf.py` and
+`publishconf.py`; definitions from `alternateconf.py` will override
+those from `publishconf.py` (which, in turn, inherit and override
+those in `pelicanconf.py`).  The `alternateconf.py` file does not
+exist in the main branch, in order to make it easy to keep a separate
+branch in which it is added (and which you can then push to `main` on
+your own repo).
+
 ## Content
 
 Pages are in `website_2024/content/pages`, and are written in
@@ -64,8 +116,6 @@ that. The original template was kept for reference as
 `index.html.orig`. 
 
 Other interesting files to look at:
-- The settings are defined in `website_2024/pelicanconf.py` (for
-  development) and `publishconf.py` (for "production").
 - The sidebar is defined in
   `website_2024/themes/PyCon-Israel-Flex/templates/partial/sidebar.html`
 - The footer is in 
diff --git a/website_2024/publishconf.py b/website_2024/publishconf.py
index d389c59..6d0b4ec 100644
--- a/website_2024/publishconf.py
+++ b/website_2024/publishconf.py
@@ -8,7 +8,9 @@
 from pelicanconf import *
 
 # If your site is available via HTTPS, make sure SITEURL begins with https://
-SITEURL = "https://pycon.org.il/2024"
+# Note in SITEURL, we use `or` rather than a default, to handle
+# correctly the case that the env var is set to empty
+SITEURL = os.environ.get("PLCN_SITEURL") or "https://pycon.org.il/2024"
 RELATIVE_URLS = False
 
 FEED_DOMAIN = SITEURL