Merge branch 'main' into dev

Author: compgeniuses

imageroot/actions/configure-module/10configure_environment_vars

@@ -93,4 +93,4 @@ app_config = {
     "SEMAPHORE_TELEGRAM_TOKEN": SEMAPHORE_TELEGRAM_TOKEN
 }
 
-agent.write_envfile("app.env", app_config)
+agent.write_envfile("app.env", app_config)

imageroot/actions/create-module/10configure_environment_vars

@@ -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 secrets
+import base64
+import os
+
+# Try to parse the stdin as JSON.
+# If parsing fails, output everything to stderr
+data = json.load(sys.stdin)
+
+#This is specific to you module, so you need to change it accordingly.
+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]
+
+MARIADB_ROOT_PASSWORD = generate_random_password(16)
+MARIADB_DATABASE = data.get("MARIADB_DATABASE", "semaphore")
+MARIADB_USER = data.get("MARIADB_USER", "semaphore")
+MARIADB_PASSWORD = generate_random_password(16)
+MARIADB_AUTO_UPGRADE = data.get("MARIADB_AUTO_UPGRADE", "1")
+
+maria_db = {
+    "MARIADB_ROOT_PASSWORD": MARIADB_ROOT_PASSWORD,
+    "MARIADB_DATABASE": MARIADB_DATABASE,
+    "MARIADB_USER": MARIADB_USER,
+    "MARIADB_PASSWORD": MARIADB_PASSWORD,
+    "MARIADB_AUTO_UPGRADE": MARIADB_AUTO_UPGRADE
+}
+agent.write_envfile("database.env", maria_db)
+
+SECRET_KEY_BYTES = secrets.token_bytes(32)
+SECRET_KEY = base64.b64encode(SECRET_KEY_BYTES).decode('utf-8')
+
+SEMAPHORE_DB_HOST = data.get("SEMAPHORE_DB_HOST", "mysql")
+
+app_config = {
+    "SEMAPHORE_DB_USER": MARIADB_USER,
+    "SEMAPHORE_DB_PASS": MARIADB_PASSWORD,
+    "SEMAPHORE_DB_HOST": "mariadb-app",
+    "SEMAPHORE_DB_PORT": "3306",
+    "SEMAPHORE_DB_DIALECT": "mysql",
+    "SEMAPHORE_DB": MARIADB_DATABASE,
+    "SEMAPHORE_ACCESS_KEY_ENCRYPTION": SECRET_KEY
+}
+
+agent.write_envfile("app-db.env", app_config)
+
+#agent.dump_env()

imageroot/actions/restore-module/40restore_database

@@ -38,4 +38,4 @@ podman run \
   --env MARIADB_USER=semaphoreui \
   --env MARIADB_PASSWORD=semaphoreui \
   --replace --name=restore_db \
-  ${MARIADB_IMAGE}
+  ${MARIADB_IMAGE}

imageroot/actions/restore-module/80start_services

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+#
+# Copyright (C) 2023 Nethesis S.r.l.
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+set -e
+
+# Redirect any output to the journal (stderr)
+exec 1>&2
+
+# If the control reaches this step, the service can be enabled and started
+
+touch smarthost.env
+
+systemctl --user enable semaphoreui.service
+systemctl --user restart semaphoreui.service

imageroot/systemd/user/mariadb-app.service

@@ -11,6 +11,7 @@ After=semaphoreui.service
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n
 EnvironmentFile=%S/state/environment
+EnvironmentFile=%S/state/database.env
 # EnvironmentFile=%S/state/secrets/passwords.secret
 Restart=always
 TimeoutStopSec=70
@@ -22,7 +23,7 @@ ExecStart=/usr/bin/podman run --conmon-pidfile %t/mariadb-app.pid \
     --volume mysql-data:/var/lib/mysql/:Z \
     ${MARIADB_IMAGE} \
     --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
-ExecStartPost=/usr/bin/podman exec  mariadb-app /bin/bash -c 'printf "[client] \npassword=Nethesis,1234" > /root/.my.cnf'
+ExecStartPost=/usr/bin/podman exec  mariadb-app /bin/bash -c 'printf "[client] \npassword=${MARIADB_ROOT_PASSWORD}" > /root/.my.cnf'
 ExecStartPost=/usr/bin/podman exec mariadb-app /bin/bash -c "while ! mysqladmin ping -h localhost -P 3306 -u root; do sleep 1; done"
 ExecStop=/usr/bin/podman stop --ignore --cidfile %t/mariadb-app.ctr-id -t 10
 ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/mariadb-app.ctr-id

imageroot/systemd/user/semaphoreui-app.service

@@ -34,4 +34,4 @@ PIDFile=%t/semaphoreui-app.pid
 Type=forking
 
 [Install]
-WantedBy=default.target
+WantedBy=default.target