Make all templates local, ensure ssh keys for amd64 builds are generated on first boot

ansible/deploy-butter-portal.yml

@@ -43,6 +43,14 @@
         group: root
         mode: '0644'
 
+    - name: Template portal change manager service file
+      ansible.builtin.template:
+        src: templates/change-manager.service.j2
+        dest: /lib/systemd/system/change-manager.service
+        owner: root
+        group: root
+        mode: '0644'
+
     - name: Template nginx config
       ansible.builtin.template:
         src: templates/nginx-config.j2
@@ -57,6 +65,12 @@
         dest: /etc/systemd/system/multi-user.target.wants/butterbox-portal.service
         state: link
 
+    - name: Enable change manager by symlink
+      ansible.builtin.file:
+        src: /lib/systemd/system/change-manager.service
+        dest: /etc/systemd/system/multi-user.target.wants/change-manager.service
+        state: link
+
     - name: Ensure butter_user owns portal directory
       ansible.builtin.file:
         path: "/home/{{ butter_user }}/butter-portal"

ansible/group_vars/all.yml

@@ -4,8 +4,6 @@ go_version: "1.24.6"
 go_arch_map:
   x86_64: "amd64"
   aarch64: "arm64"
-script_base_url: "https://gitlab.com/likebutter/butterbox-rpi/-/raw/main/scripts"
-config_base_url: "https://gitlab.com/likebutter/butterbox-rpi/-/raw/main/configs"
 
 vmdb2_script_base_dir: "butterbox-rpi/scripts"
 vmdb2_config_base_dir: "butterbox-rpi/configs"

ansible/install-chat.yml

@@ -54,25 +54,13 @@
         creates: "/home/{{ butter_user }}/dendrite/server.key"
 
     - name: Download Dendrite config to target
-      ansible.builtin.get_url:
+      ansible.builtin.template:
-        url: "{{ config_base_url }}/butterbox-dendrite.conf"
+        src: "templates/butterbox-dendrite.conf.j2"
         dest: "/home/{{ butter_user }}/dendrite/butterbox-dendrite.conf"
         owner: "{{ butter_user }}"
         group: "{{ butter_user }}"
         mode: '0644'
 
-    - name: Replace REPLACEME with butter_name in config
-      ansible.builtin.replace:
-        path: "/home/{{ butter_user }}/dendrite/butterbox-dendrite.conf"
-        regexp: 'REPLACEME'
-        replace: "{{ butter_name }}"
-
-    - name: Replace /home/pi with /home/butter_user in config
-      ansible.builtin.replace:
-        path: "/home/{{ butter_user }}/dendrite/butterbox-dendrite.conf"
-        regexp: '/pi/'
-        replace: "/{{ butter_user }}/"
-
     - name: Create log directory for Dendrite
       ansible.builtin.file:
         path: "/var/log/dendrite"
@@ -112,27 +100,6 @@
         name: dendrite
       when: not (is_vmdb2 | bool)
 
-    - name: Download Matrix reverse proxy config for Lighttpd
-      ansible.builtin.get_url:
-        url: "{{ config_base_url }}/50-matrix-reverse-proxy.conf"
-        dest: /etc/lighttpd/conf-available/50-matrix-reverse-proxy.conf
-        owner: root
-        group: root
-        mode: '0644'
-
-    - name: Ensure old symlink is removed if it exists
-      ansible.builtin.file:
-        path: /etc/lighttpd/conf-enabled/50-matrix-reverse-proxy.conf
-        state: absent
-        force: true
-
-    - name: Enable reverse proxy config for Matrix in Lighttpd
-      ansible.builtin.file:
-        src: /etc/lighttpd/conf-available/50-matrix-reverse-proxy.conf
-        dest: /etc/lighttpd/conf-enabled/50-matrix-reverse-proxy.conf
-        state: link
-        force: true
-
     - name: Start dendrite as user butter_user
       become: true
       become_user: "{{ butter_user }}"
@@ -146,7 +113,6 @@
       when: is_vmdb2 | bool
       changed_when: false
 
-
     - name: Wait for Dendrite client API to be available
       ansible.builtin.wait_for:
         host: "127.0.0.1"

ansible/install-keanu-weblite.yml

@@ -33,19 +33,12 @@
       changed_when: false
 
     - name: Download keanu-weblite config file
-      ansible.builtin.get_url:
+      ansible.builtin.template:
-        url: "{{ config_base_url }}/keanu-weblite-config.json"
+        src: "templates/keanu-weblite-config.json.j2"
         dest: /tmp/keanu-weblite/src/assets/config.json
         mode: '0644'
       delegate_to: localhost
 
-    - name: Replace REPLACEME with butter_name in config.json
-      ansible.builtin.replace:
-        path: /tmp/keanu-weblite/src/assets/config.json
-        regexp: 'REPLACEME'
-        replace: "{{ butter_name }}"
-      delegate_to: localhost
-
     - name: Run npm build with legacy OpenSSL option
       ansible.builtin.shell: |
         export NODE_OPTIONS=--openssl-legacy-provider

ansible/install-rasp-ap.yml

@@ -57,15 +57,15 @@
         dest: "/usr/local/bin/set_hostapd_iface.py"
         mode: '0744'
 
-    - name: Copy hostapd set_hostapd_iface service file
+    - name: Template hostapd set_hostapd_iface service file
       ansible.builtin.template:
         src: "set-hostapd-iface.service.j2"
         dest: "/lib/systemd/system/set-hostapd-iface.service"
         mode: '0644'
 
-    - name: Download hostapd raspapd systemd service file
+    - name: Template hostapd raspapd systemd service file
-      ansible.builtin.get_url:
+      ansible.builtin.template:
-        url: "{{ config_base_url }}/raspapd.service"
+        src: "templates/raspapd.service.j2"
         dest: "/lib/systemd/system/raspapd.service"
         owner: root
         group: root

ansible/main.yml

@@ -4,9 +4,9 @@
     - "base"
     - "ap"
     - "matrix"
-#- import_playbook: install-rasp-ap.yml
+- import_playbook: install-rasp-ap.yml
-#  tags: "ap"
+  tags: "ap"
-#  when:  ap_mode_supported | bool
+  when:  ap_mode_supported | bool
 - import_playbook: deploy-butter-portal.yml
   tags: 
     - "website"

ansible/templates/butterbox-dendrite.conf.j2

@@ -0,0 +1,380 @@
+# This is the Dendrite configuration file.
+#
+# The configuration is split up into sections - each Dendrite component has a
+# configuration section, in addition to the "global" section which applies to
+# all components.
+#
+# At a minimum, to get started, you will need to update the settings in the
+# "global" section for your deployment, and you will need to check that the
+# database "connection_string" line in each component section is correct.
+#
+# Each component with a "database" section can accept the following formats
+# for "connection_string":
+#   SQLite:     file:filename.db
+#               file:///path/to/filename.db
+#   PostgreSQL: postgresql://user:pass@hostname/database?params=...
+#
+# SQLite is embedded into Dendrite and therefore no further prerequisites are
+# needed for the database when using SQLite mode. However, performance with
+# PostgreSQL is significantly better and recommended for multi-user deployments.
+# SQLite is typically around 20-30% slower than PostgreSQL when tested with a
+# small number of users and likely will perform worse still with a higher volume
+# of users.
+#
+# The "max_open_conns" and "max_idle_conns" settings configure the maximum
+# number of open/idle database connections. The value 0 will use the database
+# engine default, and a negative value will use unlimited connections. The
+# "conn_max_lifetime" option controls the maximum length of time a database
+# connection can be idle in seconds - a negative value is unlimited.
+
+# The version of the configuration file.
+version: 2
+
+# Global Matrix configuration. This configuration applies to all components.
+global:
+  # The domain name of this homeserver.
+  server_name: {{ butter_name }}.local
+
+  # The path to the signing private key file, used to sign requests and events.
+  # Note that this is NOT the same private key as used for TLS! To generate a
+  # signing key, use "./bin/generate-keys --private-key matrix_key.pem".
+  private_key: /home/{{ butter_user }}/dendrite/matrix_key.pem
+
+  # The paths and expiry timestamps (as a UNIX timestamp in millisecond precision)
+  # to old signing private keys that were formerly in use on this domain. These
+  # keys will not be used for federation request or event signing, but will be
+  # provided to any other homeserver that asks when trying to verify old events.
+  # old_private_keys:
+  # - private_key: old_matrix_key.pem
+  #   expired_at: 1601024554498
+
+  # How long a remote server can cache our server signing key before requesting it
+  # again. Increasing this number will reduce the number of requests made by other
+  # servers for our key but increases the period that a compromised key will be
+  # considered valid by other homeservers.
+  key_validity_period: 168h0m0s
+
+  # The server name to delegate server-server communications to, with optional port
+  # e.g. localhost:443
+  well_known_server_name: ""
+
+  # Lists of domains that the server will trust as identity servers to verify third
+  # party identifiers such as phone numbers and email addresses.
+  trusted_third_party_id_servers:
+    - matrix.org
+    - vector.im
+
+  # Disables federation. Dendrite will not be able to make any outbound HTTP requests
+  # to other servers and the federation API will not be exposed.
+  disable_federation: false
+
+  # Configures the handling of presence events.
+  presence:
+    # Whether inbound presence events are allowed, e.g. receiving presence events from other servers
+    enable_inbound: false
+    # Whether outbound presence events are allowed, e.g. sending presence events to other servers
+    enable_outbound: false
+
+  # Server notices allows server admins to send messages to all users.
+  server_notices:
+    enabled: false
+    # The server localpart to be used when sending notices, ensure this is not yet taken
+    local_part: "_server"
+    # The displayname to be used when sending notices
+    display_name: "Server alerts"
+    # The mxid of the avatar to use
+    avatar_url: ""
+    # The roomname to be used when creating messages
+    room_name: "Server Alerts"
+
+  # Configuration for NATS JetStream
+  jetstream:
+    # A list of NATS Server addresses to connect to. If none are specified, an
+    # internal NATS server will be started automatically when running Dendrite
+    # in monolith mode. It is required to specify the address of at least one
+    # NATS Server node if running in polylith mode.
+    addresses:
+    # - localhost:4222
+
+    # Keep all NATS streams in memory, rather than persisting it to the storage
+    # path below. This option is present primarily for integration testing and
+    # should not be used on a real world Dendrite deployment.
+    in_memory: false
+
+    # Persistent directory to store JetStream streams in. This directory
+    # should be preserved across Dendrite restarts.
+    storage_path: /home/{{ butter_user }}/dendrite/jetstream
+
+    # The prefix to use for stream names for this homeserver - really only
+    # useful if running more than one Dendrite on the same NATS deployment.
+    topic_prefix: Dendrite
+
+  # Configuration for Prometheus metric collection.
+  metrics:
+    # Whether or not Prometheus metrics are enabled.
+    enabled: false
+
+    # HTTP basic authentication to protect access to monitoring.
+    basic_auth:
+      username: metrics
+      password: metrics
+
+  # DNS cache options. The DNS cache may reduce the load on DNS servers
+  # if there is no local caching resolver available for use.
+  dns_cache:
+    # Whether or not the DNS cache is enabled.
+    enabled: false
+
+    # Maximum number of entries to hold in the DNS cache, and
+    # for how long those items should be considered valid in seconds.
+    cache_size: 256
+    cache_lifetime: "5m" # 5minutes; see https://pkg.go.dev/time@master#ParseDuration for more
+
+# Configuration for the Appservice API.
+app_service_api:
+  internal_api:
+    listen: http://localhost:7777 # Only used in polylith deployments
+    connect: http://localhost:7777 # Only used in polylith deployments
+  database:
+    connection_string: file:///home/{{ butter_user }}/dendrite/appservice.db
+    max_open_conns: 10
+    max_idle_conns: 2
+    conn_max_lifetime: -1
+
+  # Disable the validation of TLS certificates of appservices. This is
+  # not recommended in production since it may allow appservice traffic
+  # to be sent to an unverified endpoint.
+  disable_tls_validation: false
+
+  # Appservice configuration files to load into this homeserver.
+  config_files: []
+
+# Configuration for the Client API.
+client_api:
+  internal_api:
+    listen: http://localhost:7771 # Only used in polylith deployments
+    connect: http://localhost:7771 # Only used in polylith deployments
+  external_api:
+    listen: http://[::]:8071
+
+  # Prevents new users from being able to register on this homeserver, except when
+  # using the registration shared secret below.
+  registration_disabled: false
+
+  # Prevents new guest accounts from being created. Guest registration is also
+  # disabled implicitly by setting 'registration_disabled' above.
+  guests_disabled: true
+
+  # If set, allows registration by anyone who knows the shared secret, regardless of
+  # whether registration is otherwise disabled.
+  registration_shared_secret: ""
+
+  # Whether to require reCAPTCHA for registration.
+  enable_registration_captcha: false
+
+  # Settings for ReCAPTCHA.
+  recaptcha_public_key: ""
+  recaptcha_private_key: ""
+  recaptcha_bypass_secret: ""
+  recaptcha_siteverify_api: ""
+
+  # TURN server information that this homeserver should send to clients.
+  turn:
+    turn_user_lifetime: ""
+    turn_uris: []
+    turn_shared_secret: ""
+    turn_username: ""
+    turn_password: ""
+
+  # Settings for rate-limited endpoints. Rate limiting will kick in after the
+  # threshold number of "slots" have been taken by requests from a specific
+  # host. Each "slot" will be released after the cooloff time in milliseconds.
+  rate_limiting:
+    enabled: true
+    threshold: 5
+    cooloff_ms: 500
+
+# Configuration for the Federation API.
+federation_api:
+  internal_api:
+    listen: http://localhost:7772 # Only used in polylith deployments
+    connect: http://localhost:7772 # Only used in polylith deployments
+  external_api:
+    listen: http://[::]:8072
+  database:
+    connection_string: file:///home/{{ butter_user }}/dendrite/federationapi.db
+    max_open_conns: 10
+    max_idle_conns: 2
+    conn_max_lifetime: -1
+
+  # How many times we will try to resend a failed transaction to a specific server. The
+  # backoff is 2**x seconds, so 1 = 2 seconds, 2 = 4 seconds, 3 = 8 seconds etc.
+  send_max_retries: 16
+
+  # Disable the validation of TLS certificates of remote federated homeservers. Do not
+  # enable this option in production as it presents a security risk!
+  disable_tls_validation: false
+
+  # Perspective keyservers to use as a backup when direct key fetches fail. This may
+  # be required to satisfy key requests for servers that are no longer online when
+  # joining some rooms.
+  key_perspectives:
+    - server_name: matrix.org
+      keys:
+        - key_id: ed25519:auto
+          public_key: Noi6WqcDj0QmPxCNQqgezwTlBKrfqehY1u2FyWP9uYw
+        - key_id: ed25519:a_RXGa
+          public_key: l8Hft5qXKn1vfHrg3p4+W8gELQVo8N13JkluMfmn2sQ
+
+  # This option will control whether Dendrite will prefer to look up keys directly
+  # or whether it should try perspective servers first, using direct fetches as a
+  # last resort.
+  prefer_direct_fetch: false
+
+# Configuration for the Key Server (for end-to-end encryption).
+key_server:
+  internal_api:
+    listen: http://localhost:7779 # Only used in polylith deployments
+    connect: http://localhost:7779 # Only used in polylith deployments
+  database:
+    connection_string: file:///home/{{ butter_user }}/dendrite/keyserver.db
+    max_open_conns: 10
+    max_idle_conns: 2
+    conn_max_lifetime: -1
+
+# Configuration for the Media API.
+media_api:
+  internal_api:
+    listen: http://localhost:7774 # Only used in polylith deployments
+    connect: http://localhost:7774 # Only used in polylith deployments
+  external_api:
+    listen: http://[::]:8074
+  database:
+    connection_string: file:///home/{{ butter_user }}/dendrite/mediaapi.db
+    max_open_conns: 5
+    max_idle_conns: 2
+    conn_max_lifetime: -1
+
+  # Storage path for uploaded media. May be relative or absolute.
+  base_path: /home/{{ butter_user }}/dendrite/media_store
+
+  # The maximum allowed file size (in bytes) for media uploads to this homeserver
+  # (0 = unlimited). If using a reverse proxy, ensure it allows requests at
+  # least this large (e.g. client_max_body_size in nginx.)
+  # 1GB = 1 048 576 000 (1024*1024*1000)
+  max_file_size_bytes: 1048576000
+
+  # Whether to dynamically generate thumbnails if needed.
+  dynamic_thumbnails: true
+
+  # The maximum number of simultaneous thumbnail generators to run.
+  max_thumbnail_generators: 10
+
+  # A list of thumbnail sizes to be generated for media content.
+  thumbnail_sizes:
+    - width: 32
+      height: 32
+      method: crop
+    - width: 96
+      height: 96
+      method: crop
+    - width: 640
+      height: 480
+      method: scale
+
+# Configuration for experimental MSC's
+mscs:
+  # A list of enabled MSC's
+  # Currently valid values are:
+  # - msc2836    (Threading, see https://github.com/matrix-org/matrix-doc/pull/2836)
+  # - msc2946    (Spaces Summary, see https://github.com/matrix-org/matrix-doc/pull/2946)
+  mscs: []
+  database:
+    connection_string: file:///home/{{ butter_user }}/dendrite/mscs.db
+    max_open_conns: 5
+    max_idle_conns: 2
+    conn_max_lifetime: -1
+
+# Configuration for the Room Server.
+room_server:
+  internal_api:
+    listen: http://localhost:7770 # Only used in polylith deployments
+    connect: http://localhost:7770 # Only used in polylith deployments
+  database:
+    connection_string: file:///home/{{ butter_user }}/dendrite/roomserver.db
+    max_open_conns: 10
+    max_idle_conns: 2
+    conn_max_lifetime: -1
+
+# Configuration for the Sync API.
+sync_api:
+  internal_api:
+    listen: http://localhost:7773 # Only used in polylith deployments
+    connect: http://localhost:7773 # Only used in polylith deployments
+  external_api:
+    listen: http://[::]:8073
+  database:
+    connection_string: file:///home/{{ butter_user }}/dendrite/syncapi.db
+    max_open_conns: 10
+    max_idle_conns: 2
+    conn_max_lifetime: -1
+
+  # This option controls which HTTP header to inspect to find the real remote IP
+  # address of the client. This is likely required if Dendrite is running behind
+  # a reverse proxy server.
+  # real_ip_header: X-Real-IP
+
+# Configuration for the User API.
+user_api:
+  # The cost when hashing passwords on registration/login. Default: 10. Min: 4, Max: 31
+  # See https://pkg.go.dev/golang.org/x/crypto/bcrypt for more information.
+  # Setting this lower makes registration/login consume less CPU resources at the cost of security
+  # should the database be compromised. Setting this higher makes registration/login consume more
+  # CPU resources but makes it harder to brute force password hashes.
+  # This value can be low if performing tests or on embedded Dendrite instances (e.g WASM builds)
+  # bcrypt_cost: 10
+  internal_api:
+    listen: http://localhost:7781 # Only used in polylith deployments
+    connect: http://localhost:7781 # Only used in polylith deployments
+  account_database:
+    connection_string: file:///home/{{ butter_user }}/dendrite/userapi_accounts.db
+    max_open_conns: 10
+    max_idle_conns: 2
+    conn_max_lifetime: -1
+  # The length of time that a token issued for a relying party from
+  # /_matrix/client/r0/user/{userId}/openid/request_token endpoint
+  # is considered to be valid in milliseconds.
+  # The default lifetime is 3600000ms (60 minutes).
+  # openid_token_lifetime_ms: 3600000
+
+# Configuration for Opentracing.
+# See https://github.com/matrix-org/dendrite/tree/master/docs/tracing for information on
+# how this works and how to set it up.
+tracing:
+  enabled: false
+  jaeger:
+    serviceName: ""
+    disabled: false
+    rpc_metrics: false
+    tags: []
+    sampler: null
+    reporter: null
+    headers: null
+    baggage_restrictions: null
+    throttler: null
+
+# Logging configuration
+logging:
+  - type: std
+    level: info
+  - type: file
+    # The logging level, must be one of debug, info, warn, error, fatal, panic.
+    level: info
+    params:
+      path: /var/log/dendrite/
+
+
+# Not part of the dendrite-sample file, but required by 0.13.7
+relay_api:
+  database:
+    connection_string: file:///home/{{ butter_user }}/dendrite/relay_api.db

ansible/templates/butterbox-dnsmasq.conf.j2

@@ -1,4 +1,4 @@
 interface=wlan0
 dhcp-range=10.3.141.50,10.3.141.255,255.255.255.0,12h
 dhcp-option=6,10.3.141.1
-address=/{{ butter_name }}.lan/10.3.141.1
+address=/{{ butter_name }}.local/10.3.141.1

ansible/templates/change-manager.service.j2

@@ -0,0 +1,15 @@
+[Unit]
+Description=Butterbox setting management service
+After=network.target
+StartLimitIntervalSec=0
+
+[Service]
+Type=simple
+Restart=on-failure
+RestartSec=1
+User=root
+ExecStart=/bin/bash -c "chmod 600 /etc/ssh/*key && python3 change_manager.py"
+WorkingDirectory=/home/{{ butter_user }}/butter-portal
+Environment=PYTHONUNBUFFERED=1
+[Install]
+WantedBy=multi-user.target

ansible/templates/keanu-weblite-config.json.j2

@@ -0,0 +1,10 @@
+{
+    "appName": "Keanu on Butter Box",
+    "appNames": {},
+    "productLink": "{{ butter_name }}.local",
+    "defaultServer": "http://{{ butter_name }}.local",
+    "rtl": false,
+    "analytics": {
+        "enabled": false
+    }
+}

ansible/templates/raspapd.service.j2

@@ -0,0 +1,15 @@
+[Unit]
+Description=RaspAP Service Daemon
+DefaultDependencies=no
+# This line, which the default raspapd.service would use, results in a circular dependency
+# And the symptom we see is that it doesn't boot.  Instead, run this after network.target
+# After=multi-user.target
+After=network.target
+
+[Service]
+Type=oneshot
+ExecStart=/bin/bash /etc/raspap/hostapd/servicestart.sh --interface uap0 --seconds 3
+RemainAfterExit=no
+
+[Install]
+WantedBy=multi-user.target

vmdb2-recipes/amd64_trixie.yaml

@@ -120,6 +120,7 @@ steps:
     unless: rootfs_unpacked
 
   - shell: |
+
       echo "butterbox" > "${ROOT?}/etc/hostname"
 
       # Allow root logins locally with no password
@@ -149,6 +150,10 @@ steps:
     
   - shell: |
       rm "${ROOT?}/etc/resolv.conf"
+      mkdir -p "${ROOT?}/etc/systemd/system/multi-user.target.requires/"
+      install -m 644 -o root -g root image-specs/rootfs/etc/systemd/system/rpi-generate-ssh-host-keys.service "${ROOT?}/etc/systemd/system/"
+      ln -s "${ROOT?}/etc/systemd/system/rpi-generate-ssh-host-keys.service" "${ROOT?}/etc/systemd/system/multi-user.target.requires/rpi-generate-ssh-host-keys.service"
+      rm -f "${ROOT?}"/etc/ssh/ssh_host_*_key*
     root-fs: tag-root
 
   # Clear /etc/machine-id and /var/lib/dbus/machine-id, as both should
@@ -162,13 +167,14 @@ steps:
   # Note this will also trigger ConditionFirstBoot=yes for systemd.
   # On Buster, /etc/machine-id should be an emtpy file, not an absent file
   # On Bullseye, /etc/machine-id should not exist in an image
+  #
+
   - chroot: tag-root
     shell: |
       rm -f /etc/machine-id /var/lib/dbus/machine-id
       echo "uninitialized" > /etc/machine-id
       echo "LABEL=BOOT / ext4 rw 0 1" > /etc/fstab
 
-
   - virtual-filesystems: tag-root
 
   - ansible: tag-root

vmdb2-recipes/raspi_4_trixie.yaml

@@ -81,7 +81,10 @@ steps:
       - dhcpcd
       - dnsmasq
       - python3
-      - lighttpd
+      - python3-packaging
+      - python3-virtualenv
+      - nginx
+      - git
       - unzip
       - sudo
       - systemd-timesyncd

vmdb2-recipes/run_build_raspi4.sh

@@ -4,7 +4,7 @@ GIT_BRANCH=$(git branch --show-current 2>/dev/null)
 GIT_TAG=$(git tag 2>/dev/null | head -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_NOAP_$SUFFIX.img --log raspi4_butter_$SUFFIX.log raspi_4_trixie.yaml 
+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_NOAP_$SUFFIX.img  
+tar cvfz raspi4_butter_NOAP_$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