fix indentation and spaces
Some checks failed
the build failed

This commit is contained in:
Robert Kaussow 2019-01-09 22:33:12 +01:00
parent 71e28396b3
commit 4e96408085
2 changed files with 59 additions and 58 deletions

View File

@ -1,3 +1,4 @@
# Standards: 0.1
--- ---
galaxy_info: galaxy_info:
author: xoxys author: xoxys
@ -5,9 +6,9 @@ galaxy_info:
license: MIT license: MIT
min_ansible_version: 2.4 min_ansible_version: 2.4
platforms: platforms:
- name: EL - name: EL
versions: versions:
- 7 - 7
galaxy_tags: galaxy_tags:
- univention - univention
- ucs - ucs

View File

@ -1,64 +1,64 @@
--- ---
- block: - block:
- name: Create tls folder structure - name: Create tls folder structure
file: file:
path: "{{ item }}" path: "{{ item }}"
state: directory state: directory
mode: 700 mode: 700
with_items: with_items:
- "{{ ucs_tls_certs_dir }}" - "{{ ucs_tls_certs_dir }}"
- "{{ ucs_tls_key_dir }}" - "{{ ucs_tls_key_dir }}"
- name: Copy certs and private key - name: Copy certs and private key
copy: copy:
src: "{{ item.src }}" src: "{{ item.src }}"
dest: "{{ item.dest }}" dest: "{{ item.dest }}"
mode: "{{item.mode }}" mode: "{{item.mode }}"
with_items: with_items:
- { src: "{{ ucs_tls_cert_path }}", dest: "{{ ucs_tls_certs_dir }}/ucs.pem", mode: '0600' } - { src: "{{ ucs_tls_cert_path }}", dest: "{{ ucs_tls_certs_dir }}/ucs.pem", mode: '0600' }
- { src: "{{ ucs_tls_key_path }}", dest: "{{ ucs_tls_key_dir }}/ucs.pem", mode: '0750' } - { src: "{{ ucs_tls_key_path }}", dest: "{{ ucs_tls_key_dir }}/ucs.pem", mode: '0750' }
loop_control: loop_control:
label: "{{ item.dest }}" label: "{{ item.dest }}"
notify: notify:
- __ucs_apache_restart - __ucs_apache_restart
- __ucs_dovecot_restart - __ucs_dovecot_restart
- __ucs_postfix_restart - __ucs_postfix_restart
- name: Set apache2 ucr vars - name: Set apache2 ucr vars
ucr: ucr:
path: "{{ item.path }}" path: "{{ item.path }}"
value: "{{ item.value }}" value: "{{ item.value }}"
with_items: with_items:
- { path: apache2/ssl/certificate, value: "{{ ucs_tls_certs_dir }}/ucs.pem" } - { path: apache2/ssl/certificate, value: "{{ ucs_tls_certs_dir }}/ucs.pem" }
- { path: apache2/ssl/key, value: "{{ ucs_tls_key_dir }}/ucs.pem" } - { path: apache2/ssl/key, value: "{{ ucs_tls_key_dir }}/ucs.pem" }
loop_control: loop_control:
label: "variable: {{ item.path }}={{ item.value }}" label: "variable: {{ item.path }} = {{ item.value }}"
notify: __ucs_apache_restart notify: __ucs_apache_restart
when: ucs_custom_tls_apache2_enabled when: ucs_custom_tls_apache2_enabled
- name: Set dovecot ucr vars - name: Set dovecot ucr vars
ucr: ucr:
path: "{{ item.path }}" path: "{{ item.path }}"
value: "{{ item.value }}" value: "{{ item.value }}"
with_items: with_items:
- { path: mail/dovecot/ssl/certificate, value: "{{ ucs_tls_certs_dir }}/ucs.pem" } - { path: mail/dovecot/ssl/certificate, value: "{{ ucs_tls_certs_dir }}/ucs.pem" }
- { path: mail/dovecot/ssl/key, value: "{{ ucs_tls_key_dir }}/ucs.pem" } - { path: mail/dovecot/ssl/key, value: "{{ ucs_tls_key_dir }}/ucs.pem" }
loop_control: loop_control:
label: "variable: {{ item.path }}={{ item.value }}" label: "variable: {{ item.path }} = {{ item.value }}"
notify: __ucs_dovecot_restart notify: __ucs_dovecot_restart
when: ucs_custom_tls_dovecot_enabled when: ucs_custom_tls_dovecot_enabled
- name: Set postfix ucr vars - name: Set postfix ucr vars
ucr: ucr:
path: "{{ item.path }}" path: "{{ item.path }}"
value: "{{ item.value }}" value: "{{ item.value }}"
with_items: with_items:
- { path: mail/postfix/ssl/certificate, value: "{{ ucs_tls_certs_dir }}/ucs.pem" } - { path: mail/postfix/ssl/certificate, value: "{{ ucs_tls_certs_dir }}/ucs.pem" }
- { path: mail/postfix/ssl/key, value: "{{ ucs_tls_key_dir }}/ucs.pem" } - { path: mail/postfix/ssl/key, value: "{{ ucs_tls_key_dir }}/ucs.pem" }
loop_control: loop_control:
label: "variable: {{ item.path }}={{ item.value }}" label: "variable: {{ item.path }} = {{ item.value }}"
notify: __ucs_postfix_restart notify: __ucs_postfix_restart
when: ucs_custom_tls_postfix_enabled when: ucs_custom_tls_postfix_enabled
become: True become: True
become_user: root become_user: root
when: ucs_custom_tls_enabled when: ucs_custom_tls_enabled