From 10d75e9d8c9de27e3cc42903ec361d4dbba81306 Mon Sep 17 00:00:00 2001 From: Ana Custura Date: Wed, 8 Apr 2026 10:30:22 +0100 Subject: [PATCH] Sync some fixes from production --- ansible/templates/nginx-config.j2 | 1 + vmdb2-recipes/amd64_trixie.yaml | 1 + vmdb2-recipes/raspi_4_trixie.yaml | 2 ++ vmdb2-recipes/run_build_amd64.sh | 2 +- vmdb2-recipes/run_build_raspi4.sh | 4 ++-- vmdb2-recipes/run_build_raspi4_kanglam.sh | 2 +- 6 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ansible/templates/nginx-config.j2 b/ansible/templates/nginx-config.j2 index 262ac5e..0f10094 100644 --- a/ansible/templates/nginx-config.j2 +++ b/ansible/templates/nginx-config.j2 @@ -2,6 +2,7 @@ server { listen 80 default_server; listen [::]:80 default_server; server_name {{ butter_name }}.local; + client_max_body_size 150M; location ^~ /chat { alias /var/www/html/chat; diff --git a/vmdb2-recipes/amd64_trixie.yaml b/vmdb2-recipes/amd64_trixie.yaml index 515fb86..23669fe 100644 --- a/vmdb2-recipes/amd64_trixie.yaml +++ b/vmdb2-recipes/amd64_trixie.yaml @@ -91,6 +91,7 @@ steps: packages: - avahi-daemon - avahi-utils + - locales - curl - udisks2 - wget diff --git a/vmdb2-recipes/raspi_4_trixie.yaml b/vmdb2-recipes/raspi_4_trixie.yaml index c8a04b9..ae8de0a 100644 --- a/vmdb2-recipes/raspi_4_trixie.yaml +++ b/vmdb2-recipes/raspi_4_trixie.yaml @@ -76,6 +76,8 @@ steps: packages: - avahi-daemon - avahi-utils + - locales + - fake-hwclock - curl - udisks2 - wget diff --git a/vmdb2-recipes/run_build_amd64.sh b/vmdb2-recipes/run_build_amd64.sh index 7b4d103..262d77f 100755 --- a/vmdb2-recipes/run_build_amd64.sh +++ b/vmdb2-recipes/run_build_amd64.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash GIT_BRANCH=$(git branch --show-current 2>/dev/null) -GIT_TAG=$(git tag 2>/dev/null | head -n1) +GIT_TAG=$(git tag 2>/dev/null | tail -n1) BUILD_DATE=$(date +"%d%m%y") SUFFIX="${GIT_BRANCH}_${GIT_TAG}_${BUILD_DATE}" time vmdb2 --rootfs-tarball=64_$SUFFIX.tar.gz --output 64_butter_$SUFFIX.img --log 64_butter_$SUFFIX.log amd64_trixie.yaml diff --git a/vmdb2-recipes/run_build_raspi4.sh b/vmdb2-recipes/run_build_raspi4.sh index f09f05a..83434b9 100755 --- a/vmdb2-recipes/run_build_raspi4.sh +++ b/vmdb2-recipes/run_build_raspi4.sh @@ -1,10 +1,10 @@ #!/usr/bin/env bash GIT_BRANCH=$(git branch --show-current 2>/dev/null) -GIT_TAG=$(git tag 2>/dev/null | head -n1) +GIT_TAG=$(git tag 2>/dev/null | tail -n1) BUILD_DATE=$(date +"%d%m%y") SUFFIX="${GIT_BRANCH}_${GIT_TAG}_${BUILD_DATE}" time vmdb2 --rootfs-tarball=raspi4_$SUFFIX.tar.gz --output raspi4_butter_$SUFFIX.img --log raspi4_butter_$SUFFIX.log raspi_4_trixie.yaml -tar cvfz raspi4_butter_NOAP_$SUFFIX.img.tar.gz raspi4_butter_$SUFFIX.img +tar cvfz raspi4_butter_$SUFFIX.img.tar.gz raspi4_butter_$SUFFIX.img #curl -H "Authorization: token" $CHURN_SECRET -X PUT --upload-file raspi4_butter_$SUFFIX.img.tar.gz https://guardianproject.dev/api/packages/butter/generic/churn/latest/raspi4_butter_$SUFFIX.img.tar.gz #rm *img *tar.gz diff --git a/vmdb2-recipes/run_build_raspi4_kanglam.sh b/vmdb2-recipes/run_build_raspi4_kanglam.sh index f27ff92..3940291 100755 --- a/vmdb2-recipes/run_build_raspi4_kanglam.sh +++ b/vmdb2-recipes/run_build_raspi4_kanglam.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash GIT_BRANCH=$(git branch --show-current 2>/dev/null) -GIT_TAG=$(git tag 2>/dev/null | head -n1) +GIT_TAG=$(git tag 2>/dev/null | tail -n1) BUILD_DATE=$(date +"%d%m%y") SUFFIX="${GIT_BRANCH}_${GIT_TAG}_${BUILD_DATE}" time vmdb2 --rootfs-tarball=raspi4_$SUFFIX.tar.gz --output raspi4_butter_$SUFFIX.img --log raspi4_butter_$SUFFIX.log kanglam_pi4.yaml