mirror of
git://f0xx.org/ac/ac-deploy
synced 2026-07-29 03:38:07 +03:00
fix deploy-ac-broadcast: use mariadb -u root; add broadcast+sfu to CORE subs
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -33,7 +33,7 @@ AC_WORKSPACE_ORIGIN=git://f0xx.org/ac/ac-workspace
|
|||||||
AC_WORKSPACE_ROOT=/var/www/ac/workspace
|
AC_WORKSPACE_ROOT=/var/www/ac/workspace
|
||||||
AC_GIT_BRANCH=next
|
AC_GIT_BRANCH=next
|
||||||
# Minimal submodules for first workspace init (fast path)
|
# 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)
|
# 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"
|
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
|
URL_SHORTENER_ORIGIN=git://f0xx.org/ac/ac-ms-url-shortener
|
||||||
|
|||||||
@@ -18,7 +18,8 @@ mkdir -p "$BROADCAST_DEST"
|
|||||||
rsync -a --delete \
|
rsync -a --delete \
|
||||||
--exclude='.git' \
|
--exclude='.git' \
|
||||||
--exclude='config/config.php' \
|
--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
|
# Config from cluster env / secrets
|
||||||
DB_PASS="$(read_cred mariadb_app password 2>/dev/null || echo 'CHANGE_ME')"
|
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"
|
log "broadcast: create DB + user on primary"
|
||||||
DB_SCHEMA="${BROADCAST_SRC}/sql/schema.mariadb.sql"
|
DB_SCHEMA="${BROADCAST_SRC}/sql/schema.mariadb.sql"
|
||||||
if [ -f "$DB_SCHEMA" ]; then
|
if [ -f "$DB_SCHEMA" ]; then
|
||||||
sudo -u mysql mariadb --socket=/run/mysqld/mysqld.sock < "$DB_SCHEMA" || true
|
mariadb -u root < "$DB_SCHEMA" || true
|
||||||
sudo -u mysql mariadb --socket=/run/mysqld/mysqld.sock <<SQLEOF
|
mariadb -u root <<SQLEOF
|
||||||
CREATE USER IF NOT EXISTS 'broadcast_svc'@'%' IDENTIFIED BY '${DB_PASS}';
|
CREATE USER IF NOT EXISTS 'broadcast_svc'@'%' IDENTIFIED BY '${DB_PASS}';
|
||||||
|
CREATE USER IF NOT EXISTS 'broadcast_svc'@'localhost' IDENTIFIED BY '${DB_PASS}';
|
||||||
GRANT ALL PRIVILEGES ON broadcast.* TO 'broadcast_svc'@'%';
|
GRANT ALL PRIVILEGES ON broadcast.* TO 'broadcast_svc'@'%';
|
||||||
|
GRANT ALL PRIVILEGES ON broadcast.* TO 'broadcast_svc'@'localhost';
|
||||||
FLUSH PRIVILEGES;
|
FLUSH PRIVILEGES;
|
||||||
SQLEOF
|
SQLEOF
|
||||||
log "broadcast: DB schema applied"
|
log "broadcast: DB schema applied"
|
||||||
|
|||||||
Reference in New Issue
Block a user