diff --git a/cli/fix-tabs.py b/cli/fix-tabs.py index 0785232a..efabe3e1 100644 --- a/cli/fix-tabs.py +++ b/cli/fix-tabs.py @@ -30,8 +30,8 @@ def main(): parser.add_argument( "path", nargs="?", - default="roles", - help="Base path to search for .yml files (default: ./roles)" + default="./", + help="Base path to search for .yml files (default: ./)" ) args = parser.parse_args() diff --git a/roles/docker-akaunting/tasks/main.yml b/roles/docker-akaunting/tasks/main.yml index 120ca34d..86e728ae 100644 --- a/roles/docker-akaunting/tasks/main.yml +++ b/roles/docker-akaunting/tasks/main.yml @@ -7,8 +7,8 @@ include_role: name: nginx-domain-setup vars: - domain: "{{ domains[application_id] }}" - http_port: "{{ ports.localhost.http[application_id] }}" + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" - name: "include tasks update-repository-with-files.yml" include_tasks: update-repository-with-files.yml diff --git a/roles/docker-baserow/tasks/main.yml b/roles/docker-baserow/tasks/main.yml index 4c0c4419..63b356b1 100644 --- a/roles/docker-baserow/tasks/main.yml +++ b/roles/docker-baserow/tasks/main.yml @@ -7,8 +7,8 @@ include_role: name: nginx-domain-setup vars: - domain: "{{ domains[application_id] }}" - http_port: "{{ ports.localhost.http[application_id] }}" + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" - name: "copy docker-compose.yml and env file" include_tasks: copy-docker-compose-and-env.yml \ No newline at end of file diff --git a/roles/docker-coturn/tasks/main.yml b/roles/docker-coturn/tasks/main.yml index 58d85582..56d10aaf 100644 --- a/roles/docker-coturn/tasks/main.yml +++ b/roles/docker-coturn/tasks/main.yml @@ -7,8 +7,8 @@ include_role: name: nginx-domain-setup vars: - domain: "{{ domains[application_id] }}" - http_port: "{{ ports.localhost.http[application_id] }}" + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" - name: "copy docker-compose.yml and env file" include_tasks: copy-docker-compose-and-env.yml diff --git a/roles/docker-discourse/tasks/main.yml b/roles/docker-discourse/tasks/main.yml index 9c60e886..568f0d84 100644 --- a/roles/docker-discourse/tasks/main.yml +++ b/roles/docker-discourse/tasks/main.yml @@ -16,8 +16,8 @@ include_role: name: nginx-domain-setup vars: - domain: "{{ domains[application_id] }}" - http_port: "{{ ports.localhost.http[application_id] }}" + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" when: run_once_docker_discourse is not defined - name: "cleanup central database from {{application_id}}_default network" diff --git a/roles/docker-elk/tasks/main.yml b/roles/docker-elk/tasks/main.yml index cf46b0bf..1a12f955 100644 --- a/roles/docker-elk/tasks/main.yml +++ b/roles/docker-elk/tasks/main.yml @@ -4,8 +4,8 @@ include_role: name: nginx-domain-setup vars: - domain: "{{ domains[application_id] }}" - http_port: "{{ ports.localhost.http[application_id] }}" + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" - name: create elasticsearch-sysctl.conf copy: diff --git a/roles/docker-friendica/tasks/main.yml b/roles/docker-friendica/tasks/main.yml index 58d85582..56d10aaf 100644 --- a/roles/docker-friendica/tasks/main.yml +++ b/roles/docker-friendica/tasks/main.yml @@ -7,8 +7,8 @@ include_role: name: nginx-domain-setup vars: - domain: "{{ domains[application_id] }}" - http_port: "{{ ports.localhost.http[application_id] }}" + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" - name: "copy docker-compose.yml and env file" include_tasks: copy-docker-compose-and-env.yml diff --git a/roles/docker-funkwhale/tasks/main.yml b/roles/docker-funkwhale/tasks/main.yml index 8cdf7b2c..d2fe3525 100644 --- a/roles/docker-funkwhale/tasks/main.yml +++ b/roles/docker-funkwhale/tasks/main.yml @@ -7,8 +7,8 @@ include_role: name: nginx-domain-setup vars: - domain: "{{ domains[application_id] }}" - http_port: "{{ ports.localhost.http[application_id] }}" + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" - name: "copy docker-compose.yml and env file" include_tasks: copy-docker-compose-and-env.yml diff --git a/roles/docker-fusiondirectory/tasks/main.yml b/roles/docker-fusiondirectory/tasks/main.yml index 65e23553..09f2dea2 100644 --- a/roles/docker-fusiondirectory/tasks/main.yml +++ b/roles/docker-fusiondirectory/tasks/main.yml @@ -6,8 +6,8 @@ include_role: name: nginx-domain-setup vars: - domain: "{{ domains[application_id] }}" - http_port: "{{ ports.localhost.http[application_id] }}" + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" - name: "copy docker-compose.yml and env file" include_tasks: copy-docker-compose-and-env.yml diff --git a/roles/docker-gitea/tasks/main.yml b/roles/docker-gitea/tasks/main.yml index 58d85582..56d10aaf 100644 --- a/roles/docker-gitea/tasks/main.yml +++ b/roles/docker-gitea/tasks/main.yml @@ -7,8 +7,8 @@ include_role: name: nginx-domain-setup vars: - domain: "{{ domains[application_id] }}" - http_port: "{{ ports.localhost.http[application_id] }}" + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" - name: "copy docker-compose.yml and env file" include_tasks: copy-docker-compose-and-env.yml diff --git a/roles/docker-gitlab/tasks/main.yml b/roles/docker-gitlab/tasks/main.yml index 58d85582..56d10aaf 100644 --- a/roles/docker-gitlab/tasks/main.yml +++ b/roles/docker-gitlab/tasks/main.yml @@ -7,8 +7,8 @@ include_role: name: nginx-domain-setup vars: - domain: "{{ domains[application_id] }}" - http_port: "{{ ports.localhost.http[application_id] }}" + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" - name: "copy docker-compose.yml and env file" include_tasks: copy-docker-compose-and-env.yml diff --git a/roles/docker-jenkins/tasks/main.yml b/roles/docker-jenkins/tasks/main.yml index 3cb76c33..31dcf637 100644 --- a/roles/docker-jenkins/tasks/main.yml +++ b/roles/docker-jenkins/tasks/main.yml @@ -2,8 +2,8 @@ include_role: name: nginx-domain-setup vars: - domain: "{{ domains[application_id] }}" - http_port: "{{ ports.localhost.http[application_id] }}" + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" - name: "docker jenkins" docker_compose: diff --git a/roles/docker-joomla/tasks/main.yml b/roles/docker-joomla/tasks/main.yml index 03016af5..e17c03d2 100644 --- a/roles/docker-joomla/tasks/main.yml +++ b/roles/docker-joomla/tasks/main.yml @@ -7,8 +7,8 @@ include_role: name: nginx-domain-setup vars: - domain: "{{ domains[application_id] }}" - http_port: "{{ ports.localhost.http[application_id] }}" + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" loop: "{{ domains }}" loop_control: loop_var: domain diff --git a/roles/docker-keycloak/tasks/main.yml b/roles/docker-keycloak/tasks/main.yml index 30ab57c8..cb8d7a90 100644 --- a/roles/docker-keycloak/tasks/main.yml +++ b/roles/docker-keycloak/tasks/main.yml @@ -7,8 +7,8 @@ include_role: name: nginx-domain-setup vars: - domain: "{{ domains[application_id] }}" - http_port: "{{ ports.localhost.http[application_id] }}" + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" - name: "copy docker-compose.yml and env file" include_tasks: copy-docker-compose-and-env.yml diff --git a/roles/docker-lam/tasks/main.yml b/roles/docker-lam/tasks/main.yml index 65e23553..09f2dea2 100644 --- a/roles/docker-lam/tasks/main.yml +++ b/roles/docker-lam/tasks/main.yml @@ -6,8 +6,8 @@ include_role: name: nginx-domain-setup vars: - domain: "{{ domains[application_id] }}" - http_port: "{{ ports.localhost.http[application_id] }}" + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" - name: "copy docker-compose.yml and env file" include_tasks: copy-docker-compose-and-env.yml diff --git a/roles/docker-listmonk/tasks/main.yml b/roles/docker-listmonk/tasks/main.yml index f272cff0..02b98312 100644 --- a/roles/docker-listmonk/tasks/main.yml +++ b/roles/docker-listmonk/tasks/main.yml @@ -16,8 +16,8 @@ include_role: name: nginx-domain-setup vars: - domain: "{{ domains[application_id] }}" - http_port: "{{ ports.localhost.http[application_id] }}" + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" - name: add config.toml template: diff --git a/roles/docker-matomo/tasks/main.yml b/roles/docker-matomo/tasks/main.yml index de2df511..2666cdca 100644 --- a/roles/docker-matomo/tasks/main.yml +++ b/roles/docker-matomo/tasks/main.yml @@ -8,8 +8,8 @@ include_role: name: nginx-domain-setup vars: - domain: "{{ domains[application_id] }}" - http_port: "{{ ports.localhost.http[application_id] }}" + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" when: run_once_docker_matomo is not defined - name: "copy docker-compose.yml and env file" diff --git a/roles/docker-mediawiki/tasks/main.yml b/roles/docker-mediawiki/tasks/main.yml index 62aa92ab..f0276cdf 100644 --- a/roles/docker-mediawiki/tasks/main.yml +++ b/roles/docker-mediawiki/tasks/main.yml @@ -7,8 +7,8 @@ include_role: name: nginx-domain-setup vars: - domain: "{{ domains[application_id] }}" - http_port: "{{ ports.localhost.http[application_id] }}" + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" - name: add docker-compose.yml template: src=docker-compose.yml.j2 dest={{docker_compose.directories.instance}}docker-compose.yml diff --git a/roles/docker-moodle/tasks/main.yml b/roles/docker-moodle/tasks/main.yml index e4f25248..64c393a3 100644 --- a/roles/docker-moodle/tasks/main.yml +++ b/roles/docker-moodle/tasks/main.yml @@ -7,8 +7,8 @@ include_role: name: nginx-domain-setup vars: - domain: "{{ domains[application_id] }}" - http_port: "{{ ports.localhost.http[application_id] }}" + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" - name: "Transfer Dockerfile to {{ docker_compose.directories.instance }}" template: diff --git a/roles/docker-openproject/tasks/main.yml b/roles/docker-openproject/tasks/main.yml index 7f62780c..c3262804 100644 --- a/roles/docker-openproject/tasks/main.yml +++ b/roles/docker-openproject/tasks/main.yml @@ -7,8 +7,8 @@ include_role: name: nginx-domain-setup vars: - domain: "{{ domains[application_id] }}" - http_port: "{{ ports.localhost.http[application_id] }}" + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" - name: "Create {{openproject_plugins_service}}" file: diff --git a/roles/docker-phpldapadmin/tasks/main.yml b/roles/docker-phpldapadmin/tasks/main.yml index 65e23553..09f2dea2 100644 --- a/roles/docker-phpldapadmin/tasks/main.yml +++ b/roles/docker-phpldapadmin/tasks/main.yml @@ -6,8 +6,8 @@ include_role: name: nginx-domain-setup vars: - domain: "{{ domains[application_id] }}" - http_port: "{{ ports.localhost.http[application_id] }}" + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" - name: "copy docker-compose.yml and env file" include_tasks: copy-docker-compose-and-env.yml diff --git a/roles/docker-phpmyadmin/tasks/main.yml b/roles/docker-phpmyadmin/tasks/main.yml index 9aba687b..4b2c53cf 100644 --- a/roles/docker-phpmyadmin/tasks/main.yml +++ b/roles/docker-phpmyadmin/tasks/main.yml @@ -7,8 +7,8 @@ include_role: name: nginx-domain-setup vars: - domain: "{{ domains[application_id] }}" - http_port: "{{ ports.localhost.http[application_id] }}" + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" - name: "copy docker-compose.yml and env file" include_tasks: copy-docker-compose-and-env.yml diff --git a/roles/docker-pixelfed/tasks/main.yml b/roles/docker-pixelfed/tasks/main.yml index 4c0c4419..63b356b1 100644 --- a/roles/docker-pixelfed/tasks/main.yml +++ b/roles/docker-pixelfed/tasks/main.yml @@ -7,8 +7,8 @@ include_role: name: nginx-domain-setup vars: - domain: "{{ domains[application_id] }}" - http_port: "{{ ports.localhost.http[application_id] }}" + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" - name: "copy docker-compose.yml and env file" include_tasks: copy-docker-compose-and-env.yml \ No newline at end of file diff --git a/roles/docker-portfolio/tasks/main.yml b/roles/docker-portfolio/tasks/main.yml index e1ef21d0..f3b5852c 100644 --- a/roles/docker-portfolio/tasks/main.yml +++ b/roles/docker-portfolio/tasks/main.yml @@ -7,8 +7,8 @@ include_role: name: nginx-domain-setup vars: - domain: "{{ domains[application_id] }}" - http_port: "{{ ports.localhost.http[application_id] }}" + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" - name: "include role docker-repository-setup for {{application_id}}" include_role: diff --git a/roles/docker-presentation/tasks/main.yml b/roles/docker-presentation/tasks/main.yml index b9b76d59..4a3d6db2 100644 --- a/roles/docker-presentation/tasks/main.yml +++ b/roles/docker-presentation/tasks/main.yml @@ -24,7 +24,7 @@ name: nginx-domain-setup vars: domain: "{{ domains[application_id] }}" - http_port: "{{ ports.localhost.http[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" - name: "copy docker-compose.yml and env file" include_tasks: copy-docker-compose-and-env.yml \ No newline at end of file diff --git a/roles/docker-snipe_it/tasks/main.yml b/roles/docker-snipe_it/tasks/main.yml index 58d85582..56d10aaf 100644 --- a/roles/docker-snipe_it/tasks/main.yml +++ b/roles/docker-snipe_it/tasks/main.yml @@ -7,8 +7,8 @@ include_role: name: nginx-domain-setup vars: - domain: "{{ domains[application_id] }}" - http_port: "{{ ports.localhost.http[application_id] }}" + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" - name: "copy docker-compose.yml and env file" include_tasks: copy-docker-compose-and-env.yml diff --git a/roles/docker-sphinx/tasks/main.yml b/roles/docker-sphinx/tasks/main.yml index e3069f0d..1e4d15d8 100644 --- a/roles/docker-sphinx/tasks/main.yml +++ b/roles/docker-sphinx/tasks/main.yml @@ -20,7 +20,7 @@ name: nginx-domain-setup vars: domain: "{{ domains[application_id] }}" - http_port: "{{ ports.localhost.http[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" - name: "copy docker-compose.yml and env file" include_tasks: copy-docker-compose-and-env.yml \ No newline at end of file diff --git a/roles/docker-taiga/tasks/main.yml b/roles/docker-taiga/tasks/main.yml index 20db5088..9a33daf1 100644 --- a/roles/docker-taiga/tasks/main.yml +++ b/roles/docker-taiga/tasks/main.yml @@ -7,8 +7,8 @@ include_role: name: nginx-domain-setup vars: - domain: "{{ domains[application_id] }}" - http_port: "{{ ports.localhost.http[application_id] }}" + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" - name: "include role docker-repository-setup for {{application_id}}" include_role: @@ -24,8 +24,8 @@ - name: "create {{docker_compose_init}}" template: - src: "docker-compose-inits.yml.j2" - dest: "{{docker_compose_init}}" + src: "docker-compose-inits.yml.j2" + dest: "{{docker_compose_init}}" notify: docker compose project build and setup - name: "copy docker-compose.yml and env file" diff --git a/roles/docker-yourls/tasks/main.yml b/roles/docker-yourls/tasks/main.yml index 58d85582..56d10aaf 100644 --- a/roles/docker-yourls/tasks/main.yml +++ b/roles/docker-yourls/tasks/main.yml @@ -7,8 +7,8 @@ include_role: name: nginx-domain-setup vars: - domain: "{{ domains[application_id] }}" - http_port: "{{ ports.localhost.http[application_id] }}" + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" - name: "copy docker-compose.yml and env file" include_tasks: copy-docker-compose-and-env.yml