Skip to content

Misc fixes/cleanup #333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JedMeister wants to merge 1 commit into
base: 19.x-dev
Choose a base branch
from
Open

Misc fixes/cleanup #333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions conf/bootstrap_apt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ else
chmod a+r "$keyring"
done
# ensure that gpg-agent is killed after processing keys
kill -9 "$(pidof gpg-agent)" || true
gpgconf --kill gpg-agent
rm -rf "$key_dir"/*~
rm -rf "$HOME/.gnupg"
fi
Expand All @@ -210,7 +210,6 @@ Suites: $KEY_CODENAME
Components: main
Architectures: ${SUPPORTED_ARCH[*]}
Enabled: $tkl_apt_repo_enabled

Signed-By: /usr/share/keyrings/tkl-archive-keyring.gpg

Types: deb
Expand Down
2 changes: 2 additions & 0 deletions mk/turnkey.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ CONF_VARS += CREDIT_STYLE CREDIT_STYLE_EXTRA CREDIT_ANCHORTEXT CREDIT_LOCATION
CONF_VARS += GITHUB_USER GITHUB_USER_TOKEN
# for dynamically adding pins to sury & backports respectively
CONF_VARS += PHP_EXTRA_PINS BACKPORTS_PINS
# proxy vars
CONF_VARS += NO_PROXY HTTP_PROXY HTTPS_PROXY

COMMON_OVERLAYS := turnkey.d $(COMMON_OVERLAYS)
COMMON_CONF := turnkey.d $(COMMON_CONF)
Expand Down