diff --git a/app/sbin/start/ODOO_17 b/app/sbin/start/ODOO_17 new file mode 100755 index 0000000..299fc5b --- /dev/null +++ b/app/sbin/start/ODOO_17 @@ -0,0 +1,116 @@ +#!/bin/bash +echo "START ODOO 17" +# Load functions +source /4server/sbin/ODOO_19/ODOO_19.lib +source /4server/sbin/helpers +get_contract_info + +# Config variables +UUID="${UUID:-default}" +BRANCH="${BRANCH:-release}" + +ODOO_DB_USER="${UUID}" +export ODOO_DB_PASSWORD=$(echo "$SECRET" | jq -r '.psql') + + +echo "ENV: $HDD $DOMAIN_COUNT $BACKUP_SLOTS $CONTAINERDBID" +echo "DBID: $CONTAINERDBID" + +BASEURL="${BASEURL:-/4server/data/$UUID}" +DATA_DIR="$BASEURL/odoo/" +CUSTOM_DIR="$BASEURL/git/$UUID/custom/" +ENTERPRISE_DIR="$BASEURL/git/$UUID/enterprise/" +LOGS_DIR="$BASEURL/logs/" +CONFIG_DIR="$BASEURL/config/" +CC_DIR="$BASEURL/cc/" +BACKUP_DIR="/BACKUP/$UUID" +GIT_DIR="$BASEURL/git-server/" +INSTALL_DIR="$BASEURL/install/" +SSH_DIR="$BASEURL/.ssh/" +ETC_DIR="$BASEURL/etc/" + +SERVER_IP=$(ip -4 addr show eth0 | awk '/inet/ {print $2}' | cut -d/ -f1 | head -n1) + +LABEL_DOMAINS=("$UUID.odoo4projects.com") +if [ -f "$BASEURL/etc/domain" ]; then + while IFS= read -r domain || [[ -n $domain ]]; do + [ -z "$domain" ] && continue + LABEL_DOMAINS+=("$domain") + done < "$BASEURL/etc/domain" +else + echo "[DEBUG] No additional domain file found at $BASEURL/etc/domain" +fi + +RULE="" +for d in "${LABEL_DOMAINS[@]}"; do + RESOLVED_IP=$(nslookup "$d" 2>/dev/null | awk '/^Address: / { print $2 }' | head -n1 || true) + if [ -z "$RESOLVED_IP" ]; then + echo "[DEBUG] Could not resolve $d, skipping" + continue + fi + if [ "$RESOLVED_IP" = "$SERVER_IP" ]; then + RULE+=" || Host(\`$d\`)" + else + echo "[DEBUG] Skipping $d (does not match SERVER_IP $SERVER_IP)" + fi +done +RULE="${RULE# || }" +DOMAIN_LABEL="traefik.http.routers.$UUID.rule=$RULE" +echo "[DEBUG] Final Traefik label: $DOMAIN_LABEL" + +doas docker exec "$UUID" mkdir -p /var/lib/odoo/.local/share/Odoo/ +doas docker exec "$UUID" ln -s /home/odoo/.local/share/Odoo/filestore /var/lib/odoo/.local/share/Odoo/filestore + + +doas find "$BASEURL" -type d -exec chmod 777 {} \; +PORT=$((CONTAINERDBID + 2200)) +echo "PORT $PORT" +chmod 777 $ETC_DIR +chmod 77 $ETC_DIR/gitpath +echo "git clone \"ssh://git@${UUID}.odoo4projects.com:${PORT}/git-server/repos/odoo.git\"" > ${ETC_DIR}/gitpath +echo "GIIIT $ETC_DIR $PORT" + +doas docker stop "$UUID" 2>/dev/null +doas docker rm "$UUID" 2>/dev/null + +EXTRA_DOCKER_PARAMETER="" + +doas docker run -d --name "$UUID" \ + --network 4server_4projects \ + --restart=always \ + $EXTRA_DOCKER_PARAMETER \ + -v "$DATA_DIR/odoo-web-data:/home/odoo/.local/share/Odoo" \ + -v "$CUSTOM_DIR:/mnt/addons/custom" \ + -v "$ENTERPRISE_DIR:/mnt/addons/enterprise" \ + -v "$LOGS_DIR:/mnt/logs" \ + -v "$CC_DIR:/mnt/cc" \ + -v "$BACKUP_DIR:/mnt/backup" \ + -v "$GIT_DIR:/git-server" \ + -v "$INSTALL_DIR:/mnt/install" \ + -v "$SSH_DIR:/etc/sshkey" \ + -v "$ETC_DIR:/mnt/etc" \ + -p "$PORT:22" \ + -e HOST="beedb" \ + -e USER="$ODOO_DB_USER" \ + -e PASSWORD="$ODOO_DB_PASSWORD" \ + -e UUID="$UUID" \ + -e HDD="$HDD" \ + -e DOMAIN_COUNT="$DOMAIN_COUNT" \ + -e BACKUP_SLOTS="$BACKUP_SLOTS" \ + -e WORKER="$WORKER" \ + -e GIT="$GIT" \ + --label "$DOMAIN_LABEL" \ + --label "traefik.http.services.$UUID.loadbalancer.server.port=8069" \ + --label "traefic.http.routers.$UUID.entrypoints=web, websecure" \ + --label "traefik.http.routers.$UUID.tls.certresolver=production" \ + --label "traefik.http.routers.$UUID.tls=true" \ + --label "traefik.http.routers.$UUID.service=$UUID" \ + docker.odoo4projects.com/4projects/odoo_17:$BRANCH + + +doas docker exec $UUID chown -R odoo:odoo /home/odoo/.local +doas docker exec $UUID chown -R odoo:odoo /mnt/* + + + +check_and_create_db diff --git a/app/sbin/startContainer b/app/sbin/startContainer index cc48914..7169787 100755 --- a/app/sbin/startContainer +++ b/app/sbin/startContainer @@ -33,6 +33,13 @@ case "$SECOND_PART" in 003) "$BIN_PATH/start/ODOO_19" ;; + + 004) + "$BIN_PATH/start/ODOO_17" + ;; + + + *) echo "Unknown UUID type: $SECOND_PART" exit 2 diff --git a/app/vault/host_vars.img b/app/vault/host_vars.img index 91ff098..8aae806 100644 Binary files a/app/vault/host_vars.img and b/app/vault/host_vars.img differ