Merge branch 'main' into dev

Author: compgeniuses

build-images.sh

@@ -14,6 +14,7 @@ images=()
 repobase="${REPOBASE:-ghcr.io/geniusdynamics}"
 # Configure the image name
 reponame="firefly"
+firefly_version="version-6.2.20"
 
 # Create a new empty container image
 container=$(buildah from scratch)
@@ -45,7 +46,7 @@ buildah config --entrypoint=/ \
     --label="org.nethserver.authorizations=traefik@node:routeadm" \
     --label="org.nethserver.tcp-ports-demand=1" \
     --label="org.nethserver.rootfull=0" \
-    --label="org.nethserver.images=docker.io/postgres:15.5-alpine3.19 docker.io/fireflyiii/core:latest" \
+    --label="org.nethserver.images=docker.io/postgres:15.5-alpine3.19 docker.io/fireflyiii/core:$firefly_version" \
     "${container}"
 # Commit the image
 buildah commit "${container}" "${repobase}/${reponame}"

imageroot/actions/configure-module/10configure_environment_vars

@@ -21,7 +21,6 @@ APP_URL = data.get("host", "")
 app = {
     "APP_URL": "https://"+APP_URL,
 }
-
-agent.write_envfile("app.env", app)
+agent.write_envfile("app_config.env", app)
 
 #agent.dump_env()

imageroot/actions/create-module/10configure_var

@@ -0,0 +1,58 @@
+#!/usr/bin/env python3
+
+#
+# Copyright (C) 2022 Nethesis S.r.l.
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+
+import json
+import sys
+import agent
+import base64
+import os
+
+# Try to parse the stdin as JSON.
+# If parsing fails, output everything to stderr
+data = json.load(sys.stdin)
+def generate_random_password(length):
+    # Generate random bytes and convert them to a hexadecimal string
+    random_bytes = os.urandom(length)
+    password = random_bytes.hex()
+    return password[:length]
+
+#This is specific to you module, so you need to change it accordingly.
+# we read a json stdin {"vars1":true, "var2":"foo", "vars3": 3} and we writ it to .config/state/environment
+# Setup database
+POSTGRES_USER= data.get("POSTGRES_USER", "postgres")
+POSTGRES_PASSWORD= generate_random_password(16)
+POSTGRES_DB= data.get("POSTGRES_DB", "firefly")
+
+db = {
+    "POSTGRES_USER": POSTGRES_USER,
+    "POSTGRES_PASSWORD": POSTGRES_PASSWORD,
+    "POSTGRES_DB": POSTGRES_DB,
+}
+agent.write_envfile("database.env", db)
+
+
+random_bytes = os.urandom(32)
+base64_bytes = base64.b64encode(random_bytes)
+base64_message = base64_bytes.decode('utf-8')
+APP_KEY = "base64:" + base64_message
+DB_HOST="postgresql-app"
+DB_USERNAME=POSTGRES_USER
+DB_PASSWORD=POSTGRES_PASSWORD
+app = {
+    "APP_KEY": APP_KEY,
+    "DB_HOST": DB_HOST,
+    "DB_USERNAME": DB_USERNAME,
+    "DB_PASSWORD": DB_PASSWORD,
+    "DB_DATABASE": POSTGRES_DB,
+    "DB_CONNECTION": "pgsql",
+    "DB_PORT": "5432",
+    "TRUSTED_PROXIES": "*",
+}
+
+agent.write_envfile("app.env", app)
+
+#agent.dump_env()

imageroot/etc/state-include.conf

@@ -5,9 +5,13 @@
 # List here what you want to save during backup : volumes or file Path
 
 
+
 state/firefly.pg_dump
 state/app.env
 state/app-db.env
+state/app_config.env
 state/database.env
 volumes/firefly_iii_upload
+volumes/firefly-app
+
 

imageroot/systemd/user/firefly-app.service

@@ -23,6 +23,7 @@ ExecStart=/usr/bin/podman run --conmon-pidfile %t/firefly-app.pid \
     --pod-id-file %t/firefly.pod-id --replace -d --name  firefly-app \
     --env-file=%S/state/app.env \
     --env-file=%S/state/app-db.env \
+     --env-file=%S/state/app_config.env \
     --volume firefly_iii_upload:/var/www/html/storage/upload/:Z \
     ${CORE_IMAGE}
 ExecStop=/usr/bin/podman stop --ignore --cidfile %t/firefly-app.ctr-id -t 10