mirror of
https://github.com/bunkerity/bunkerized-nginx
synced 2023-12-13 21:30:18 +01:00
Lower the environnement variable for the mode
This commit is contained in:
parent
aa3ce13a81
commit
574ecbd6b3
9 changed files with 27 additions and 27 deletions
|
@ -22,8 +22,8 @@ from DockerController import DockerController
|
|||
|
||||
# Get variables
|
||||
logger = setup_logger("Autoconf", getenv("LOG_LEVEL", "INFO"))
|
||||
swarm = getenv("SWARM_MODE", "no") == "yes"
|
||||
kubernetes = getenv("KUBERNETES_MODE", "no") == "yes"
|
||||
swarm = getenv("SWARM_MODE", "no").lower() == "yes"
|
||||
kubernetes = getenv("KUBERNETES_MODE", "no").lower() == "yes"
|
||||
docker_host = getenv("DOCKER_HOST", "unix:///var/run/docker.sock")
|
||||
wait_retry_interval = getenv("WAIT_RETRY_INTERVAL", "5")
|
||||
|
||||
|
|
|
@ -129,11 +129,11 @@ class CLI(ApiCaller):
|
|||
self.auto_setup(self.__integration)
|
||||
|
||||
def __detect_integration(self) -> str:
|
||||
if self.__variables.get("KUBERNETES_MODE", "no") == "yes":
|
||||
if self.__variables.get("KUBERNETES_MODE", "no").lower() == "yes":
|
||||
return "kubernetes"
|
||||
elif self.__variables.get("SWARM_MODE", "no") == "yes":
|
||||
elif self.__variables.get("SWARM_MODE", "no").lower() == "yes":
|
||||
return "swarm"
|
||||
elif self.__variables.get("AUTOCONF_MODE", "no") == "yes":
|
||||
elif self.__variables.get("AUTOCONF_MODE", "no").lower() == "yes":
|
||||
return "autoconf"
|
||||
elif Path("/usr/share/bunkerweb/INTEGRATION").is_file():
|
||||
return Path("/usr/share/bunkerweb/INTEGRATION").read_text().strip().lower()
|
||||
|
|
|
@ -60,11 +60,11 @@ def get_version():
|
|||
|
||||
def get_integration():
|
||||
try:
|
||||
if getenv("KUBERNETES_MODE", "no") == "yes":
|
||||
if getenv("KUBERNETES_MODE", "no").lower() == "yes":
|
||||
return "kubernetes"
|
||||
elif getenv("SWARM_MODE", "no") == "yes":
|
||||
elif getenv("SWARM_MODE", "no").lower() == "yes":
|
||||
return "swarm"
|
||||
elif getenv("AUTOCONF_MODE", "no") == "yes":
|
||||
elif getenv("AUTOCONF_MODE", "no").lower() == "yes":
|
||||
return "autoconf"
|
||||
elif Path("/usr/share/bunkerweb/INTEGRATION").is_file():
|
||||
return Path("/usr/share/bunkerweb/INTEGRATION").read_text().strip().lower()
|
||||
|
|
|
@ -26,11 +26,11 @@ status = 0
|
|||
try:
|
||||
# Get env vars
|
||||
bw_integration = None
|
||||
if getenv("KUBERNETES_MODE") == "yes":
|
||||
if getenv("KUBERNETES_MODE", "no").lower() == "yes":
|
||||
bw_integration = "Kubernetes"
|
||||
elif getenv("SWARM_MODE") == "yes":
|
||||
elif getenv("SWARM_MODE", "no").lower() == "yes":
|
||||
bw_integration = "Swarm"
|
||||
elif getenv("AUTOCONF_MODE") == "yes":
|
||||
elif getenv("AUTOCONF_MODE", "no").lower() == "yes":
|
||||
bw_integration = "Autoconf"
|
||||
elif Path("/usr/share/bunkerweb/INTEGRATION").exists():
|
||||
bw_integration = Path("/usr/share/bunkerweb/INTEGRATION").read_text().strip()
|
||||
|
|
|
@ -28,11 +28,11 @@ status = 0
|
|||
try:
|
||||
# Get env vars
|
||||
bw_integration = None
|
||||
if getenv("KUBERNETES_MODE") == "yes":
|
||||
if getenv("KUBERNETES_MODE", "no").lower() == "yes":
|
||||
bw_integration = "Kubernetes"
|
||||
elif getenv("SWARM_MODE") == "yes":
|
||||
elif getenv("SWARM_MODE", "no").lower() == "yes":
|
||||
bw_integration = "Swarm"
|
||||
elif getenv("AUTOCONF_MODE") == "yes":
|
||||
elif getenv("AUTOCONF_MODE", "no").lower() == "yes":
|
||||
bw_integration = "Autoconf"
|
||||
elif Path("/usr/share/bunkerweb/INTEGRATION").exists():
|
||||
with open("/usr/share/bunkerweb/INTEGRATION", "r") as f:
|
||||
|
|
|
@ -84,11 +84,11 @@ if __name__ == "__main__":
|
|||
logger.info(f"Target : {args.target}")
|
||||
|
||||
integration = "Linux"
|
||||
if getenv("KUBERNETES_MODE", "no") == "yes":
|
||||
if getenv("KUBERNETES_MODE", "no").lower() == "yes":
|
||||
integration = "Kubernetes"
|
||||
elif getenv("SWARM_MODE", "no") == "yes":
|
||||
elif getenv("SWARM_MODE", "no").lower() == "yes":
|
||||
integration = "Swarm"
|
||||
elif getenv("AUTOCONF_MODE", "no") == "yes":
|
||||
elif getenv("AUTOCONF_MODE", "no").lower() == "yes":
|
||||
integration = "Autoconf"
|
||||
elif Path("/usr/share/bunkerweb/INTEGRATION").is_file():
|
||||
integration = Path("/usr/share/bunkerweb/INTEGRATION").read_text().strip()
|
||||
|
|
|
@ -134,11 +134,11 @@ if __name__ == "__main__":
|
|||
logger.info(f"Init : {args.init}")
|
||||
|
||||
integration = "Linux"
|
||||
if getenv("KUBERNETES_MODE", "no") == "yes":
|
||||
if getenv("KUBERNETES_MODE", "no").lower() == "yes":
|
||||
integration = "Kubernetes"
|
||||
elif getenv("SWARM_MODE", "no") == "yes":
|
||||
elif getenv("SWARM_MODE", "no").lower() == "yes":
|
||||
integration = "Swarm"
|
||||
elif getenv("AUTOCONF_MODE", "no") == "yes":
|
||||
elif getenv("AUTOCONF_MODE", "no").lower() == "yes":
|
||||
integration = "Autoconf"
|
||||
elif Path("/usr/share/bunkerweb/INTEGRATION").is_file():
|
||||
integration = Path("/usr/share/bunkerweb/INTEGRATION").read_text().strip()
|
||||
|
|
|
@ -21,11 +21,11 @@ log "ENTRYPOINT" "ℹ️" "Starting the job scheduler v$(cat /usr/share/bunkerwe
|
|||
# setup and check /data folder
|
||||
/usr/share/bunkerweb/helpers/data.sh "ENTRYPOINT"
|
||||
|
||||
if [ "$SWARM_MODE" == "yes" ] ; then
|
||||
if [[ $(echo "$SWARM_MODE" | awk '{print tolower($0)}') == "yes" ]] ; then
|
||||
echo "Swarm" > /usr/share/bunkerweb/INTEGRATION
|
||||
elif [ "$KUBERNETES_MODE" == "yes" ] ; then
|
||||
elif [[ $(echo "$KUBERNETES_MODE" | awk '{print tolower($0)}') == "yes" ]] ; then
|
||||
echo "Kubernetes" > /usr/share/bunkerweb/INTEGRATION
|
||||
elif [ "$AUTOCONF_MODE" == "yes" ] ; then
|
||||
elif [[ $(echo "$AUTOCONF_MODE" | awk '{print tolower($0)}') == "yes" ]] ; then
|
||||
echo "Autoconf" > /usr/share/bunkerweb/INTEGRATION
|
||||
fi
|
||||
|
||||
|
|
|
@ -160,11 +160,11 @@ PLUGIN_KEYS = [
|
|||
]
|
||||
|
||||
integration = "Linux"
|
||||
if getenv("KUBERNETES_MODE", "no") == "yes":
|
||||
if getenv("KUBERNETES_MODE", "no").lower() == "yes":
|
||||
integration = "Kubernetes"
|
||||
elif getenv("SWARM_MODE", "no") == "yes":
|
||||
elif getenv("SWARM_MODE", "no").lower() == "yes":
|
||||
integration = "Swarm"
|
||||
elif getenv("AUTOCONF_MODE", "no") == "yes":
|
||||
elif getenv("AUTOCONF_MODE", "no").lower() == "yes":
|
||||
integration = "Autoconf"
|
||||
elif Path("/usr/share/bunkerweb/INTEGRATION").exists():
|
||||
with open("/usr/share/bunkerweb/INTEGRATION", "r") as f:
|
||||
|
@ -1495,7 +1495,7 @@ def logs_container(container_id):
|
|||
tmp_logs = []
|
||||
if docker_client:
|
||||
try:
|
||||
if getenv("SWARM_MODE", "no") == "no":
|
||||
if integration == "Swarm":
|
||||
docker_logs = docker_client.containers.get(container_id).logs(
|
||||
stdout=True,
|
||||
stderr=True,
|
||||
|
|
Loading…
Reference in a new issue