diff --git a/roles/docker-compose/defaults/main.yml b/roles/docker-compose/defaults/main.yml index 00eefec1..16d7ecf7 100644 --- a/roles/docker-compose/defaults/main.yml +++ b/roles/docker-compose/defaults/main.yml @@ -1,3 +1,3 @@ -docker_compose_skipp_file_creation: false # If set to true the file creation will be skipped -docker_pull_git_repository: false # Activates docker repository download and routine -docker_compose_flush_handlers: false # Set to true in the vars/main.yml of the including role to autoflush after docker compose routine \ No newline at end of file +docker_compose_file_creation_enabled: true # If set to true the file creation will be skipped +docker_pull_git_repository: false # Activates docker repository download and routine +docker_compose_flush_handlers: false # Set to true in the vars/main.yml of the including role to autoflush after docker compose routine \ No newline at end of file diff --git a/roles/docker-compose/tasks/main.yml b/roles/docker-compose/tasks/main.yml index 74f7a51e..579cc4a7 100644 --- a/roles/docker-compose/tasks/main.yml +++ b/roles/docker-compose/tasks/main.yml @@ -24,7 +24,7 @@ include_tasks: "04_files.yml" - name: "Ensure that {{ docker_compose.directories.instance }} is up" include_tasks: "05_ensure_up.yml" - when: not docker_compose_skipp_file_creation | bool + when: docker_compose_file_creation_enabled | bool - name: "flush docker compose for '{{ application_id }}'" meta: flush_handlers diff --git a/roles/web-app-akaunting/vars/main.yml b/roles/web-app-akaunting/vars/main.yml index a9f2d8c5..e17de493 100644 --- a/roles/web-app-akaunting/vars/main.yml +++ b/roles/web-app-akaunting/vars/main.yml @@ -1,28 +1,28 @@ # General -application_id: "web-app-akaunting" -js_application_name: "Akaunting" +application_id: "web-app-akaunting" +js_application_name: "Akaunting" # Database -database_type: "mariadb" -database_password: "{{ applications | get_app_conf(application_id, 'credentials.database_password') }}" +database_type: "mariadb" +database_password: "{{ applications | get_app_conf(application_id, 'credentials.database_password') }}" # Docker -docker_repository_address: "https://github.com/akaunting/docker.git" -docker_pull_git_repository: true -docker_repository_branch: "master" -docker_compose_skipp_file_creation: false +docker_repository_address: "https://github.com/akaunting/docker.git" +docker_pull_git_repository: true +docker_repository_branch: "master" +docker_compose_file_creation_enabled: true # Akaunting -AKAUNTING_URL: "{{ domains | get_url(application_id, WEB_PROTOCOL) }}" -AKAUNTING_VERSION: "{{ applications | get_app_conf(application_id, 'docker.services.akaunting.version') }}" -AKAUNTING_IMAGE: "{{ applications | get_app_conf(application_id, 'docker.services.akaunting.image') }}" -AKAUNTING_CONTAINER: "{{ applications | get_app_conf(application_id, 'docker.services.akaunting.name') }}" -AKAUNTING_VOLUME: "{{ applications | get_app_conf(application_id, 'docker.volumes.data') }}" -AKAUNTING_COMPANY_NAME: "{{ applications | get_app_conf(application_id, 'company.name') }}" -AKAUNTING_COMPANY_EMAIL: "{{ applications | get_app_conf(application_id, 'company.email') }}" -AKAUNTING_ADMIN_EMAIL: "{{ applications | get_app_conf(application_id, 'setup_admin_email') }}" -AKAUNTING_ADMIN_PASSWORD: "{{ applications | get_app_conf(application_id, 'credentials.setup_admin_password') }}" -AKAUNTING_SETUP_MARKER: "{{ [ (AKAUNTING_VOLUME | docker_volume_path), '.akaunting_installed' ] | path_join }}" -AKAUNTING_APP_KEY: "{{ applications | get_app_conf(application_id, 'credentials.app_key') }}" -AKAUNTING_CACHE_DRIVER: "{{ 'redis' if applications | get_app_conf(application_id, 'docker.services.redis.enabled') else 'file' }}" \ No newline at end of file +AKAUNTING_URL: "{{ domains | get_url(application_id, WEB_PROTOCOL) }}" +AKAUNTING_VERSION: "{{ applications | get_app_conf(application_id, 'docker.services.akaunting.version') }}" +AKAUNTING_IMAGE: "{{ applications | get_app_conf(application_id, 'docker.services.akaunting.image') }}" +AKAUNTING_CONTAINER: "{{ applications | get_app_conf(application_id, 'docker.services.akaunting.name') }}" +AKAUNTING_VOLUME: "{{ applications | get_app_conf(application_id, 'docker.volumes.data') }}" +AKAUNTING_COMPANY_NAME: "{{ applications | get_app_conf(application_id, 'company.name') }}" +AKAUNTING_COMPANY_EMAIL: "{{ applications | get_app_conf(application_id, 'company.email') }}" +AKAUNTING_ADMIN_EMAIL: "{{ applications | get_app_conf(application_id, 'setup_admin_email') }}" +AKAUNTING_ADMIN_PASSWORD: "{{ applications | get_app_conf(application_id, 'credentials.setup_admin_password') }}" +AKAUNTING_SETUP_MARKER: "{{ [ (AKAUNTING_VOLUME | docker_volume_path), '.akaunting_installed' ] | path_join }}" +AKAUNTING_APP_KEY: "{{ applications | get_app_conf(application_id, 'credentials.app_key') }}" +AKAUNTING_CACHE_DRIVER: "{{ 'redis' if applications | get_app_conf(application_id, 'docker.services.redis.enabled') else 'file' }}" \ No newline at end of file diff --git a/roles/web-app-bigbluebutton/vars/main.yml b/roles/web-app-bigbluebutton/vars/main.yml index 02f7b698..7e930e8c 100644 --- a/roles/web-app-bigbluebutton/vars/main.yml +++ b/roles/web-app-bigbluebutton/vars/main.yml @@ -1,27 +1,27 @@ # General -application_id: "web-app-bigbluebutton" +application_id: "web-app-bigbluebutton" # Database configuration -database_type: "postgres" -database_instance: "{{ application_id | get_entity_name }}" -database_password: "{{ applications | get_app_conf(application_id, 'credentials.postgresql_secret') }}" -database_username: "postgres" -database_name: "" # Multiple databases +database_type: "postgres" +database_instance: "{{ application_id | get_entity_name }}" +database_password: "{{ applications | get_app_conf(application_id, 'credentials.postgresql_secret') }}" +database_username: "postgres" +database_name: "" # Multiple databases # Proxy -domain: "{{ domains | get_domain(application_id) }}" -http_port: "{{ ports.localhost.http[application_id] }}" +domain: "{{ domains | get_domain(application_id) }}" +http_port: "{{ ports.localhost.http[application_id] }}" # Docker -docker_compose_skipp_file_creation: true # Handled in this role -docker_repository_address: "{{ applications | get_app_conf(application_id, 'docker.services.bigbluebutton.repository') }}" -docker_repository_branch: "{{ applications | get_app_conf(application_id, 'docker.services.bigbluebutton.version') }}" -docker_pull_git_repository: true +docker_compose_file_creation_enabled: false # Handled in this role +docker_repository_address: "{{ applications | get_app_conf(application_id, 'docker.services.bigbluebutton.repository') }}" +docker_repository_branch: "{{ applications | get_app_conf(application_id, 'docker.services.bigbluebutton.version') }}" +docker_pull_git_repository: true # BigBlueButton -BBB_SHARED_SECRET: "{{ applications | get_app_conf(application_id, 'credentials.shared_secret') }}" -BBB_ETHERPAD_API_KEY: "{{ applications | get_app_conf(application_id, 'credentials.etherpad_api_key') }}" -BBB_RAILS_SECRET: "{{ applications | get_app_conf(application_id, 'credentials.rails_secret') }}" -BBB_POSTGRESQL_SECRET: "{{ applications | get_app_conf(application_id, 'credentials.postgresql_secret') }}" -BBB_FSESL_PASSWORD: "{{ applications | get_app_conf(application_id, 'credentials.fsesl_password') }}" -BBB_TURN_SECRET: "{{ applications | get_app_conf(application_id, 'credentials.turn_secret') }}" \ No newline at end of file +BBB_SHARED_SECRET: "{{ applications | get_app_conf(application_id, 'credentials.shared_secret') }}" +BBB_ETHERPAD_API_KEY: "{{ applications | get_app_conf(application_id, 'credentials.etherpad_api_key') }}" +BBB_RAILS_SECRET: "{{ applications | get_app_conf(application_id, 'credentials.rails_secret') }}" +BBB_POSTGRESQL_SECRET: "{{ applications | get_app_conf(application_id, 'credentials.postgresql_secret') }}" +BBB_FSESL_PASSWORD: "{{ applications | get_app_conf(application_id, 'credentials.fsesl_password') }}" +BBB_TURN_SECRET: "{{ applications | get_app_conf(application_id, 'credentials.turn_secret') }}" \ No newline at end of file diff --git a/templates/roles/web-app/vars/main.yml.j2 b/templates/roles/web-app/vars/main.yml.j2 index 7ec95d89..ae15612e 100644 --- a/templates/roles/web-app/vars/main.yml.j2 +++ b/templates/roles/web-app/vars/main.yml.j2 @@ -11,7 +11,7 @@ database_type: 0 # Database type # Checkout roles/docker-compose/defaults/main.yml for all configuration options docker_compose_flush_handlers: true # When this is set to true an auto-flush after the docker-compose.yml, and env deploy is triggered, otherwise you have todo it manual. -docker_compose_skipp_file_creation: false # Skipp creation of docker-compose.yml file +docker_compose_file_creation_enabled: true # Skipp creation of docker-compose.yml file docker_pull_git_repository: true # This will automaticly pull a repository from the 'docker_repository_address' docker_repository_address: "" # The address of a repository which should be pulled