upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-06-06 15:22:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Correct behavior on oracle linux 6.

Browse source
This commit is contained in:
Adrien Ferrand 2019-10-02 01:05:08 +02:00
parent 4bc4bce5f5
commit 6f1121921d
3 changed files with 22 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
letsencrypt-auto-source/letsencrypt-auto
View file

@ -481,6 +481,8 @@ BOOTSTRAP_RPM_PYTHON3_LEGACY_VERSION=1
# This function checks if rh-python36 can be installed.
CheckPython36SCLAvailability() {
InitializeRPMCommonBase >/dev/null 2>&1;
if "${TOOL}" list rh-python36 >/dev/null 2>&1; then
return 0
fi
@ -823,14 +825,10 @@ elif [ -f /etc/redhat-release ]; then
# Handle legacy RPM distributions
if [ "$PYVER" -eq 26 ]; then
# Check if the automated bootstrap can be achieved on this system.
# Check if the automated rebootstrap can be achieved on this system.
if ! CheckPython36SCLAvailability; then
INTERACTIVE_BOOTSTRAP=1
INTERACTIVE_BOOTSTRAP_MESSAGE="
To use Certbot on this operating system, packages from the SCL repository need to be installed.
Certbot-auto cannot do that automatically: please refer to the official documentation for your
system and see how to enable SCL manually.
"
INTERACTIVE_REBOOTSTRAP=1
INTERACTIVE_REBOOTSTRAP_MESSAGE="Enable the SCL repository and try running Certbot again."
fi
Bootstrap() {
@ -1157,12 +1155,12 @@ if [ "$1" = "--le-auto-phase2" ]; then
# Check if we can rebootstrap without manual user intervention: this require that
# certbot-auto is in non-interactive mode AND selected bootstrap does not claim to
# require a manual user intervention.
if [ "${NONINTERACTIVE}" = 1 -a "${INTERACTIVE_BOOTSTRAP}" != 1 ]; then
if [ "${NONINTERACTIVE}" = 1 -a "${INTERACTIVE_REBOOTSTRAP}" != 1 ]; then
CAN_REBOOTSTRAP=1
fi
# Check if rebootstrap can be done non-interactively and current shell is non-interactive
# (true if stdin and stdout are not attached to a terminal).
if [ \( "$NONINTERACTIVE" = 1 \) -o \( \( -t 0 \) -a \( -t 1 \) \) ]; then
if [ \( "${CAN_REBOOTSTRAP}" = 1 \) -o \( \( -t 0 \) -a \( -t 1 \) \) ]; then
if [ -d "$VENV_PATH" ]; then
rm -rf "$VENV_PATH"
fi
@ -1177,11 +1175,11 @@ if [ "$1" = "--le-auto-phase2" ]; then
else
# If it is because of the bootstrap, --non-interactive will be of no use.
# Display the OS-specific interactive bootstrap message.
if [ "${INTERACTIVE_BOOTSTRAP}" != 1 ]; then
error "Skipping upgrade because new OS dependencies need to be installed, and"
error "certbot-auto cannot do that without a manual user intervention."
if [ "${INTERACTIVE_REBOOTSTRAP}" = 1 ]; then
error "Skipping upgrade because new OS dependencies need to be installed."
error "This requires a manual user intervention."
error "${INTERACTIVE_REBOOTSTRAP_MESSAGE}"
error
error "${INTERACTIVE_BOOTSTRAP_MESSAGE}"
# If this is because of the environment (eg. non interactive shell without
# --non-interactive flag set, help the user in that direction.
else

22
letsencrypt-auto-source/letsencrypt-auto.template
View file

@ -355,14 +355,10 @@ elif [ -f /etc/redhat-release ]; then
# Handle legacy RPM distributions
if [ "$PYVER" -eq 26 ]; then
# Check if the automated bootstrap can be achieved on this system.
# Check if the automated rebootstrap can be achieved on this system.
if ! CheckPython36SCLAvailability; then
INTERACTIVE_BOOTSTRAP=1
INTERACTIVE_BOOTSTRAP_MESSAGE="
To use Certbot on this operating system, packages from the SCL repository need to be installed.
Certbot-auto cannot do that automatically: please refer to the official documentation for your
system and see how to enable SCL manually.
"
INTERACTIVE_REBOOTSTRAP=1
INTERACTIVE_REBOOTSTRAP_MESSAGE="Enable the SCL repository and try running Certbot again."
fi
Bootstrap() {
@ -581,12 +577,12 @@ if [ "$1" = "--le-auto-phase2" ]; then
# Check if we can rebootstrap without manual user intervention: this require that
# certbot-auto is in non-interactive mode AND selected bootstrap does not claim to
# require a manual user intervention.
if [ "${NONINTERACTIVE}" = 1 -a "${INTERACTIVE_BOOTSTRAP}" != 1 ]; then
if [ "${NONINTERACTIVE}" = 1 -a "${INTERACTIVE_REBOOTSTRAP}" != 1 ]; then
CAN_REBOOTSTRAP=1
fi
# Check if rebootstrap can be done non-interactively and current shell is non-interactive
# (true if stdin and stdout are not attached to a terminal).
if [ \( "$NONINTERACTIVE" = 1 \) -o \( \( -t 0 \) -a \( -t 1 \) \) ]; then
if [ \( "${CAN_REBOOTSTRAP}" = 1 \) -o \( \( -t 0 \) -a \( -t 1 \) \) ]; then
if [ -d "$VENV_PATH" ]; then
rm -rf "$VENV_PATH"
fi
@ -601,11 +597,11 @@ if [ "$1" = "--le-auto-phase2" ]; then
else
# If it is because of the bootstrap, --non-interactive will be of no use.
# Display the OS-specific interactive bootstrap message.
if [ "${INTERACTIVE_BOOTSTRAP}" != 1 ]; then
error "Skipping upgrade because new OS dependencies need to be installed, and"
error "certbot-auto cannot do that without a manual user intervention."
if [ "${INTERACTIVE_REBOOTSTRAP}" = 1 ]; then
error "Skipping upgrade because new OS dependencies need to be installed."
error "This requires a manual user intervention."
error "${INTERACTIVE_REBOOTSTRAP_MESSAGE}"
error
error "${INTERACTIVE_BOOTSTRAP_MESSAGE}"
# If this is because of the environment (eg. non interactive shell without
# --non-interactive flag set, help the user in that direction.
else

2
letsencrypt-auto-source/pieces/bootstrappers/rpm_python3_legacy.sh
View file

@ -4,6 +4,8 @@ BOOTSTRAP_RPM_PYTHON3_LEGACY_VERSION=1
# This function checks if rh-python36 can be installed.
CheckPython36SCLAvailability() {
InitializeRPMCommonBase >/dev/null 2>&1;
if "${TOOL}" list rh-python36 >/dev/null 2>&1; then
return 0
fi