diff --git a/install-koji-farm.sh b/install-koji-farm.sh index 0fff071..8094996 100644 --- a/install-koji-farm.sh +++ b/install-koji-farm.sh @@ -66,6 +66,8 @@ done # setup default parameters KOJI_HUB_FQDN="$(hostname -f)" +HTTPD_USER=apache +HTTPD_DOCUMENT_ROOT=/var/www/html KOJI_DIR="/mnt/koji" TAG_NAME="sme" RPM_ARCH="x86_64 noarch" @@ -74,13 +76,15 @@ SRC_RPM_DIR= BIN_RPM_DIR= DEBUG_RPM_DIR= EXTERNAL_REPO="http://buildsys.koozali.org/build/7/os/\$arch/" +POSTGRES_USER=postgres +POSTGRES_DIR=/var/lib/pgsql # create the parameter script used by koji scripts cat > $SCRIPT_DIR/koji-parameters.sh <<- EOT #!/bin/bash ## HTTPD settings -export HTTPD_USER=apache -export HTTPD_DOCUMENT_ROOT=/var/www/html +export HTTPD_USER=$HTTPD_USER +export HTTPD_DOCUMENT_ROOT=$HTTPD_DOCUMENT_ROOT ## KOJI RPM BUILD AND TRACKER export SCRIPT_GIT=$SCRIPT_GIT export KOJI_DIR=$KOJID_DIR @@ -89,7 +93,7 @@ export KOJI_URL=http://"$KOJI_HUB_FQDN" export KOJID_CAPACITY=$KOJID_CAPACITY export TAG_NAME=$TAG_NAME # Use for koji SSL certificates -export KOJI_PKI_DIR=/etc/pki/koji +export KOJI_PKI_DIR=$KOJI_PKI_DIR export COUNTRY_CODE='$COUNTRY_CODE' export STATE='$STATE' export LOCATION='$LOCATION' @@ -103,8 +107,8 @@ export DEBUG_RPM_DIR=$DEBUG_PRM_DIR # Comment the following if supplying all RPMs as an upstream and not a downstream export EXTERNAL_REPO=$EXTERNAL_REPO ## POSTGRESQL DATABASE -export POSTGRES_USER=postgres -export POSTGRES_DIR=/var/lib/pgsql +export POSTGRES_USER=$POSTGRES_USER +export POSTGRES_DIR=$POSTGRES_DIR EOT chmod o+x $SCRIPT_DIR/koji-parameters.sh