Commit e2ca8b2
fix(seo): key site_scheme off DJANGO_ENV, not DEBUG — https was still broken on -test (#1236)
The #1236 fix pinned https only when `not DEBUG`, assuming DEBUG=True meant local
dev. But the TEST server runs DEBUG=True (config-test.ini) while sitting behind the
same TLS-terminating Apache proxy as prod, so `site_scheme` returned `request.scheme`
(http) there — every canonical/og:url/og:image on makeabilitylab-test emitted
http://, i.e. #1236 was only fixed on prod, not test. (Confirmed by inspecting the
live test pages after deploy.)
Key off `DJANGO_ENV` instead: 'PROD'/'TEST' on the servers (set by
rebuildanddeploy.sh) → https; 'DEBUG'/unset locally → request.scheme. Make the
`site_scheme` context processor delegate to `website.utils.metadata.site_scheme` so
the template (canonical/OG) and view (JSON-LD) URL schemes share one definition and
can't drift.
Tests: replace the DEBUG-based assertions with DJANGO_ENV-based ones and add an
explicit regression test that DJANGO_ENV=TEST + DEBUG=True still emits https.
Full suite 267 green.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>1 parent 45095b3 commit e2ca8b2
3 files changed
Lines changed: 46 additions & 33 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
| 12 | + | |
12 | 13 | | |
13 | 14 | | |
14 | 15 | | |
| |||
19 | 20 | | |
20 | 21 | | |
21 | 22 | | |
22 | | - | |
23 | | - | |
24 | | - | |
25 | | - | |
26 | | - | |
27 | | - | |
28 | | - | |
29 | | - | |
30 | | - | |
31 | | - | |
32 | | - | |
33 | | - | |
34 | | - | |
35 | | - | |
36 | | - | |
37 | | - | |
38 | | - | |
39 | | - | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
40 | 31 | | |
41 | | - | |
42 | | - | |
43 | | - | |
| 32 | + | |
44 | 33 | | |
45 | 34 | | |
46 | 35 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
46 | 46 | | |
47 | 47 | | |
48 | 48 | | |
49 | | - | |
50 | | - | |
51 | | - | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
52 | 54 | | |
53 | 55 | | |
54 | 56 | | |
| |||
204 | 206 | | |
205 | 207 | | |
206 | 208 | | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
207 | 212 | | |
208 | | - | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
209 | 226 | | |
210 | | - | |
| 227 | + | |
211 | 228 | | |
212 | 229 | | |
213 | 230 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
45 | 45 | | |
46 | 46 | | |
47 | 47 | | |
48 | | - | |
49 | | - | |
50 | | - | |
51 | | - | |
52 | | - | |
53 | | - | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
54 | 61 | | |
55 | | - | |
| 62 | + | |
56 | 63 | | |
57 | 64 | | |
58 | 65 | | |
| |||
0 commit comments