majic-ansible-roles Changeset

Changeset - b56ccd5a92ee

Parent rev.

Child rev.

[Not reviewed]

0 18 0

Branko Majic (branko) - 6 years ago 2018-06-03 12:13:15
branko@majic.rs

MAR-129: Fixed linting errors in the test site files.

18 files changed with 26 insertions and 21 deletions:

testsite/group_vars/all.yml

testsite/group_vars/backup.yml

testsite/group_vars/ldap.yml

testsite/group_vars/mail.yml

testsite/group_vars/web.yml

testsite/group_vars/workstation.yml

testsite/playbooks/backup.yml

testsite/playbooks/bootstrap.yml

testsite/playbooks/ldap.yml

testsite/playbooks/mail.yml

testsite/playbooks/preseed.yml

testsite/playbooks/roles/phpinfo/meta/main.yml

testsite/playbooks/roles/wsgihello/meta/main.yml

testsite/playbooks/roles/wsgihello2/meta/main.yml

testsite/playbooks/site.yml

testsite/playbooks/web.yml

testsite/playbooks/ws.yml

testsite/playbooks/xmpp.yml

0 comments (0 inline, 0 general)

testsite/group_vars/all.yml

➞

Show inline comments

@@ @@ -63,7 +63,7 @@ ldap_client_config: @@
     value: demand
 # Enable and configure backups
-enable_backup: yes
+enable_backup: true
 backup_additional_encryption_keys:
   - "{{ lookup('pipe', 'gpg2 --homedir \"' + inventory_dir + '/backup_keyring' + '\" --armor --export backup.' + testsite_domain ) }}"

testsite/group_vars/backup.yml

➞

Show inline comments

@@ @@ -5,7 +5,7 @@ local_mail_aliases: @@
 smtp_relay_host: mail.{{ testsite_domain }}
-smtp_relay_truststore:  "{{ lookup('file', inventory_dir + '/tls/ca.pem') }}"
 smtp_relay_truststore: "{{ lookup('file', inventory_dir + '/tls/ca.pem') }}"
 backup_clients:
   - server: web.{{ testsite_domain }}

testsite/group_vars/ldap.yml

➞

Show inline comments

@@ @@ -4,7 +4,7 @@ local_mail_aliases: @@
   root: "root john.doe@{{ testsite_domain }}"
 smtp_relay_host: mail.{{ testsite_domain }}
-smtp_relay_truststore:  "{{ lookup('file', inventory_dir + '/tls/ca.pem') }}"
 smtp_relay_truststore: "{{ lookup('file', inventory_dir + '/tls/ca.pem') }}"
 ldap_client_config:
   - comment: Set the base DN

testsite/group_vars/mail.yml

➞

Show inline comments

@@ @@ -36,4 +36,6 @@ mail_server_tls_protocols: @@
   - TLSv1.2
   - TLSv1.1
 mail_server_tls_ciphers: "DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384:DHE-RSA-AES256-SHA:!aNULL:!MD5:!EXPORT"
 mail_server_tls_ciphers: "DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-GCM-SHA384:\
 DHE-RSA-AES256-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-GCM-SHA384:\
 ECDHE-RSA-AES256-SHA384:DHE-RSA-AES256-SHA:!aNULL:!MD5:!EXPORT"

testsite/group_vars/web.yml

➞

Show inline comments

@@ @@ -29,4 +29,6 @@ web_server_tls_protocols: @@
   - TLSv1.2
   - TLSv1.1
 web_server_tls_ciphers: "DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384:DHE-RSA-AES256-SHA:!aNULL:!MD5:!EXPORT"
@@ \ No newline at end of file @@
 web_server_tls_ciphers: "DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES128-SHA256:\
 DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-SHA256:ECDHE-RSA-AES128-GCM-SHA256:\
 ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384:DHE-RSA-AES256-SHA:!aNULL:!MD5:!EXPORT"

testsite/group_vars/workstation.yml

➞

Show inline comments

 extra_backup_patterns:
   - "/root"
   - "/home/admin"
@@ \ No newline at end of file @@
   - "/home/admin"

testsite/playbooks/backup.yml

➞

Show inline comments

@@ @@ -2,8 +2,8 @@ @@
 - hosts: backup
   remote_user: ansible
-  become: yes
+  become: true
   roles:
     - common
     - mail_forwarder
     - backup_server
@@ \ No newline at end of file @@
     - backup_server

testsite/playbooks/bootstrap.yml

➞

Show inline comments

@@ @@ -3,4 +3,4 @@ @@
 - hosts: testsite
   remote_user: root
   roles:
     - bootstrap
@@ \ No newline at end of file @@
     - bootstrap

testsite/playbooks/ldap.yml

➞

Show inline comments

@@ @@ -2,7 +2,7 @@ @@
 - hosts: ldap
   remote_user: ansible
-  become: yes
+  become: true
   roles:
     - common
     - mail_forwarder

testsite/playbooks/mail.yml

➞

Show inline comments

@@ @@ -2,7 +2,7 @@ @@
 - hosts: mail
   remote_user: ansible
-  become: yes
+  become: true
   roles:
     - common
     - ldap_client

testsite/playbooks/preseed.yml

➞

Show inline comments

 ---
 # Playbook for generating Debian preseed files for automating the installation.
 - hosts: preseed
   roles:
     - preseed
@@ \ No newline at end of file @@
     - preseed

testsite/playbooks/roles/phpinfo/meta/main.yml

➞

Show inline comments

@@ @@ -7,11 +7,11 @@ dependencies: @@
       - ^(.*) /index.php
     admin_uid: 3000
     uid: 2000
-    enforce_https: False
+    enforce_https: false
     https_tls_key: "{{ lookup('file', inventory_dir + '/tls/phpinfo.' + testsite_domain + '_https.key') }}"
     https_tls_certificate: "{{ lookup('file', inventory_dir + '/tls/phpinfo.' + testsite_domain + '_https.pem') }}"
     additional_fpm_config:
       "env[PATH]": "\"/usr/local/bin:/usr/bin:/bin\""
   - role: database
     db_name: phpinfo_{{ testsite_domain_underscores }}
     db_password: phpinfo_{{ testsite_domain_underscores }}
@@ \ No newline at end of file @@
     db_password: phpinfo_{{ testsite_domain_underscores }}

testsite/playbooks/roles/wsgihello/meta/main.yml

➞

Show inline comments

@@ @@ -14,4 +14,4 @@ dependencies: @@
       WEBSITE_NAME: "Majic Ansible Roles Test Site"
   - role: database
     db_name: wsgi_{{ testsite_domain_underscores }}
     db_password: wsgi_{{ testsite_domain_underscores }}
@@ \ No newline at end of file @@
     db_password: wsgi_{{ testsite_domain_underscores }}

testsite/playbooks/roles/wsgihello2/meta/main.yml

➞

Show inline comments

@@ @@ -17,4 +17,4 @@ dependencies: @@
       - gunicorn==19.6.0
   - role: database
     db_name: wsgi_{{ testsite_domain_underscores }}
     db_password: wsgi_{{ testsite_domain_underscores }}
@@ \ No newline at end of file @@
     db_password: wsgi_{{ testsite_domain_underscores }}

testsite/playbooks/site.yml

➞

Show inline comments

@@ @@ -6,4 +6,4 @@ @@
 - include: mail.yml
 - include: web.yml
 - include: backup.yml
 - include: ws.yml
@@ \ No newline at end of file @@
 - include: ws.yml

testsite/playbooks/web.yml

➞

Show inline comments

@@ @@ -2,7 +2,7 @@ @@
 - hosts: web
   remote_user: ansible
-  become: yes
+  become: true
   roles:
     - common
     - ldap_client
@@ @@ -11,4 +11,4 @@ @@
     - web_server
     - phpinfo
     - wsgihello
     - wsgihello2
@@ \ No newline at end of file @@
     - wsgihello2

testsite/playbooks/ws.yml

➞

Show inline comments

@@ @@ -2,7 +2,7 @@ @@
 - hosts: workstation
   remote_user: ansible
-  become: yes
+  become: true
   roles:
     - common
     - mail_forwarder

testsite/playbooks/xmpp.yml

➞

Show inline comments

@@ @@ -2,7 +2,7 @@ @@
 - hosts: xmpp
   remote_user: ansible
-  become: yes
+  become: true
   roles:
     - common
     - ldap_client

0 comments (0 inline, 0 general)