From 250280a2c769e06f74e27bac7cf851bee2e1a006 Mon Sep 17 00:00:00 2001
From: oliver <oliver@odoo4projects.com>
Date: Tue, 13 Oct 2026 09:23:36 -0300
Subject: [PATCH] update

---
 app/sbin/activeContainers  | 17 +++++++++++++++++
 app/sbin/restartContainers |  2 +-
 app/sbin/startContainer    |  2 +-
 app/templates/pg_hba.conf  |  2 +-
 app/update                 |  4 ++--
 app/update_sbin            |  6 ++++++
 6 files changed, 28 insertions(+), 5 deletions(-)
 create mode 100755 app/sbin/activeContainers

diff --git a/app/sbin/activeContainers b/app/sbin/activeContainers
new file mode 100755
index 0000000..c71652a
--- /dev/null
+++ b/app/sbin/activeContainers
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+# List containers whose contract has not expired yet, next to expire first.
+# Output: UUID, email, expires (header + aligned columns).
+
+DB_PATH="/4server/data/contracts.db"
+
+if [ ! -f "$DB_PATH" ]; then
+    echo "$(date '+%Y-%m-%d %H:%M:%S') ERROR: database not found at $DB_PATH" >&2
+    exit 1
+fi
+
+sqlite3 -header -column "$DB_PATH" "
+    SELECT UUID AS uuid, email, expires
+    FROM containers
+    WHERE expires > date('now')
+    ORDER BY expires ASC;
+"
diff --git a/app/sbin/restartContainers b/app/sbin/restartContainers
index 93f5f11..30591ae 100755
--- a/app/sbin/restartContainers
+++ b/app/sbin/restartContainers
@@ -1,5 +1,5 @@
 #!/bin/bash
-
+cd /4server
 # Check that a search string was provided
 if [ -z "$1" ]; then
     echo "$(date '+%Y-%m-%d %H:%M:%S') Usage: $0 <search_string>"
diff --git a/app/sbin/startContainer b/app/sbin/startContainer
index 91b6bd6..15bfbfe 100755
--- a/app/sbin/startContainer
+++ b/app/sbin/startContainer
@@ -3,7 +3,7 @@
 # Example: ./start_by_uuid.sh abc-001-xxxx-xxxx-xxxx
 exec > /4server/data/log/startContainer.log 2>&1
 echo "$(date '+%Y-%m-%d %H:%M:%S') Start container $1"
-
+cd/4server
 source /4server/sbin/helpers
 
 BIN_PATH="/4server/sbin"
diff --git a/app/templates/pg_hba.conf b/app/templates/pg_hba.conf
index d424dd3..bd5c524 100644
--- a/app/templates/pg_hba.conf
+++ b/app/templates/pg_hba.conf
@@ -1,3 +1,3 @@
 # Example: allow your host to connect to all DBs as any user with password
-host    all     all     10.5.0.1/32       md5
+host    all     all     10.5.0.1/16       md5
 
diff --git a/app/update b/app/update
index 9c7eb6d..48f68ef 100755
--- a/app/update
+++ b/app/update
@@ -35,8 +35,8 @@ prsync -h "/app/host_vars/hosts" -avz ./sbin/ /4server/sbin/
 
 ### POSTGRESS
 rex mkdir -p /4server/data/postgres/etc
-template templates/pg_hba.conf /4server/data/postgres/etc/pg_hba.conf
-template templates/postgresql.conf /4server/data/postgres/etc/postgresql.conf
+template templates/pg_hba.conf /4server/data/postgres/data/pg_hba.conf
+template templates/postgresql.conf /4server/data/postgres/data/postgresql.conf
 
 
 
diff --git a/app/update_sbin b/app/update_sbin
index ae0b36c..d04fbae 100755
--- a/app/update_sbin
+++ b/app/update_sbin
@@ -12,3 +12,9 @@ rex doas rc-service checkCalls restart
 prsync -h "/app/host_vars/hosts" -avz ./host_vars/borg-backup/* /home/4server/.ssh
 rex doas chown 4server:4server /home/4server/.ssh/borg*
 rex doas chmod 600 /home/4server/.ssh/borg*
+
+
+# link all save scripts to /usr/sbin
+rex doas ln -s /4server/sbin/activeContainers /usr/bin/
+rex doas ln -s /4server/sbin/startContainer /usr/bin/
+rex doas ln -s /4server/sbin/restartContainers /usr/bin/