Skip to content
Snippets Groups Projects
Commit 428dfd1a authored by jurgenhaas's avatar jurgenhaas
Browse files

ansible-playbooks/general#85 Linting

parent 4240ec85
No related branches found
No related tags found
No related merge requests found
---
matomo_version: 3.9.1 matomo_version: 3.9.1
matomo_force_reset: False matomo_force_reset: no
...@@ -2,16 +2,16 @@ ...@@ -2,16 +2,16 @@
# file: roles/matomo/tasks/install.yml # file: roles/matomo/tasks/install.yml
- block: - block:
- set_fact: - set_fact:
webRoot: /var/www/matomo/{{ matomo.id }} webRoot: /var/www/matomo/{{ matomo.id }}
apacheUser: www-data apacheUser: www-data
apacheLogDir: /var/log/apache2 apacheLogDir: /var/log/apache2
when: matomo.jail is not defined when: matomo.jail is not defined
- set_fact: - set_fact:
webRoot: '{{ jailroot }}/{{ matomo.id }}/var/www/matomo' webRoot: '{{ jailroot }}/{{ matomo.id }}/var/www/matomo'
apacheUser: '{{ matomo.id }}' apacheUser: '{{ matomo.id }}'
apacheLogDir: '{{ jailroot }}/{{ matomo.id }}/var/log/apache2' apacheLogDir: '{{ jailroot }}/{{ matomo.id }}/var/log/apache2'
when: matomo.jail is defined when: matomo.jail is defined
tags: tags:
- always - always
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
track_submodules: yes track_submodules: yes
force: yes force: yes
version: '{{ matomo_version }}' version: '{{ matomo_version }}'
become: false become: no
environment: environment:
GIT_LFS_SKIP_SMUDGE: 1 GIT_LFS_SKIP_SMUDGE: 1
tags: tags:
......
...@@ -8,26 +8,26 @@ ...@@ -8,26 +8,26 @@
- always - always
- block: - block:
- name: Install Certs - name: Install Certs
include_tasks: ../../letsencrypt/tasks/cert.yml include_tasks: ../../letsencrypt/tasks/cert.yml
with_items: '{{ matomo_settings|default([]) }}' with_items: '{{ matomo_settings|default([]) }}'
loop_control: loop_control:
loop_var: domain loop_var: domain
when: domain.protocol|default("https") == "https" and domain.letsencrypt|default(true) when: domain.protocol|default("https") == "https" and domain.letsencrypt|default(true)
tags: tags:
- ApacheConfig - ApacheConfig
when: not excluded_roles or "letsencrypt" not in excluded_roles and groups.proxyserver is not defined when: not excluded_roles or "letsencrypt" not in excluded_roles and groups.proxyserver is not defined
- block: - block:
- name: Install matomo - name: Install matomo
include_tasks: install.yml include_tasks: install.yml
with_items: '{{ matomo_settings|default([]) }}' with_items: '{{ matomo_settings|default([]) }}'
loop_control: loop_control:
loop_var: matomo loop_var: matomo
when: limit_site is not defined or limit_site == 'no' or matomo.id is not defined or limit_site == matomo.id when: limit_site is not defined or limit_site == 'no' or matomo.id is not defined or limit_site == matomo.id
tags: tags:
- ApacheConfig - ApacheConfig
- deploy - deploy
when: not excluded_roles or "matomo" not in excluded_roles when: not excluded_roles or "matomo" not in excluded_roles
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment