From db705d7dbabf447cfa144f25d8b486c916f7bc22 Mon Sep 17 00:00:00 2001 From: moanos Date: Wed, 8 Nov 2023 11:55:32 +0100 Subject: [PATCH] feat: Add oxitraffic basics --- group_vars/mash_servers | 54 +++++++++++++++++++++++++++++++++++++++++ setup.yml | 2 ++ 2 files changed, 56 insertions(+) diff --git a/group_vars/mash_servers b/group_vars/mash_servers index 884f63b..5a714e0 100644 --- a/group_vars/mash_servers +++ b/group_vars/mash_servers @@ -244,6 +244,8 @@ devture_systemd_service_manager_services_list_auto: | + ([{'name': (owncast_identifier + '.service'), 'priority': 2000, 'groups': ['mash', 'owncast']}] if owncast_enabled else []) + + ([{'name': (oxitraffic_identifier + '.service'), 'priority': 2000, 'groups': ['mash', 'oxitraffic']}] if oxitraffic_enabled else []) + + ([{'name': (peertube_identifier + '.service'), 'priority': 2000, 'groups': ['mash', 'peertube']}] if peertube_enabled else []) + ([{'name': (postgis_identifier + '.service'), 'priority': 2000, 'groups': ['mash', 'metrics', 'postgis']}] if postgis_enabled else []) @@ -432,6 +434,12 @@ devture_postgres_managed_databases_auto: | 'password': outline_database_password, }] if outline_enabled and outline_database_hostname == devture_postgres_identifier else []) + + ([{ + 'name': oxitraffic_database_name, + 'username': oxitraffic_database_username, + 'password': oxitraffic_database_password, + }] if oxitraffic_enabled and oxitraffic_database_hostname == devture_postgres_identifier else []) + + ([{ 'name': peertube_config_database_name, 'username': peertube_config_database_username, @@ -2514,6 +2522,52 @@ owncast_container_labels_traefik_tls_certResolver: "{{ devture_traefik_certResol +######################################################################## +# # +# oxitraffic # +# # +######################################################################## + +oxitraffic_enabled: false + +oxitraffic_identifier: "{{ mash_playbook_service_identifier_prefix }}oxitraffic" + +oxitraffic_base_path: "{{ mash_playbook_base_path }}/{{ mash_playbook_service_base_directory_name_prefix }}oxitraffic" + +oxitraffic_uid: "{{ mash_playbook_uid }}" +oxitraffic_gid: "{{ mash_playbook_gid }}" + +oxitraffic_database_hostname: "{{ devture_postgres_identifier if devture_postgres_enabled else '' }}" +oxitraffic_database_port: "{{ '5432' if devture_postgres_enabled else '' }}" +oxitraffic_database_password: "{{ '%s' | format(mash_playbook_generic_secret_key) | password_hash('sha512', 'db.oxitraffic', rounds=655555) | to_uuid }}" + +oxitraffic_systemd_required_services_list: | + {{ + (['docker.service']) + + + ([devture_postgres_identifier ~ '.service'] if devture_postgres_enabled and oxitraffic_database_hostname == devture_postgres_identifier else []) + }} + +oxitraffic_container_additional_networks: | + {{ + ([mash_playbook_reverse_proxyable_services_additional_network] if mash_playbook_reverse_proxyable_services_additional_network else []) + + + ([devture_postgres_container_network] if devture_postgres_enabled and oxitraffic_database_hostname == devture_postgres_identifier and oxitraffic_container_network != devture_postgres_container_network else []) + }} + +oxitraffic_container_labels_traefik_enabled: "{{ mash_playbook_traefik_labels_enabled }}" +oxitraffic_container_labels_traefik_docker_network: "{{ mash_playbook_reverse_proxyable_services_additional_network }}" +oxitraffic_container_labels_traefik_entrypoints: "{{ devture_traefik_entrypoint_primary }}" +oxitraffic_container_labels_traefik_tls_certResolver: "{{ devture_traefik_certResolver_primary }}" + +######################################################################## +# # +# /oxitraffic # +# # +######################################################################## + + + ######################################################################## # # # peertube # diff --git a/setup.yml b/setup.yml index 7fecba0..7a0168e 100644 --- a/setup.yml +++ b/setup.yml @@ -133,6 +133,8 @@ - role: galaxy/outline + - role: galaxy/oxitraffic + - role: galaxy/peertube - role: galaxy/postgis