diff --git a/Makefile b/Makefile index 83d295d2..c643ee4f 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ APPLICATIONS_OUT := ./group_vars/all/04_applications.yml APPLICATIONS_SCRIPT := ./cli/generate/defaults/applications.py USERS_OUT := ./group_vars/all/03_users.yml USERS_SCRIPT := ./cli/generate/defaults/users.py -INCLUDES_SCRIPT := ./cli/generate/conditional_role_include.py +INCLUDES_SCRIPT := ./cli/generate/role_include.py INCLUDE_GROUPS := $(shell python3 main.py meta invokable_paths -s "-" --no-signal | tr '\n' ' ') diff --git a/cli/generate/conditional_role_include.py b/cli/generate/role_include.py similarity index 100% rename from cli/generate/conditional_role_include.py rename to cli/generate/role_include.py diff --git a/roles/web-app-akaunting/meta/main.yml b/roles/web-app-akaunting/meta/main.yml index 85d501b3..f0a17fc7 100644 --- a/roles/web-app-akaunting/meta/main.yml +++ b/roles/web-app-akaunting/meta/main.yml @@ -9,11 +9,9 @@ galaxy_info: Consulting & Coaching Solutions https://www.veen.world galaxy_tags: - - docker - akaunting - accounting - - automation - - docker-compose + - finance repository: https://s.veen.world/cymais issue_tracker_url: https://s.veen.world/cymaisissues documentation: https://s.veen.world/cymais diff --git a/roles/web-app-bigbluebutton/config/main.yml b/roles/web-app-bigbluebutton/config/main.yml index bf4b4bc7..df67a114 100644 --- a/roles/web-app-bigbluebutton/config/main.yml +++ b/roles/web-app-bigbluebutton/config/main.yml @@ -7,7 +7,8 @@ api_suffix: "/bigbluebutton/" features: matomo: true css: true - portfolio_iframe: true + portfolio_iframe: false # Videos can't open in frame due to iframe restrictions + # @todo fix this ldap: false oidc: true central_database: false diff --git a/roles/web-app-bookwyrm/meta/main.yml b/roles/web-app-bookwyrm/meta/main.yml index 2f53f18e..c2d4e27d 100644 --- a/roles/web-app-bookwyrm/meta/main.yml +++ b/roles/web-app-bookwyrm/meta/main.yml @@ -20,5 +20,3 @@ galaxy_info: - name: Any versions: - all -dependencies: - - docker-compose diff --git a/roles/web-app-coturn/meta/main.yml b/roles/web-app-coturn/meta/main.yml index 7745661c..cdbc436a 100644 --- a/roles/web-app-coturn/meta/main.yml +++ b/roles/web-app-coturn/meta/main.yml @@ -21,6 +21,3 @@ galaxy_info: - name: Any versions: - all -dependencies: - - docker-compose - - srv-proxy-6-6-domain diff --git a/roles/web-app-oauth2-proxy/meta/main.yml b/roles/web-app-oauth2-proxy/meta/main.yml index 75a73f92..001aaca7 100644 --- a/roles/web-app-oauth2-proxy/meta/main.yml +++ b/roles/web-app-oauth2-proxy/meta/main.yml @@ -21,6 +21,3 @@ galaxy_info: - name: Any versions: - all -dependencies: - - docker-compose - - srv-proxy-6-6-domain diff --git a/roles/web-app-phpmyadmin/config/main.yml b/roles/web-app-phpmyadmin/config/main.yml index 2df6af9f..fb71fb79 100644 --- a/roles/web-app-phpmyadmin/config/main.yml +++ b/roles/web-app-phpmyadmin/config/main.yml @@ -6,7 +6,8 @@ oauth2_proxy: features: matomo: true css: false - portfolio_iframe: true + portfolio_iframe: false # Opens itself in a new window, when it's loaded in an iframe. + # it's anyhow not so enduser relevant, so it can be kept like this central_database: true oauth2: true csp: diff --git a/roles/web-app-postmarks/meta/main.yml b/roles/web-app-postmarks/meta/main.yml index 906efcb2..cc126200 100644 --- a/roles/web-app-postmarks/meta/main.yml +++ b/roles/web-app-postmarks/meta/main.yml @@ -20,5 +20,3 @@ galaxy_info: - name: Any versions: - all -dependencies: - - docker-compose diff --git a/roles/web-app-roulette-wheel/meta/main.yml b/roles/web-app-roulette-wheel/meta/main.yml index 6bdfda6a..8ca15678 100644 --- a/roles/web-app-roulette-wheel/meta/main.yml +++ b/roles/web-app-roulette-wheel/meta/main.yml @@ -23,5 +23,4 @@ galaxy_info: class: "fa-solid fa-dice" run_after: - web-app-matomo -dependencies: - - docker-compose + diff --git a/roles/web-app-socialhome/meta/main.yml b/roles/web-app-socialhome/meta/main.yml index 4c521b17..3327a927 100644 --- a/roles/web-app-socialhome/meta/main.yml +++ b/roles/web-app-socialhome/meta/main.yml @@ -20,5 +20,3 @@ galaxy_info: - name: Any versions: - all -dependencies: - - docker-compose diff --git a/tests/integration/test_circular_dependencies.py b/tests/integration/test_circular_dependencies.py index 9612c750..c1d193d3 100644 --- a/tests/integration/test_circular_dependencies.py +++ b/tests/integration/test_circular_dependencies.py @@ -2,7 +2,7 @@ import os import unittest # import the functions from your CLI script -from cli.generate.conditional_role_include import build_dependency_graph, find_cycle +from cli.generate.role_include import build_dependency_graph, find_cycle class TestCircularDependencies(unittest.TestCase): """ diff --git a/tests/unit/cli/generate/conditional_role_include/test_conditional_role_include.py b/tests/unit/cli/generate/conditional_role_include/test_conditional_role_include.py index c45ad505..4f0f3a89 100644 --- a/tests/unit/cli/generate/conditional_role_include/test_conditional_role_include.py +++ b/tests/unit/cli/generate/conditional_role_include/test_conditional_role_include.py @@ -9,7 +9,7 @@ import yaml # Adjust path to include cli/ folder sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "../../../../..", "cli"))) -from cli.generate.conditional_role_include import build_dependency_graph, topological_sort, gen_condi_role_incl +from cli.generate.role_include import build_dependency_graph, topological_sort, gen_condi_role_incl class TestGeneratePlaybook(unittest.TestCase): def setUp(self):