From 30efcfbbd9e6df1078c076c62c0254ae3ff8aeb5 Mon Sep 17 00:00:00 2001 From: Trevor Batley Date: Thu, 18 Jul 2024 10:24:25 +1000 Subject: [PATCH] they moved the base schema.sql file --- install-koji-farm.sh | 5 ++++- koji-setup/koji-deploy-hub.sh | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/install-koji-farm.sh b/install-koji-farm.sh index 84bd490..a806984 100644 --- a/install-koji-farm.sh +++ b/install-koji-farm.sh @@ -2,6 +2,7 @@ set -e DEBUG= +KOJI_GIT_URL="https://src.koozali.org/smedev/" KOJI_HUB_FQDN="$(hostname -f)" KOJI_WEB_FQDN=$KOJI_HUB_FQDN KOJI_ALLOWED_SCMS="src.koozali.org:/*" @@ -13,6 +14,8 @@ for param in "$@"; do echo "install-koji-farm.sh [web= | build= | scm= | debug]" ;; debug ) DEBUG="debug" ;; + giturl=* ) + KOJI_GIT_URL=${param#*=} ;; web=* ) KOJI_WEB_FQDN=${param#*=} ;; build=* ) @@ -67,7 +70,7 @@ for FQDN in ${KOJI_BUILD_FQDNS} ; do done # pull down the deploy scripts -SCRIPT_GIT="https://src.koozali.org/smedev/smeserver-koji/raw/branch/master/koji-setup" +SCRIPT_GIT=$KOJI_GIT_URL"smeserver-koji/raw/branch/master/koji-setup" SCRIPT_DIR="$(echo ~)/bin" echo "Loading required scripts and packages...." diff --git a/koji-setup/koji-deploy-hub.sh b/koji-setup/koji-deploy-hub.sh index 4068590..9eeb51f 100644 --- a/koji-setup/koji-deploy-hub.sh +++ b/koji-setup/koji-deploy-hub.sh @@ -163,7 +163,7 @@ useradd -r koji # Setup PostgreSQL and populate schema sudo -u "$POSTGRES_USER" createuser --no-superuser --no-createrole --no-createdb koji sudo -u "$POSTGRES_USER" createdb -O koji koji -sudo -u koji psql koji koji < /usr/share/doc/koji/docs/schema.sql +sudo -u koji psql koji koji < /usr/share/koji/schema.sql # Authorize Koji-web and Koji-hub resources cat > "$POSTGRES_DIR"/data/pg_hba.conf <<- EOF