Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

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: 2 additions & 1 deletion Dockerfile.centos7
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,8 @@ ARG UPGRADE_MOD_AUTH_OPENIDC=False
# NOTE: source for optional mod auth openidc upgrade - upstream release if left unset
ARG UPGRADE_OIDC_CJOSE_SRC=""
ARG UPGRADE_OIDC_AUTH_MOD_SRC=""
ARG UPGRADE_PARAMIKO=False
# NOTE: more recent paramiko is required e.g. for modern host key algo and security fixes
ARG UPGRADE_PARAMIKO=True
ARG PUBKEY_FROM_DNS=False
ARG WITH_PY3=False
ARG PREFER_PYTHON3=False
Expand Down
1 change: 1 addition & 0 deletions Dockerfile.rocky8
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ ARG UPGRADE_MOD_AUTH_OPENIDC=False
# https://github.com/OpenIDC/mod_auth_openidc/releases
ARG UPGRADE_OIDC_CJOSE_SRC=""
ARG UPGRADE_OIDC_AUTH_MOD_SRC=""
# NOTE: paramiko is a bit dated in OS repo - allow optional upgrade
ARG UPGRADE_PARAMIKO=False
ARG PUBKEY_FROM_DNS=False
# NOTE: python2 support is going away in rocky8+
Expand Down
1 change: 1 addition & 0 deletions Dockerfile.rocky9
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ ARG UPGRADE_MOD_AUTH_OPENIDC=False
# https://github.com/OpenIDC/mod_auth_openidc/releases
ARG UPGRADE_OIDC_CJOSE_SRC=""
ARG UPGRADE_OIDC_AUTH_MOD_SRC=""
# NOTE: paramiko is a bit dated in OS repo - allow optional upgrade
ARG UPGRADE_PARAMIKO=False
ARG PUBKEY_FROM_DNS=False
# NOTE: python2 support is gone on rocky9+
Expand Down
3 changes: 2 additions & 1 deletion development.env
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,8 @@ WWWSERVE_MAX_BYTES=-1
# but using self-signed certs is already a bad hack.
ENABLE_SELF_SIGNED_CERTS=True
UPGRADE_MOD_AUTH_OPENIDC=False
UPGRADE_PARAMIKO=False
# NOTE: leave the choice of paramiko to the Dockerfile default here as it's only required on old distros
#UPGRADE_PARAMIKO=False
PUBKEY_FROM_DNS=False
# NOTE: stay with wsgidav-1.3 for python2 to avoid CVE-2022-41905, we already get 4.3+ for python3
MODERN_WSGIDAV=False
Expand Down
3 changes: 2 additions & 1 deletion development_gdp.env
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,8 @@ WWWSERVE_MAX_BYTES=-1
# but using self-signed certs is already a bad hack.
ENABLE_SELF_SIGNED_CERTS=True
UPGRADE_MOD_AUTH_OPENIDC=False
UPGRADE_PARAMIKO=False
# NOTE: leave the choice of paramiko to the Dockerfile default here as it's only required on old distros
#UPGRADE_PARAMIKO=False
PUBKEY_FROM_DNS=False
# NOTE: stay with wsgidav-1.3 for python2 to avoid CVE-2022-41905, we already get 4.3+ for python3
MODERN_WSGIDAV=False
Expand Down
4 changes: 2 additions & 2 deletions doc/source/sections/configuration/variables.rst
Original file line number Diff line number Diff line change
Expand Up @@ -477,8 +477,8 @@ Variables
-
- Optional custom source for the cjose OpenIDC dependency package if UPGRADE_MOD_AUTH_OPENIDC is requested
* - UPGRADE_PARAMIKO
- False
- Upgrade the default Paramiko version to latest supported one during build
-
- Upgrade the default Paramiko version to latest supported one during build. Leave unset to pick default from active Dockerfile.
* - PUBKEY_FROM_DNS
- False
- Advertize to SFTP users that they can find the host key in DNS(SEC).
Expand Down
4 changes: 2 additions & 2 deletions production.env
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@ WWWSERVE_MAX_BYTES=-1
ENABLE_SELF_SIGNED_CERTS=False
#BUILD_MOD_AUTH_OPENID=False
UPGRADE_MOD_AUTH_OPENIDC=True
# Use a recent paramiko for modern host key algo support in grid_sftp (ENABLE_SFTP)
UPGRADE_PARAMIKO=True
# NOTE: leave the choice of paramiko to the Dockerfile default here as it's only required on old distros
#UPGRADE_PARAMIKO=True
PUBKEY_FROM_DNS=False
# NOTE: stay with wsgidav-1.3 for python2 to avoid CVE-2022-41905, we already get 4.3+ for python3
MODERN_WSGIDAV=False
Expand Down