Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/ops
diff options
context:
space:
mode:
authorLeitwolf112026-11-16 16:27:16 +0300
committerLeitwolf112026-11-16 16:27:16 +0300
commit62faa7158ce51495dcdd09e7858c23faee707cfd (patch)
treeeb76a51454bb85aff0ee5ec43a142b8d16f90a86 /ops
parentcd4f0c3fb7b77640f55a807d306ae8389283f9f7 (diff)
downloadprogmaweb-site/catch3-uk.tar.gz
Serve the Catch3 site at catch3.uksite/catch3-uk
Catch3 has a domain of its own. Progmaweb answers catch3.uk with the Catch3 page, its sitemap and its robots entry; catch3.progmasoft.com and www.catch3.uk send a 308 to it from nginx, so one address serves the site. catch3.uk has its own certificate (ops/README.md). The page said Catch3 adds a C++20 library; it is a C++17 library, in all four languages of the page. Claude-Session: https://claude.ai/code/session_01Ji7xZMYjc4zankoc7hGBE1
Diffstat (limited to 'ops')
-rw-r--r--ops/README.md5
-rw-r--r--ops/nginx/progmaweb.conf60
2 files changed, 61 insertions, 4 deletions
diff --git a/ops/README.md b/ops/README.md
index 98bfddd..252bfb0 100644
--- a/ops/README.md
+++ b/ops/README.md
@@ -191,7 +191,10 @@ token, so every application has to ask again. Back up both files with the databa
The certificate of `progmasoft.com` must name `credentials.progmasoft.com`, `authorize.progmasoft.com`,
`console.progmasoft.com`, `product.progmasoft.com` and `catch3.progmasoft.com` as well; expand it with certbot's webroot plugin before the vhosts are enabled, then check
-`/.well-known/openid-configuration`, the sign-in page and the console from outside.
+`/.well-known/openid-configuration`, the sign-in page and the console from outside. `catch3.progmasoft.com` only
+sends a 308 to `catch3.uk`, the site of Catch3, which has a certificate of its own for `catch3.uk` and
+`www.catch3.uk` (`certbot certonly --webroot -w /var/lib/letsencrypt -d catch3.uk -d www.catch3.uk --key-type
+ecdsa`).
## Reserved accounts
diff --git a/ops/nginx/progmaweb.conf b/ops/nginx/progmaweb.conf
index f4107ee..59dee68 100644
--- a/ops/nginx/progmaweb.conf
+++ b/ops/nginx/progmaweb.conf
@@ -418,8 +418,7 @@ server {
}
}
-# The product catalog (product.progmasoft.com) and the product site Progmaweb
-# serves itself (catch3.progmasoft.com): pages of the Next.js site only.
+# The product catalog (product.progmasoft.com): pages of the Next.js site only.
server {
listen 80;
listen [::]:80;
@@ -465,6 +464,7 @@ server {
}
}
+# catch3.progmasoft.com was Catch3's site; every path moves to catch3.uk.
server {
listen 80;
listen [::]:80;
@@ -476,7 +476,7 @@ server {
}
location / {
- return 308 https://catch3.progmasoft.com$request_uri;
+ return 308 https://catch3.uk$request_uri;
}
}
@@ -490,6 +490,60 @@ server {
ssl_certificate_key /etc/letsencrypt/live/progmasoft.com/privkey.pem;
include /etc/letsencrypt/options-ssl-nginx.conf;
+ add_header Strict-Transport-Security "max-age=63072000; includeSubDomains; preload" always;
+
+ location / {
+ return 308 https://catch3.uk$request_uri;
+ }
+}
+
+# catch3.uk: the site of Catch3, pages of the Next.js site only. www goes to
+# the bare name.
+server {
+ listen 80;
+ listen [::]:80;
+ server_name catch3.uk www.catch3.uk;
+ server_tokens off;
+
+ location ^~ /.well-known/acme-challenge/ {
+ root /var/lib/letsencrypt;
+ default_type text/plain;
+ }
+
+ location / {
+ return 308 https://catch3.uk$request_uri;
+ }
+}
+
+server {
+ listen 443 ssl;
+ listen [::]:443 ssl;
+ http2 on;
+ server_name www.catch3.uk;
+ server_tokens off;
+
+ ssl_certificate /etc/letsencrypt/live/catch3.uk/fullchain.pem;
+ ssl_certificate_key /etc/letsencrypt/live/catch3.uk/privkey.pem;
+ include /etc/letsencrypt/options-ssl-nginx.conf;
+
+ add_header Strict-Transport-Security "max-age=63072000; includeSubDomains; preload" always;
+
+ location / {
+ return 308 https://catch3.uk$request_uri;
+ }
+}
+
+server {
+ listen 443 ssl;
+ listen [::]:443 ssl;
+ http2 on;
+ server_name catch3.uk;
+ server_tokens off;
+
+ ssl_certificate /etc/letsencrypt/live/catch3.uk/fullchain.pem;
+ ssl_certificate_key /etc/letsencrypt/live/catch3.uk/privkey.pem;
+ include /etc/letsencrypt/options-ssl-nginx.conf;
+
client_max_body_size 1m;
add_header Strict-Transport-Security "max-age=63072000; includeSubDomains; preload" always;