From 80ac422d8e9a0e3888646ecde76548921ecf1fff Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Thu, 25 Jul 2024 17:05:24 +0200 Subject: [PATCH 1/2] Align manual changes with example config --- etc/000-default.conf | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/etc/000-default.conf b/etc/000-default.conf index 8c0297d..6406084 100644 --- a/etc/000-default.conf +++ b/etc/000-default.conf @@ -1,20 +1,21 @@ # Example config for blender-buildbot-www # VirtualHost port and machine_id can be tweaked depending on the runtime environment. -# If VirtualHost is different than 80 add -# Listen XX (port number) - +Listen 8000 + - # Rename machine ID - Define machine_id local-hostname + Define machine_id local-hostname # Replace with actual hostname ServerName ${machine_id} ServerAlias ${machine_id} KeepAlive Off - Define root_path /var/www/html + Define root_path /var/www/html # Replace with actual path of blender-buildbot-www Define web_path ${root_path}/webroot Define log_path ${root_path}/log + # This environment variable determines the domain used for downloads + SetEnv DOWNLOAD_FILE_DOMAIN cdn.example.com # Replace with actual CDN domain + DocumentRoot ${web_path} @@ -45,15 +46,14 @@ RewriteRule ^/favicon.ico - [L,QSA] RewriteRule ^/admin$ /admin/ [R,L] RewriteRule ^/admin/(.*) - [L,QSA] - RewriteRule ^/(.*).(zip|bz2|7z|gz|dmg|msi|msix|xz|sha256) - [L,QSA] + RewriteRule ^/(.*).(zip|bz2|7z|gz|dmg|msi|msix|xz|html|png|jpg|json|whl|flatpak|snap) - [L,QSA] RewriteRule ^(.*)(\?(.*))?$ /index.php?__path__=$1&$2 [B,L,QSA] BrowserMatch "MSIE [2-5]" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 + nokeepalive ssl-unclean-shutdown \ + downgrade-1.0 force-response-1.0 - - ErrorLog ${APACHE_LOG_DIR}/error.log + ErrorLog ${log_path}/error.log LogLevel warn - CustomLog ${APACHE_LOG_DIR}/access.log combined + CustomLog ${log_path}/access.log vhost_combined -- 2.30.2 From cbe44baa4a3c93f84715f1ee5fe6616901f9e7a9 Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Thu, 25 Jul 2024 17:06:00 +0200 Subject: [PATCH 2/2] Fix typo in README and add rewrite file extensions --- README.md | 2 +- etc/000-default.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2bf6d9a..0f6fdd3 100644 --- a/README.md +++ b/README.md @@ -50,4 +50,4 @@ For the site to run as expected it's necessary to create a directories and files └── [experimental builds, from branches] ``` -Use the `etc/create_download_placeholders.py` script to crete some placeholders. +Use the `etc/create_download_placeholders.py` script to create some placeholders. diff --git a/etc/000-default.conf b/etc/000-default.conf index 6406084..6f5909d 100644 --- a/etc/000-default.conf +++ b/etc/000-default.conf @@ -46,7 +46,7 @@ Listen 8000 RewriteRule ^/favicon.ico - [L,QSA] RewriteRule ^/admin$ /admin/ [R,L] RewriteRule ^/admin/(.*) - [L,QSA] - RewriteRule ^/(.*).(zip|bz2|7z|gz|dmg|msi|msix|xz|html|png|jpg|json|whl|flatpak|snap) - [L,QSA] + RewriteRule ^/(.*).(zip|bz2|7z|gz|dmg|msi|msix|xz|sha256|html|png|jpg|jpeg|json|whl|snap|flatpak) - [L,QSA] RewriteRule ^(.*)(\?(.*))?$ /index.php?__path__=$1&$2 [B,L,QSA] BrowserMatch "MSIE [2-5]" \ -- 2.30.2