Merge pull request #15 from geniusdynamics/dev

Dev

Author: compgeniuses

build-images.sh

@@ -13,33 +13,33 @@ images=()
 repobase="${REPOBASE:-ghcr.io/geniusdynamics}"
 # Configure the image name
 reponame="matomo"
-matomo_version="5.0.3"
+matomo_version="5.3.2"
 # Create a new empty container image
 container=$(buildah from scratch)
 
 # Reuse existing nodebuilder-matomo container, to speed up builds
 if ! buildah containers --format "{{.ContainerName}}" | grep -q nodebuilder-matomo; then
-    echo "Pulling NodeJS runtime..."
-    buildah from --name nodebuilder-matomo -v "${PWD}:/usr/src:Z" docker.io/library/node:lts
+	echo "Pulling NodeJS runtime..."
+	buildah from --name nodebuilder-matomo -v "${PWD}:/usr/src:Z" docker.io/library/node:lts
 fi
 
 echo "Build static UI files with node..."
 buildah run \
-    --workingdir=/usr/src/ui \
-    --env="NODE_OPTIONS=--openssl-legacy-provider" \
-    nodebuilder-matomo \
-    sh -c "yarn install && yarn build"
+	--workingdir=/usr/src/ui \
+	--env="NODE_OPTIONS=--openssl-legacy-provider" \
+	nodebuilder-matomo \
+	sh -c "yarn install && yarn build"
 
 # Add imageroot directory to the container image
 buildah add "${container}" imageroot /imageroot
 buildah add "${container}" ui/dist /ui
 # Setup the entrypoint, ask to reserve one TCP port with the label and set a rootless container
 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/matomo:${matomo_version} docker.io/mariadb:10.11.6" \
-    "${container}"
+	--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/matomo:${matomo_version} docker.io/mariadb:10.11.6" \
+	"${container}"
 # Commit the image
 buildah commit "${container}" "${repobase}/${reponame}"
 
@@ -57,14 +57,14 @@ images+=("${repobase}/${reponame}")
 #
 
 #
-# Setup CI when pushing to Github. 
+# Setup CI when pushing to Github.
 # Warning! docker::// protocol expects lowercase letters (,,)
 if [[ -n "${CI}" ]]; then
-    # Set output value for Github Actions
-    printf "images=%s\n" "${images[*],,}" >> "${GITHUB_OUTPUT}"
+	# Set output value for Github Actions
+	printf "images=%s\n" "${images[*],,}" >>"${GITHUB_OUTPUT}"
 else
-    # Just print info for manual push
-    printf "Publish the images with:\n\n"
-    for image in "${images[@],,}"; do printf "  buildah push %s docker://%s:%s\n" "${image}" "${image}" "${IMAGETAG:-latest}" ; done
-    printf "\n"
+	# Just print info for manual push
+	printf "Publish the images with:\n\n"
+	for image in "${images[@],,}"; do printf "  buildah push %s docker://%s:%s\n" "${image}" "${image}" "${IMAGETAG:-latest}"; done
+	printf "\n"
 fi

imageroot/actions/configure-module/10EnvMatomo

@@ -15,11 +15,3 @@ data = json.load(sys.stdin)
 
 # Setup configuration from user input.
 
-agent.set_env("MATOMO_DATABASE_HOST", data.get("matomo_database_host",""))
-agent.set_env("MATOMO_DATABASE_USERNAME",data.get("matomo_database_username"))
-agent.set_env("MATOMO_DATABASE_PASSWORD", data.get("matomo_database_password"))
-agent.set_env("MATOMO_DATABASE_DBNAME", data.get("matomo_database_dbname"))
-agent.set_env("MARIADB_AUTO_UPGRADE",data.get("mariadb_auto_upgrade","1"))
-agent.set_env("MARIADB_DISABLE_UPGRADE_BACKUP",data.get("mariadb_disable_upgrade_backup","1"))
-agent.set_env("MATOMO_DATABASE_TABLES_PREFIX",data.get("matomo_database_tables_prefix","matomo"))
-agent.set_env("MATOMO_DATABASE_ADAPTER",data.get("matomo_database_adapter","mysql"))

imageroot/actions/create-module/20Env-default

@@ -9,28 +9,66 @@ import json
 import sys
 import agent
 import os
+import secrets
 from pathlib import Path
 
+data = json.load(sys.stdin)
+
 # try to find the timezone except to UTC
 symlink_path = "/etc/localtime"
 resolved_path = Path(symlink_path).resolve()
 timezone = str(resolved_path.relative_to(Path("/usr/share/zoneinfo")))
 if not timezone:
     timezone = "UTC"
 
+
+def generate_random_password():
+    return secrets.token_urlsafe(16)
+
+
+MARIADB_AUTO_UPGRADE = data.get("MARIADB_AUTO_UPGRADE", "1")
+MARIADB_DISABLE_UPGRADE_BACKUP = data.get("MARIADB_DISABLE_UPGRADE_BACKUP", "1")
+MARIADB_ROOT_PASSWORD = generate_random_password()
+MARIADB_DATABASE = data.get("MARIADB_DATABASE", "matomo")
+MARIADB_USER = data.get("MARIADB_USER", "matomo")
+MARIADB_PASSWORD = generate_random_password()
+MARIADB_INITDB_SKIP_TZINFO = data.get("MARIADB_INITDB_SKIP_TZINFO", "1")
+
+database_config = {
+    "MARIADB_AUTO_UPGRADE": MARIADB_AUTO_UPGRADE,
+    "MARIADB_DISABLE_UPGRADE_BACKUP": MARIADB_DISABLE_UPGRADE_BACKUP,
+    "MARIADB_ROOT_PASSWORD": MARIADB_ROOT_PASSWORD,
+    "MARIADB_DATABASE": MARIADB_DATABASE,
+    "MARIADB_USER": MARIADB_USER,
+    "MARIADB_PASSWORD": MARIADB_PASSWORD,
+    "MARIADB_INITDB_SKIP_TZINFO": MARIADB_INITDB_SKIP_TZINFO,
+}
+agent.write_envfile("database.env", database_config)
+
+MATOMO_DATABASE_HOST = data.get("MATOMO_DATABASE_HOST", "matomo-mariadb")
+MATOMO_DATABASE_USERNAME = MARIADB_USER
+MATOMO_DATABASE_PASSWORD = MARIADB_PASSWORD
+MATOMO_DATABASE_DBNAME = MARIADB_DATABASE
+MATOMO_DATABASE_TABLES_PREFIX = data.get("MATOMO_DATABASE_TABLES_PREFIX", "matomo")
+MATOMO_DATABASE_ADAPTER = data.get("MATOMO_DATABASE_ADAPTER", "mysql")
+PHP_MEMORY_LIMIT = data.get("PHP_MEMORY_LIMIT", "2048M")
+
+matomo_config = {
+    "MATOMO_DATABASE_HOST": MATOMO_DATABASE_HOST,
+    "MATOMO_DATABASE_USERNAME": MATOMO_DATABASE_USERNAME,
+    "MATOMO_DATABASE_PASSWORD": MATOMO_DATABASE_PASSWORD,
+    "MATOMO_DATABASE_DBNAME": MATOMO_DATABASE_DBNAME,
+    "MATOMO_DATABASE_TABLES_PREFIX": MATOMO_DATABASE_TABLES_PREFIX,
+    "MATOMO_DATABASE_ADAPTER": MATOMO_DATABASE_ADAPTER,
+    "PHP_MEMORY_LIMIT": PHP_MEMORY_LIMIT,
+}
+agent.write_envfile("matomo.env", matomo_config)
+
+
 # Create default vars
-agent.set_env("MATOMO_DATABASE_ADAPTER", "mysql")
-agent.set_env("MATOMO_DATABASE_TABLES_PREFIX", "matomo")
-agent.set_env("MARIADB_DISABLE_UPGRADE_BACKUP", 1)
-agent.set_env("MARIADB_AUTO_UPGRADE", 1)
-agent.set_env("PHP_MEMORY_LIMIT", 2048)
-agent.set_env("MARIADB_INITDB_SKIP_TZINFO", "1")
 
-# agent.set_env("MATOMO_DATABASE_HOST", "localhost")
-# agent.set_env("MATOMO_DATABASE_USERNAME", "matomo")
-# agent.set_env("MATOMO_DATABASE_PASSWORD", "Nethesis,1234")
-# agent.set_env("MATOMO_DATABASE_DBNAME", "matomo")
+agent.set_env("PHP_MEMORY_LIMIT", 2048)
 
 # Try to parse the stdin as JSON.
-
+agent.dump_env()
 

imageroot/actions/get-configuration/20read

@@ -12,7 +12,6 @@ config = {}
 # Read current configuration from the environment file
 config["host"] = os.getenv("TRAEFIK_HOST","")
 config["lets_encrypt"] = os.getenv("TRAEFIK_LETS_ENCRYPT") == "True"
-config["http2https"] = os.getenv("TRAEFIK_HTTP2HTTPS") == "True"
 config["matomo_database_username"] = os.getenv("MATOMO_DATABASE_USERNAME","matomo")
 config["matomo_database_password"] = os.getenv("MATOMO_DATABASE_PASSWORD","Matomo,1234")
 config["matomo_database_dbname"] = os.getenv("MATOMO_DATABASE_DBNAME","matomo")

imageroot/actions/restore-module/40restore_database

@@ -33,9 +33,5 @@ podman run \
   --network=none \
   --volume=./initdb.d:/docker-entrypoint-initdb.d:z \
   --volume mysql-data:/var/lib/mysql/:Z \
-  --env MARIADB_ROOT_PASSWORD=Nethesis,1234 \
-  --env MARIADB_DATABASE=matomo \
-  --env MARIADB_USER=matomo \
-  --env MARIADB_PASSWORD=Matomo,1234 \
-  --replace --name=restore_db \
-  ${MARIADB_IMAGE}
+  --env-file=database.env \
+  "${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 --now matomo.service
+systemctl --user restart --now matomo.service

imageroot/etc/state-include.conf

@@ -1,4 +1,6 @@
 state/matomo.sql
+state/database.env
+state/matomo.env
 volumes/matomo-app
 volumes/./config
 volumes/configs

imageroot/systemd/user/matomo-app.service

@@ -22,13 +22,7 @@ ExecStartPost=/usr/bin/bash -c "while ! /usr/bin/podman exec matomo-app /usr/bin
 ExecStart=/usr/bin/podman run --conmon-pidfile %t/matomo-app.pid \
     --cidfile %t/matomo-app.ctr-id --cgroups=no-conmon \
     --pod-id-file %t/matomo.pod-id --replace -d --name  matomo-app \
-    --env=MATOMO_* \
-    --env MATOMO_DATABASE_ADAPTER=mysql \
-    --env MATOMO_DATABASE_HOST=127.0.0.1 \
-    --env MATOMO_DATABASE_TABLES_PREFIX=matomo \
-    --env MATOMO_DATABASE_USERNAME=matomo \
-    --env MATOMO_DATABASE_PASSWORD=Matomo,1234 \
-    --env MATOMO_DATABASE_DBNAME=matomo \
+    --env-file=%S/state/matomo.env \
     --volume matomo-app:/var/www/html/:Z \
     --volume ./config:/tmp:Z \
     --volume configs:/var/www/html/config \

imageroot/systemd/user/matomo-mariadb.service

@@ -12,24 +12,18 @@ After=matomo.service
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n
 EnvironmentFile=%S/state/environment
+EnvironmentFile=%S/state/database.env
 Restart=always
 TimeoutStopSec=70
 ExecStartPre=/bin/rm -f %t/matomo-mariadb.pid %t/matomo-mariadb.ctr-id
 ExecStart=/usr/bin/podman run --conmon-pidfile %t/matomo-mariadb.pid \
     --cidfile %t/matomo-mariadb.ctr-id --cgroups=no-conmon \
     --pod-id-file %t/matomo.pod-id --replace -d --name matomo-mariadb \
-    --env-file=%S/state/environment \
+    --env-file=%S/state/database.env \
     --volume mysql-data:/var/lib/mysql/:Z \
-    --env MARIADB_AUTO_UPGRADE=1 \
-    --env MARIADB_DISABLE_UPGRADE_BACKUP=1 \
-    --env MARIADB_ROOT_PASSWORD=Nethesis,1234 \
-    --env MARIADB_DATABASE=matomo \
-    --env MARIADB_USER=matomo \
-    --env MARIADB_PASSWORD=Matomo,1234 \
-    --env MARIADB_AUTO_UPGRADE=1 \
     ${MARIADB_IMAGE} \
     --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
-ExecStartPost=/usr/bin/podman exec  matomo-mariadb /bin/bash -c 'printf "[client] \npassword=Nethesis,1234" > /root/.my.cnf'
+ExecStartPost=/usr/bin/podman exec  matomo-mariadb /bin/bash -c 'printf "[client] \npassword=${MARIADB_ROOT_PASSWORD}" > /root/.my.cnf'
 ExecStartPost=/usr/bin/podman exec matomo-mariadb /bin/bash -c "while ! mysqladmin ping -h localhost -P 3306 -u root; do sleep 1; done"
 ExecStop=/usr/bin/podman stop --ignore --cidfile %t/matomo-mariadb.ctr-id -t 10
 ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/matomo-mariadb.ctr-id

ui/README.md

@@ -1,3 +1,3 @@
-# NS8 kickstart UI development
+# NS8 matomo UI development
 
-To develop kickstart UI please refer to [this section of the Developer manual](https://nethserver.github.io/ns8-core/ui/modules/#module-ui-development).
+To develop matomo UI please refer to [this section of the Developer manual](https://nethserver.github.io/ns8-core/ui/modules/#module-ui-development).