-
Notifications
You must be signed in to change notification settings - Fork 15
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Remove PASS_NAME_{GPG,KEY} from main settings file
The values were specific to Foreman, but we have other projects. The code is now modified to ensure the variables are set before they're used. It now also loads the common Foreman settings file for projects that inherit the Foreman settings. Previously it only loaded the version specific settings. Some care is taken in Foreman's common settings to only export values when no inheritance is taking place.
- Loading branch information
Showing
5 changed files
with
33 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,6 +2,8 @@ | |
|
||
. settings | ||
|
||
require_pass_name_key | ||
|
||
if [[ ! -d "$KEYDIR" ]] ; then | ||
mkdir -p -m 0700 "$KEYDIR" | ||
fi | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,11 @@ | ||
TAR_PROJECTS="foreman foreman-proxy foreman-installer foreman-selinux" | ||
RPM_PACKAGES=(foreman foreman-installer foreman-proxy foreman-release foreman-selinux) | ||
PACKAGING_SUBDIR="packages/foreman" | ||
# This deals with inheritance with other projects | ||
if [[ -z $FOREMAN_VERSION ]] ; then | ||
TAR_PROJECTS="foreman foreman-proxy foreman-installer foreman-selinux" | ||
RPM_PACKAGES=(foreman foreman-installer foreman-proxy foreman-release foreman-selinux) | ||
PACKAGING_SUBDIR="packages/foreman" | ||
else | ||
FOREMAN_VERSION=$VERSION | ||
fi | ||
|
||
PASS_NAME_GPG="theforeman/releases/foreman/${FOREMAN_VERSION}-gpg" | ||
PASS_NAME_KEY="theforeman/releases/foreman/${FOREMAN_VERSION}-key" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters