majic-ansible-roles Changeset

Changeset - b56ccd5a92ee

Parent rev.

Child rev.

[Not reviewed]

0 18 0

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

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

11 files changed with 15 insertions and 10 deletions:

testsite/group_vars/all.yml

testsite/group_vars/mail.yml

testsite/group_vars/web.yml

testsite/playbooks/backup.yml

testsite/playbooks/ldap.yml

testsite/playbooks/mail.yml

testsite/playbooks/preseed.yml

testsite/playbooks/roles/phpinfo/meta/main.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

@@ @@ -54,25 +54,25 @@ ldap_client_config: @@
     value: "{{ testsite_ldap_base }}"
   - comment: Set the default URI
     option: URI
     value: ldap://ldap.{{ testsite_domain }}/
   - comment: Set the LDAP TLS truststore
     option: TLS_CACERT
     value: /etc/ssl/certs/ca.pem
   - comment: Enforce TLS
     option: TLS_REQCERT
     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 ) }}"
 backup_encryption_key: "{{ lookup('pipe', 'gpg2 --homedir \"' + inventory_dir + '/backup_keyring' + '\" --armor --export-secret-keys ' + ansible_fqdn ) }}"
 backup_server: "backup.{{ testsite_domain }}"
 backup_server_host_ssh_public_keys:
   - "{{ lookup('file', inventory_dir + '/ssh/backup_server_dsa_key.pub') }}"
   - "{{ lookup('file', inventory_dir + '/ssh/backup_server_rsa_key.pub') }}"
   - "{{ lookup('file', inventory_dir + '/ssh/backup_server_ed25519_key.pub') }}"

testsite/group_vars/mail.yml

➞

Show inline comments

@@ @@ -27,13 +27,15 @@ mail_postmaster: postmaster@{{ testsite_domain }} @@
 smtp_allow_relay_from:
   - ldap.{{ testsite_domain }}
   - xmpp.{{ testsite_domain }}
   - web.{{ testsite_domain }}
   - ws01.{{ testsite_domain }}
 imap_max_user_connections_per_ip: 50
 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

@@ @@ -20,13 +20,15 @@ website_mail_recipients: "john.doe@example.com" @@
 environment_indicator:
   background_colour: "purple"
   text_colour: "white"
   text: "Majic Ansible Roles Test Site"
 proxy_headers:
   Accept-Encoding: '"gzip"'
 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/playbooks/backup.yml

➞

Show inline comments

 ---
 - hosts: backup
   remote_user: ansible
-  become: yes
+  become: true
   roles:
     - common
     - mail_forwarder
     - backup_server

testsite/playbooks/ldap.yml

➞

Show inline comments

 ---
 - hosts: ldap
   remote_user: ansible
-  become: yes
+  become: true
   roles:
     - common
     - mail_forwarder
     - ldap_client
     - ldap_server

testsite/playbooks/mail.yml

➞

Show inline comments

 ---
 - hosts: mail
   remote_user: ansible
-  become: yes
+  become: true
   roles:
     - common
     - ldap_client
     - mail_server

testsite/playbooks/preseed.yml

➞

Show inline comments

 ---
 # Playbook for generating Debian preseed files for automating the installation.
 - hosts: preseed
   roles:
     - preseed

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

➞

Show inline comments

 ---
 dependencies:
   - role: php_website
     fqdn: phpinfo.{{ testsite_domain }}
     php_rewrite_urls:
       - ^(.*) /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 }}

testsite/playbooks/web.yml

➞

Show inline comments

 ---
 - hosts: web
   remote_user: ansible
-  become: yes
+  become: true
   roles:
     - common
     - ldap_client
     - mail_forwarder
     - database_server
     - web_server
     - phpinfo
     - wsgihello
     - wsgihello2

testsite/playbooks/ws.yml

➞

Show inline comments

 ---
 - hosts: workstation
   remote_user: ansible
-  become: yes
+  become: true
   roles:
     - common
     - mail_forwarder

testsite/playbooks/xmpp.yml

➞

Show inline comments

 ---
 - hosts: xmpp
   remote_user: ansible
-  become: yes
+  become: true
   roles:
     - common
     - ldap_client
     - mail_forwarder
     - xmpp_server

0 comments (0 inline, 0 general)