From b56ccd5a92ee3725a820fa3b92281586996da9e5 2018-06-03 12:13:15 From: Branko Majic Date: 2018-06-03 12:13:15 Subject: [PATCH] MAR-129: Fixed linting errors in the test site files. --- diff --git a/testsite/group_vars/all.yml b/testsite/group_vars/all.yml index ac10537adf2b5a48cee78d12ab5b7caa804350bc..eeaa0843a3754d56fd1ee72a2f47bab4e5b909c3 100644 --- a/testsite/group_vars/all.yml +++ b/testsite/group_vars/all.yml @@ -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 ) }}" diff --git a/testsite/group_vars/backup.yml b/testsite/group_vars/backup.yml index dc9d2eea12b8e6c3f1bfe482c3293d0354dbe1e6..8b4adb817c98ebf56d39045891c9f06e346f5fc7 100644 --- a/testsite/group_vars/backup.yml +++ b/testsite/group_vars/backup.yml @@ -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 }} diff --git a/testsite/group_vars/ldap.yml b/testsite/group_vars/ldap.yml index 99e5ea1c18b5bbcca698fe5192b193b2e66f82cc..8fda96897c5aae8ef135cfe939ed7a8288b1c49b 100644 --- a/testsite/group_vars/ldap.yml +++ b/testsite/group_vars/ldap.yml @@ -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 diff --git a/testsite/group_vars/mail.yml b/testsite/group_vars/mail.yml index d21511765ffb3bfa4d9c438e4e14cc685fdb37a4..68edcbf8f0ba9e75610fe8990e608bb159c5a8f4 100644 --- a/testsite/group_vars/mail.yml +++ b/testsite/group_vars/mail.yml @@ -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" diff --git a/testsite/group_vars/web.yml b/testsite/group_vars/web.yml index 2869e56b5e31b5cb9773886193c499aee2bf1a34..380c3d06b5d74e9b7e045d2f8525d2bb50ac96b2 100644 --- a/testsite/group_vars/web.yml +++ b/testsite/group_vars/web.yml @@ -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" diff --git a/testsite/group_vars/workstation.yml b/testsite/group_vars/workstation.yml index 4bfdd8041c66c326f37dab4169982da27bb0a149..ace0861a5020c964f0ad5ca93933ebf46a6cfd4a 100644 --- a/testsite/group_vars/workstation.yml +++ b/testsite/group_vars/workstation.yml @@ -9,4 +9,4 @@ smtp_relay_truststore: "{{ lookup('file', inventory_dir + '/tls/ca.pem') }}" extra_backup_patterns: - "/root" - - "/home/admin" \ No newline at end of file + - "/home/admin" diff --git a/testsite/playbooks/backup.yml b/testsite/playbooks/backup.yml index 980756395bf80b64c563a33b71ff28abf8792546..6cad8b1ae9ee56caefaf051b310e78ea0b828b01 100644 --- a/testsite/playbooks/backup.yml +++ b/testsite/playbooks/backup.yml @@ -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 diff --git a/testsite/playbooks/bootstrap.yml b/testsite/playbooks/bootstrap.yml index 97154f39ece672e3319027e7180db65d38801601..0e808f433841d3e9b6d4f3667c908e20e733cbb2 100644 --- a/testsite/playbooks/bootstrap.yml +++ b/testsite/playbooks/bootstrap.yml @@ -3,4 +3,4 @@ - hosts: testsite remote_user: root roles: - - bootstrap \ No newline at end of file + - bootstrap diff --git a/testsite/playbooks/ldap.yml b/testsite/playbooks/ldap.yml index 82539b84c43e6f2e3f1a56451f73020d0219520a..b2e4fc51576d2f3cb8e1be5390ea9c0b97b21eb0 100644 --- a/testsite/playbooks/ldap.yml +++ b/testsite/playbooks/ldap.yml @@ -2,7 +2,7 @@ - hosts: ldap remote_user: ansible - become: yes + become: true roles: - common - mail_forwarder diff --git a/testsite/playbooks/mail.yml b/testsite/playbooks/mail.yml index a1dadbc5c92e6e049fd3928dd5a8f2af1d3d322b..374c02cf28364fdfdca50915d7bb13819476d049 100644 --- a/testsite/playbooks/mail.yml +++ b/testsite/playbooks/mail.yml @@ -2,7 +2,7 @@ - hosts: mail remote_user: ansible - become: yes + become: true roles: - common - ldap_client diff --git a/testsite/playbooks/preseed.yml b/testsite/playbooks/preseed.yml index f2598e0a9214b3ce7e40f01403120eae158babf7..2e895a42d72accc73205ac2b2ed61d4b695ce290 100644 --- a/testsite/playbooks/preseed.yml +++ b/testsite/playbooks/preseed.yml @@ -1,5 +1,6 @@ --- + # Playbook for generating Debian preseed files for automating the installation. - hosts: preseed roles: - - preseed \ No newline at end of file + - preseed diff --git a/testsite/playbooks/roles/phpinfo/meta/main.yml b/testsite/playbooks/roles/phpinfo/meta/main.yml index c61cf2b4902b39dca2b7ef2a5e2e3d5c7ac3e4c5..8fe983bd10de76f1c5fc297fe0c304ea3968e179 100644 --- a/testsite/playbooks/roles/phpinfo/meta/main.yml +++ b/testsite/playbooks/roles/phpinfo/meta/main.yml @@ -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 }} diff --git a/testsite/playbooks/roles/wsgihello/meta/main.yml b/testsite/playbooks/roles/wsgihello/meta/main.yml index e583920bb9a937c621a41e20acab96ab70d1f054..ed4d616e49a119dd3c054e47d738c3e90ddaeba2 100644 --- a/testsite/playbooks/roles/wsgihello/meta/main.yml +++ b/testsite/playbooks/roles/wsgihello/meta/main.yml @@ -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 }} diff --git a/testsite/playbooks/roles/wsgihello2/meta/main.yml b/testsite/playbooks/roles/wsgihello2/meta/main.yml index ed06a8e101af83879303edad2eb96fb7a9f2c770..f077d98ea170a88f019067b032cc976f854b25aa 100644 --- a/testsite/playbooks/roles/wsgihello2/meta/main.yml +++ b/testsite/playbooks/roles/wsgihello2/meta/main.yml @@ -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 }} diff --git a/testsite/playbooks/site.yml b/testsite/playbooks/site.yml index 8ad3faa7c94f79bec88a00764fde7f22aefe9922..b0ad8b25dfc79aeac8fd6dcb953096b022928344 100644 --- a/testsite/playbooks/site.yml +++ b/testsite/playbooks/site.yml @@ -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 diff --git a/testsite/playbooks/web.yml b/testsite/playbooks/web.yml index 8022d6a5ff50087348216798990c9cd520fa63ac..612508be2234ba7e383fcee860aca69d4486ad0b 100644 --- a/testsite/playbooks/web.yml +++ b/testsite/playbooks/web.yml @@ -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 diff --git a/testsite/playbooks/ws.yml b/testsite/playbooks/ws.yml index 9fb6c0899fbd2ecde9a40894f04872c37e482971..2b9a8ce0c121116dc06096554417d466764ad615 100644 --- a/testsite/playbooks/ws.yml +++ b/testsite/playbooks/ws.yml @@ -2,7 +2,7 @@ - hosts: workstation remote_user: ansible - become: yes + become: true roles: - common - mail_forwarder diff --git a/testsite/playbooks/xmpp.yml b/testsite/playbooks/xmpp.yml index b5baa4c3fb2f17b65eca7b79043cf814414dd8f4..d7403e201a01de18ef41ad679e6e525897094522 100644 --- a/testsite/playbooks/xmpp.yml +++ b/testsite/playbooks/xmpp.yml @@ -2,7 +2,7 @@ - hosts: xmpp remote_user: ansible - become: yes + become: true roles: - common - ldap_client