Elgato_dark/bunkerweb
1
0
Fork 0
mirror of https://github.com/bunkerity/bunkerweb synced 2026-05-24 09:28:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

autoconf - init support of custom variables using labels

Browse source
This commit is contained in:
florian 2022-07-01 16:32:52 +02:00
parent 385b7c4134
commit e0a7005062
2 changed files with 48 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
autoconf/DockerController.py
View file

@ -1,6 +1,9 @@
import traceback
from docker import DockerClient
from glob import glob
from os.path import basename
from re import search
from Controller import Controller
from ConfigCaller import ConfigCaller
@ -66,7 +69,46 @@ class DockerController(Controller, ConfigCaller) :
return services
def get_configs(self) :
raise("get_configs is not supported with DockerController")
configs = {}
for config_type in self._supported_config_types :
configs[config_type] = {}
# get non-site configs from disk
global_configs = {
"http": glob("/data/configs/http/*.conf"),
"default-server-http": glob("/data/configs/default-server-http/*.conf"),
"server-http": glob("/data/configs/server-http/*.conf"),
"modsec": glob("/data/configs/modsec/*.conf"),
"modsec-crs": glob("/data/configs/modsec-crs/*.conf")
}
for config_type, config_paths in global_configs.items() :
for config_path in config_paths :
with open(config_path) as f :
configs[config_type][basename(config_path)] = f.read()
# get site configs from labels
for container in self.__client.containers.list(filters={"label" : "bunkerweb.SERVER_NAME"}) :
# extract server_name
server_name = ""
for variable, value in controller_service.labels.items() :
if not variable.startswith("bunkerweb.") :
continue
real_variable = variable.replace("bunkerweb.", "", 1)
if real_variable == "SERVER_NAME" :
server_name = value.split(" ")[0]
break
# extract configs
if server_name == "" :
continue
for variable, value in controller_service.labels.items() :
if not variable.startswith("bunkerweb.") :
continue
real_variable = variable.replace("bunkerweb.", "", 1)
result = search(r"^CUSTOM_CONF_(SERVER_HTTP|MODSEC|MODSEC_CRS)_(.+)$ ", real_variable)
if result is None :
continue
type = result.group(1).lower().replace("_", "-")
name = result.group(2)
configs[type][server_name + "/" + name] = value
return configs
def apply_config(self) :
self._config.stop_scheduler()
@ -78,7 +120,8 @@ class DockerController(Controller, ConfigCaller) :
for event in self.__client.events(decode=True, filters={"type": "container"}) :
self._instances = self.get_instances()
self._services = self.get_services()
if not self._config.update_needed(self._instances, self._services) :
self._configs = self.get_configs()
if not self._config.update_needed(self._instances, self._services, configs=self._configs) :
continue
log("DOCKER-CONTROLLER", "ℹ️", "Catched docker event, deploying new configuration ...")
try :

6
docs/quickstart-guide.md
View file

@ -1219,8 +1219,8 @@ Some integrations offer a more convenient way of applying configurations for exa
**Using labels**
!!! info "Limitations using labels"
When using labels with the Docker autoconf integration, you can only apply custom configurations for the corresponding web service. Applying **http**, **default-server-http** and any global configurations is not possible.
!!! warning "Limitations using labels"
When using labels with the Docker autoconf integration, you can only apply custom configurations for the corresponding web service. Applying **http**, **default-server-http** or any global configurations (like **server-http** for all services) is not possible : you will need to mount files for that purpose.
The labels to use must follow the pattern `bunkerweb.CUSTOM_CONF_<TYPE>_<NAME>` :
@ -1233,7 +1233,7 @@ Some integrations offer a more convenient way of applying configurations for exa
image: nginxdemos/hello:plain-text
labels:
- |
CUSTOM_CONF_SERVER_HTTP_hello-world=
bunkerweb.CUSTOM_CONF_SERVER_HTTP_hello-world=
location /hello {
default_type 'text/plain';
content_by_lua_block {