badblocks/docker-easy-haproxy
1
0
Fork 0
Code Activity

Update plugin paths from /etc/haproxy to /etc/easyhaproxy across tests, configs, and documentation

Browse source
This commit is contained in:
Joao Gilberto Magalhaes 2026-02-18 16:35:57 -05:00
parent 8532d49642
commit 3fd0fe0d46
9 changed files with 27 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/plugins/manager.py
View file

@ -38,7 +38,7 @@ class PluginManager:
builtin_dir = os.path.join(os.path.dirname(__file__), "builtin")
self._load_plugins_from_directory(builtin_dir, "builtin")
# Load external plugins from /etc/haproxy/plugins
# Load external plugins from /etc/easyhaproxy/plugins
if os.path.exists(self.plugins_dir):
self._load_plugins_from_directory(self.plugins_dir, "external")
else:

15
src/processor/kubernetes.py
View file

@ -264,16 +264,17 @@ class Kubernetes(ProcessorInterface):
ssl_hosts = []
certbot = self._check_annotation(ingress.metadata.annotations, "easyhaproxy.certbot")
redirect_ssl = self._check_annotation(ingress.metadata.annotations, "easyhaproxy.redirect_ssl")
redirect = self._check_annotation(ingress.metadata.annotations, "easyhaproxy.redirect")
mode = self._check_annotation(ingress.metadata.annotations, "easyhaproxy.mode")
listen_port = self._check_annotation(ingress.metadata.annotations, "easyhaproxy.listen_port", 80)
plugins = self._check_annotation(ingress.metadata.annotations, "easyhaproxy.plugins")
annotations = ingress.metadata.annotations or {}
certbot = self._check_annotation(annotations, "easyhaproxy.certbot")
redirect_ssl = self._check_annotation(annotations, "easyhaproxy.redirect_ssl")
redirect = self._check_annotation(annotations, "easyhaproxy.redirect")
mode = self._check_annotation(annotations, "easyhaproxy.mode")
listen_port = self._check_annotation(annotations, "easyhaproxy.listen_port", 80)
plugins = self._check_annotation(annotations, "easyhaproxy.plugins")
# Extract plugin-specific configurations
plugin_annotations = {}
for annotation_key, annotation_value in ingress.metadata.annotations.items():
for annotation_key, annotation_value in annotations.items():
if annotation_key.startswith("easyhaproxy.plugin."):
plugin_annotations[annotation_key] = annotation_value