they moved the base schema.sql file

This commit is contained in:
Trevor Batley 2024-07-18 10:24:25 +10:00
parent c6d5482dfd
commit 30efcfbbd9
2 changed files with 5 additions and 2 deletions

View File

@ -2,6 +2,7 @@
set -e set -e
DEBUG= DEBUG=
KOJI_GIT_URL="https://src.koozali.org/smedev/"
KOJI_HUB_FQDN="$(hostname -f)" KOJI_HUB_FQDN="$(hostname -f)"
KOJI_WEB_FQDN=$KOJI_HUB_FQDN KOJI_WEB_FQDN=$KOJI_HUB_FQDN
KOJI_ALLOWED_SCMS="src.koozali.org:/*" KOJI_ALLOWED_SCMS="src.koozali.org:/*"
@ -13,6 +14,8 @@ for param in "$@"; do
echo "install-koji-farm.sh [web=<web FQDN> | build=<builder FQDN> | scm=<scm:/*> | debug]" ;; echo "install-koji-farm.sh [web=<web FQDN> | build=<builder FQDN> | scm=<scm:/*> | debug]" ;;
debug ) debug )
DEBUG="debug" ;; DEBUG="debug" ;;
giturl=* )
KOJI_GIT_URL=${param#*=} ;;
web=* ) web=* )
KOJI_WEB_FQDN=${param#*=} ;; KOJI_WEB_FQDN=${param#*=} ;;
build=* ) build=* )
@ -67,7 +70,7 @@ for FQDN in ${KOJI_BUILD_FQDNS} ; do
done done
# pull down the deploy scripts # 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" SCRIPT_DIR="$(echo ~)/bin"
echo "Loading required scripts and packages...." echo "Loading required scripts and packages...."

View File

@ -163,7 +163,7 @@ useradd -r koji
# Setup PostgreSQL and populate schema # Setup PostgreSQL and populate schema
sudo -u "$POSTGRES_USER" createuser --no-superuser --no-createrole --no-createdb koji sudo -u "$POSTGRES_USER" createuser --no-superuser --no-createrole --no-createdb koji
sudo -u "$POSTGRES_USER" createdb -O koji 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 # Authorize Koji-web and Koji-hub resources
cat > "$POSTGRES_DIR"/data/pg_hba.conf <<- EOF cat > "$POSTGRES_DIR"/data/pg_hba.conf <<- EOF