Isolate user-facing parameters

This commit is contained in:
George T Kramer
2019-01-07 13:09:24 -08:00
parent 9fcbf230a4
commit 66d8fff4b4
9 changed files with 27 additions and 14 deletions

View File

@@ -4,6 +4,7 @@
set -xe
SCRIPT_DIR="$(dirname "$(realpath "$0")")"
source "$SCRIPT_DIR"/globals.sh
source "$SCRIPT_DIR"/parameters.sh
if [[ -n "$SRC_RPM_DIR" && -n "$BIN_RPM_DIR" ]]; then

View File

@@ -4,6 +4,7 @@
set -xe
SCRIPT_DIR="$(dirname "$(realpath "$0")")"
source "$SCRIPT_DIR"/globals.sh
source "$SCRIPT_DIR"/parameters.sh
swupd bundle-add scm-server httpd

View File

@@ -4,6 +4,7 @@
set -xe
SCRIPT_DIR="$(dirname "$(realpath "$0")")"
source "$SCRIPT_DIR"/globals.sh
source "$SCRIPT_DIR"/parameters.sh
# Install kojid

View File

@@ -4,6 +4,7 @@
set -xe
SCRIPT_DIR="$(dirname "$(realpath "$0")")"
source "$SCRIPT_DIR"/globals.sh
source "$SCRIPT_DIR"/parameters.sh
swupd bundle-add storage-utils

View File

@@ -4,6 +4,7 @@
set -xe
SCRIPT_DIR="$(dirname "$(realpath "$0")")"
source "$SCRIPT_DIR"/globals.sh
source "$SCRIPT_DIR"/parameters.sh
# INSTALL KOJI

View File

@@ -4,6 +4,7 @@
set -xe
SCRIPT_DIR="$(dirname "$(realpath "$0")")"
source "$SCRIPT_DIR"/globals.sh
source "$SCRIPT_DIR"/parameters.sh
swupd bundle-add koji

View File

@@ -4,6 +4,7 @@
set -xe
SCRIPT_DIR="$(dirname "$(realpath "$0")")"
source "$SCRIPT_DIR"/globals.sh
source "$SCRIPT_DIR"/parameters.sh
mkdir -p "$UPSTREAMS_DIR"

16
koji-setup/globals.sh Normal file
View File

@@ -0,0 +1,16 @@
#!/bin/bash
# Copyright (C) 2018 Intel Corporation
# SPDX-License-Identifier: Apache-2.0
#### START DO NOT EDIT ####
export GIT_USER=gitolite
export GIT_DEFAULT_DIR=/var/lib/gitolite
export POSTGRES_USER=postgres
export POSTGRES_DEFAULT_DIR=/var/lib/pgsql
export HTTPD_USER=httpd
export HTTPD_DOCUMENT_ROOT=/var/www/html
export KOJI_PKI_DIR=/etc/pki/koji
#### END DO NOT EDIT ####

View File

@@ -11,12 +11,11 @@ export KOJI_SLAVE_FQDN="$KOJI_MASTER_FQDN"
export KOJID_CAPACITY=16
export TAG_NAME=clear
# Use for koji SSL certificates
export KOJI_PKI_DIR=/etc/pki/koji
export COUNTRY_CODE=US
export STATE=Oregon
export LOCATION=Hillsboro
export COUNTRY_CODE='Example Country Code'
export STATE='Example State'
export LOCATION='Example Location'
export ORGANIZATION='Example Organization'
export ORG_UNIT='Example Unit'
export ORG_UNIT='Example Org Unit'
# Use for importing existing RPMs
export RPM_ARCH='x86_64'
export SRC_RPM_DIR=
@@ -27,22 +26,13 @@ export EXTERNAL_REPO=https://cdn.download.clearlinux.org/releases/"$(curl https:
## POSTGRESQL DATABASE
export POSTGRES_DIR=/srv/pgsql
export POSTGRES_DEFAULT_DIR=/var/lib/pgsql
export POSTGRES_USER=postgres
## GIT REPOSITORIES
export GIT_DIR=/srv/gitolite
export GIT_DEFAULT_DIR=/var/lib/gitolite
export GIT_USER=gitolite
export GIT_FQDN="$KOJI_MASTER_FQDN"
export IS_ANONYMOUS_GIT_NEEDED=false
export GITOLITE_PUB_KEY=''
## APACHE WEB SERVER
export HTTPD_USER=httpd
# Autoindexing should occur in this directory by default
export HTTPD_DOCUMENT_ROOT=/var/www/html
## UPSTREAMS CACHE
export UPSTREAMS_DIR=/srv/upstreams