fix naming and indentation

meta/main.yml

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

tasks/nginx.yml

@@ -1,30 +1,30 @@
 ---
 - block:
-  - name: Copy certs and private key to nginx proxy (content)
+    - name: Copy certs and private key to nginx proxy (content)
-    copy:
+      copy:
-      content: "{{ item.src }}"
+        content: "{{ item.src }}"
-      dest: "{{ item.dest }}"
+        dest: "{{ item.dest }}"
-      mode: "{{ item.mode }}"
+        mode: "{{ item.mode }}"
-    with_items:
+      with_items:
-      - { src: "{{ pve_tls_key_source }}", dest: '/etc/pki/tls/private/{{ pve_nginx_tls_key_file }}', mode: '0600' }
+        - { src: "{{ pve_tls_key_source }}", dest: '/etc/pki/tls/private/{{ pve_nginx_tls_key_file }}', mode: '0600' }
-      - { src: "{{ pve_tls_cert_source }}", dest: '/etc/pki/tls/certs/{{ pve_nginx_tls_cert_file }}', mode: '0750' }
+        - { src: "{{ pve_tls_cert_source }}", dest: '/etc/pki/tls/certs/{{ pve_nginx_tls_cert_file }}', mode: '0750' }
-    loop_control:
+      loop_control:
-      label: "{{ item.dest }}"
+        label: "{{ item.dest }}"
-    notify: __nginx_reload
+      notify: __nginx_reload
-    when: pve_tls_source_use_content
+      when: pve_tls_source_use_content
 
-  - name: Copy certs and private key to nginx proxy (files)
+    - name: Copy certs and private key to nginx proxy (files)
-    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: "{{ pve_tls_key_source }}", dest: '/etc/pki/tls/private/{{ pve_nginx_tls_key_file }}', mode: '0600' }
+        - { src: "{{ pve_tls_key_source }}", dest: '/etc/pki/tls/private/{{ pve_nginx_tls_key_file }}', mode: '0600' }
-      - { src: "{{ pve_tls_cert_source }}", dest: '/etc/pki/tls/certs/{{ pve_nginx_tls_cert_file }}', mode: '0750' }
+        - { src: "{{ pve_tls_cert_source }}", dest: '/etc/pki/tls/certs/{{ pve_nginx_tls_cert_file }}', mode: '0750' }
-    loop_control:
+      loop_control:
-      label: "{{ item.dest }}"
+        label: "{{ item.dest }}"
-    notify: __nginx_reload
+      notify: __nginx_reload
-    when: pve_tls_source_use_files
+      when: pve_tls_source_use_files
   delegate_to: "{{ pve_nginx_server }}"
   when: pve_nginx_tls_enabled
   become: True
@@ -32,31 +32,31 @@
   tags: tls_renewal
 
 - block:
-  - name: Add vhost configuration file
+    - name: Add vhost configuration file
-    template:
+      template:
-      src: nginx/vhost.j2
+        src: nginx/vhost.j2
-      dest: "{{ pve_nginx_vhost_dir }}/pve"
+        dest: "{{ pve_nginx_vhost_dir }}/pve"
-      owner: root
+        owner: root
-      group: root
+        group: root
-      mode: 0640
+        mode: 0640
-    notify: __nginx_reload
+      notify: __nginx_reload
 
-  - name: Enable pve vhost
+    - name: Enable pve vhost
-    file:
+      file:
-      src: "{{ pve_nginx_vhost_dir }}/pve"
+        src: "{{ pve_nginx_vhost_dir }}/pve"
-      dest: "{{ pve_nginx_vhost_symlink }}/pve"
+        dest: "{{ pve_nginx_vhost_symlink }}/pve"
-      owner: root
+        owner: root
-      group: root
+        group: root
-      state: link
+        state: link
-    notify: __nginx_reload
+      notify: __nginx_reload
-    when: pve_nginx_vhost_symlink is defined
+      when: pve_nginx_vhost_symlink is defined
 
-  - name: Open ports in iptables
+    - name: Open ports in iptables
-    iptables_raw:
+      iptables_raw:
-      name: allow_pve_nginx_proxy
+        name: allow_pve_nginx_proxy
-      state: present
+        state: present
-      rules: '-A OUTPUT -m state --state NEW -p tcp -d {{ pve_server_ip }} --dport {{ pve_server_port }} -j ACCEPT'
+        rules: '-A OUTPUT -m state --state NEW -p tcp -d {{ pve_server_ip }} --dport {{ pve_server_port }} -j ACCEPT'
-    when: pve_nginx_iptables_enabled
+      when: pve_nginx_iptables_enabled
   delegate_to: "{{ pve_nginx_server }}"
   become: True
   become_user: root

tasks/tls.yml

@@ -1,57 +1,59 @@
 ---
 - block:
-  - name: Create pki folder structure
+    - name: Create pki folder structure
-    file:
+      file:
-      path: "{{ item }}"
+        path: "{{ item }}"
-      state: directory
+        state: directory
-      recurse: True
+        recurse: True
-    with_items:
+      with_items:
-      - /etc/pki/tls/certs
+        - /etc/pki/tls/certs
-      - /etc/pki/tls/private
+        - /etc/pki/tls/private
 
-  - name: Copy certs and private key (file)
+    - name: Copy certs and private key (file)
-    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: "{{ pve_tls_cert_source }}", dest: "/etc/pki/tls/certs/pveproxy-ssl.pem", mode: "0750" }
+        - { src: "{{ pve_tls_cert_source }}", dest: "/etc/pki/tls/certs/pveproxy-ssl.pem", mode: "0750" }
-      - { src: "{{ pve_tls_key_source }}", dest: "/etc/pki/tls/private/pveproxy-ssl.key", mode: "0600" }
+        - { src: "{{ pve_tls_key_source }}", dest: "/etc/pki/tls/private/pveproxy-ssl.key", mode: "0600" }
-    loop_control:
+      loop_control:
-      label: "{{ item.dest }}"
+        label: "{{ item.dest }}"
-    register: __pve_copy_cert_file
+      register: __pve_copy_cert_file
-    when: pve_tls_source_use_files
+      when: pve_tls_source_use_files
 
-  - set_fact:
+    - name: Set tls control variable
-      __pve_copy_cert: "{{ __pve_copy_cert_file }}"
+      set_fact:
-    when: pve_tls_source_use_files
+        __pve_copy_cert: "{{ __pve_copy_cert_file }}"
+      when: pve_tls_source_use_files
 
-  - name: Copy certs and private key (content)
+    - name: Copy certs and private key (content)
-    copy:
+      copy:
-      content: "{{ item.src }}"
+        content: "{{ item.src }}"
-      dest: "{{ item.dest }}"
+        dest: "{{ item.dest }}"
-      mode: "{{ item.mode }}"
+        mode: "{{ item.mode }}"
-    with_items:
+      with_items:
-      - { src: "{{ pve_tls_cert_source }}", dest: "/etc/pki/tls/certs", mode: "0750" }
+        - { src: "{{ pve_tls_cert_source }}", dest: "/etc/pki/tls/certs", mode: "0750" }
-      - { src: "{{ pve_tls_key_source }}", dest: "/etc/pki/tls/private", mode: "0600" }
+        - { src: "{{ pve_tls_key_source }}", dest: "/etc/pki/tls/private", mode: "0600" }
-    loop_control:
+      loop_control:
-      label: "{{ item.dest }}"
+        label: "{{ item.dest }}"
-    register: __pve_copy_cert_content
+      register: __pve_copy_cert_content
-    when: pve_tls_source_use_content
+      when: pve_tls_source_use_content
 
-  - set_fact:
+    - name: Set tls control variable
-      __pve_copy_cert: "{{ __pve_copy_cert_content }}"
+      set_fact:
-    when: pve_tls_source_use_content
+        __pve_copy_cert: "{{ __pve_copy_cert_content }}"
+      when: pve_tls_source_use_content
 
-  - name: Copy cert/key to pve filesystem
+    - name: Copy cert/key to pve filesystem
-    command: "/bin/cp -rf {{ item[0].dest }} /etc/pve/nodes/{{ item[1] }}/{{ item[0].dest | basename }}"
+      command: "/bin/cp -rf {{ item[0].dest }} /etc/pve/nodes/{{ item[1] }}/{{ item[0].dest | basename }}"
-    when: item[0].changed
+      when: item[0].changed
-    changed_when: item[0].changed
+      changed_when: item[0].changed
-    with_nested:
+      with_nested:
-      - "{{ __pve_copy_cert.results }}"
+        - "{{ __pve_copy_cert.results }}"
-      - "{{ pve_nodes }}"
+        - "{{ pve_nodes }}"
-    loop_control:
+      loop_control:
-      label: "/etc/pve/nodes/{{ item[1] }}/{{ item[0].dest | basename }}"
+        label: "/etc/pve/nodes/{{ item[1] }}/{{ item[0].dest | basename }}"
-    notify: __pveproxy_restart
+      notify: __pveproxy_restart
   become: True
   become_user: root