librewolf
/
bunkerized-nginx
mirror of https://github.com/bunkerity/bunkerized-nginx
4
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge branch 'dev' of github.com:bunkerity/bunkerweb into dev

This commit is contained in:
florian 2023-04-26 19:55:51 +02:00
parent 78c2e16ead 574ecbd6b3
commit 6b76596a88
No known key found for this signature in database
GPG Key ID: 3D80806F12602A7C
9 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/autoconf/main.py
View File

@ -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")

6
src/common/cli/CLI.py
View File

@ -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()

6
src/common/core/bunkernet/jobs/bunkernet.py
View File

@ -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()

6
src/common/core/letsencrypt/jobs/certbot-cleanup.py
View File

@ -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()

6
src/common/core/letsencrypt/jobs/certbot-deploy.py
View File

@ -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:

6
src/common/gen/main.py
View File

@ -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()

6
src/common/gen/save_config.py
View File

@ -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()

6
src/scheduler/entrypoint.sh
View File

@ -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

8
src/ui/main.py
View File

@ -161,11 +161,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:
@ -1497,7 +1497,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,