diff --git a/sim/cluster0/cluster.env b/sim/cluster0/cluster.env index cad6f13..6c6d973 100644 --- a/sim/cluster0/cluster.env +++ b/sim/cluster0/cluster.env @@ -33,7 +33,7 @@ AC_WORKSPACE_ORIGIN=git://f0xx.org/ac/ac-workspace AC_WORKSPACE_ROOT=/var/www/ac/workspace AC_GIT_BRANCH=next # Minimal submodules for first workspace init (fast path) -AC_SUBMODULES_CORE="ac-platform-db ac-platform-php ac-platform-web ac-platform-edge ac-deploy ac-docs ac-scripts ac-ms-url-shortener ac-be-hub ac-ms-identity" +AC_SUBMODULES_CORE="ac-platform-db ac-platform-php ac-platform-web ac-platform-edge ac-deploy ac-docs ac-scripts ac-ms-url-shortener ac-be-hub ac-ms-identity ac-ms-broadcast ac-ms-sfu-signaling" # Full set required by compose-lab-backend.sh (init after workspace clone) AC_SUBMODULES_COMPOSE="ac-platform-php ac-platform-web ac-ms-identity ac-ms-rbac ac-ms-devices ac-ms-issues ac-ms-tickets ac-ms-graphs ac-ms-remote-access ac-be-auth ac-be-issues ac-be-tickets ac-be-graphs ac-be-remote-access ac-be-access ac-be-builder ac-ms-build" URL_SHORTENER_ORIGIN=git://f0xx.org/ac/ac-ms-url-shortener diff --git a/sim/cluster0/scripts/deploy-ac-broadcast.sh b/sim/cluster0/scripts/deploy-ac-broadcast.sh index 87028b7..3658b16 100755 --- a/sim/cluster0/scripts/deploy-ac-broadcast.sh +++ b/sim/cluster0/scripts/deploy-ac-broadcast.sh @@ -18,7 +18,8 @@ mkdir -p "$BROADCAST_DEST" rsync -a --delete \ --exclude='.git' \ --exclude='config/config.php' \ - "${BROADCAST_SRC}/" "${BROADCAST_DEST}/" + "${BROADCAST_SRC}/" "${BROADCAST_DEST}/" 2>/dev/null || \ + { mkdir -p "$BROADCAST_DEST"; cp -r "${BROADCAST_SRC}/." "${BROADCAST_DEST}/"; } # Config from cluster env / secrets DB_PASS="$(read_cred mariadb_app password 2>/dev/null || echo 'CHANGE_ME')" @@ -64,10 +65,12 @@ if is_primary_node; then log "broadcast: create DB + user on primary" DB_SCHEMA="${BROADCAST_SRC}/sql/schema.mariadb.sql" if [ -f "$DB_SCHEMA" ]; then - sudo -u mysql mariadb --socket=/run/mysqld/mysqld.sock < "$DB_SCHEMA" || true - sudo -u mysql mariadb --socket=/run/mysqld/mysqld.sock <