diff --git a/filter_plugins/redirect_filters.py b/filter_plugins/redirect_filters.py index bedfcc26..9b755db1 100644 --- a/filter_plugins/redirect_filters.py +++ b/filter_plugins/redirect_filters.py @@ -20,7 +20,7 @@ class FilterModule(object): {{ redirect_list | add_redirect_if_group('lam', 'ldap.' ~ primary_domain, - domains | get_domain('lam'), + domains | get_domain('web-app-lam'), group_names) }} """ try: diff --git a/group_vars/all/09_ports.yml b/group_vars/all/09_ports.yml index 6f5bf52b..9b1fdb8f 100644 --- a/group_vars/all/09_ports.yml +++ b/group_vars/all/09_ports.yml @@ -10,7 +10,7 @@ ports: web-app-espocrm: 4002 oauth2_proxy: web-app-phpmyadmin: 4181 - lam: 4182 + web-app-lam: 4182 web-app-openproject: 4183 yourls: 4184 pgadmin: 4185 @@ -54,7 +54,7 @@ ports: bluesky_api: 8030 bluesky_web: 8031 web-app-keycloak: 8032 - lam: 8033 + web-app-lam: 8033 web-app-phpmyadmin: 8034 snipe-it: 8035 sphinx: 8036 diff --git a/group_vars/all/10_networks.yml b/group_vars/all/10_networks.yml index 8f3b91da..f58b4354 100644 --- a/group_vars/all/10_networks.yml +++ b/group_vars/all/10_networks.yml @@ -72,7 +72,7 @@ defaults_networks: subnet: 192.168.102.208/28 sphinx: subnet: 192.168.102.224/28 - lam: + web-app-lam: subnet: 192.168.103.0/28 phpldapadmin: subnet: 192.168.103.16/28 diff --git a/roles/svc-db-openldap/config/main.yml b/roles/svc-db-openldap/config/main.yml index 80e26b3f..6a37e611 100644 --- a/roles/svc-db-openldap/config/main.yml +++ b/roles/svc-db-openldap/config/main.yml @@ -11,8 +11,6 @@ docker: network: "openldap" volumes: data: "openldap_data" - -webinterface: "lam" # The webinterface which should be used. Possible: lam and phpldapadmin features: ldap: true provisioning: diff --git a/roles/web-app-lam/vars/main.yml b/roles/web-app-lam/vars/main.yml index 6b00064a..bda460f1 100644 --- a/roles/web-app-lam/vars/main.yml +++ b/roles/web-app-lam/vars/main.yml @@ -1 +1 @@ -application_id: "lam" \ No newline at end of file +application_id: "web-app-lam" \ No newline at end of file