diff --git a/roles/php_website/defaults/main.yml b/roles/php_website/defaults/main.yml index 048458d2030fddd9a0b1bc9f330ed2a6d70d73f5..bfb5234bcb3764491ff92dcc25108e54e1b8b040 100644 --- a/roles/php_website/defaults/main.yml +++ b/roles/php_website/defaults/main.yml @@ -2,7 +2,7 @@ additional_nginx_config: {} deny_files_regex: [] -enforce_https: True +enforce_https: true index: index.php packages: [] php_file_regex: \.php$ diff --git a/roles/php_website/meta/main.yml b/roles/php_website/meta/main.yml index 7c80270ceb5a0b33bf6d593ac5c959efdddc6a28..2febb79042f268455339772450759aff51cef860 100644 --- a/roles/php_website/meta/main.yml +++ b/roles/php_website/meta/main.yml @@ -1,6 +1,6 @@ --- -allow_duplicates: yes +allow_duplicates: true dependencies: - common diff --git a/roles/php_website/molecule/default/create.yml b/roles/php_website/molecule/default/create.yml index f8eb37cd4df02c540216c02791d0c50870986202..ce8657f9bae3be7f42731fd1efe77e87a62afcd9 100644 --- a/roles/php_website/molecule/default/create.yml +++ b/roles/php_website/molecule/default/create.yml @@ -2,7 +2,7 @@ - name: Create hosts: localhost connection: local - gather_facts: False + gather_facts: false no_log: "{{ not lookup('env', 'MOLECULE_DEBUG') | bool }}" vars: molecule_file: "{{ lookup('env', 'MOLECULE_FILE') }}" diff --git a/roles/php_website/molecule/default/destroy.yml b/roles/php_website/molecule/default/destroy.yml index 3972a2df8fafe515b30a74f951499b83aae8449c..8f0a3703672765e77f4f1a3a8046a1f2b561a7a8 100644 --- a/roles/php_website/molecule/default/destroy.yml +++ b/roles/php_website/molecule/default/destroy.yml @@ -3,7 +3,7 @@ - name: Destroy hosts: localhost connection: local - gather_facts: False + gather_facts: false no_log: "{{ not lookup('env', 'MOLECULE_DEBUG') | bool }}" vars: molecule_file: "{{ lookup('env', 'MOLECULE_FILE') }}" diff --git a/roles/php_website/molecule/default/molecule.yml b/roles/php_website/molecule/default/molecule.yml index a96f1204758688b98a1b394e21f5bf4eee8b5e3e..2835667e34b268a8343abe4f6f4a8a821b4d3e85 100644 --- a/roles/php_website/molecule/default/molecule.yml +++ b/roles/php_website/molecule/default/molecule.yml @@ -9,6 +9,8 @@ driver: lint: name: yamllint + options: + config-file: ../../.yamllint.yml platforms: diff --git a/roles/php_website/molecule/default/playbook.yml b/roles/php_website/molecule/default/playbook.yml index 75e0da6912f089f0cf7f7fbef9cd3ff15fb42d18..3c1b0c5c182ea1c4502f691fa7ca62603263d2a0 100644 --- a/roles/php_website/molecule/default/playbook.yml +++ b/roles/php_website/molecule/default/playbook.yml @@ -1,7 +1,7 @@ --- - hosts: all - become: yes + become: true vars: # common ca_certificates: @@ -29,7 +29,7 @@ admin_uid: 5000 deny_files_regex: - '^/secretfile.txt' - enforce_https: no + enforce_https: false environment_indicator: background_colour: "#ff0000" text_colour: "#00ff00" @@ -53,7 +53,7 @@ website_mail_recipients: user - hosts: all - become: yes + become: true tasks: # parameters-mandatory application - name: Set-up directory where PHP files are hosted at diff --git a/roles/php_website/molecule/default/prepare.yml b/roles/php_website/molecule/default/prepare.yml index d1c66159b20284c3e9f8bd40f8673ec6809accf9..70666084c706b9fb686296155221f48a65dd9119 100644 --- a/roles/php_website/molecule/default/prepare.yml +++ b/roles/php_website/molecule/default/prepare.yml @@ -2,21 +2,21 @@ - name: Prepare hosts: all - gather_facts: False + gather_facts: false tasks: - name: Install python for Ansible raw: test -e /usr/bin/python || (apt -y update && apt install -y python-minimal) - become: True - changed_when: False + become: true + changed_when: false - hosts: all - become: yes + become: true tasks: - name: Update all caches to avoid errors due to missing remote archives apt: - update_cache: yes - changed_when: False + update_cache: true + changed_when: false - name: Set-up /etc/hosts entries lineinfile: @@ -26,17 +26,17 @@ - name: Install curl for testing redirects and webpage content apt: name: curl - state: installed + state: present - name: Install swaks for testing mail forwarding apt: name: swaks - state: installed + state: present - name: Install Postfix for testing mail forwarding (Exim4 not covered) apt: name: postfix - state: installed + state: present - name: Set-up group for an additional user group: diff --git a/roles/php_website/molecule/default/tests/test_default.py b/roles/php_website/molecule/default/tests/test_default.py index b3c99bf499f8c35b752f883d9e515ed212d9bc77..e92ca0fbd84f6e2f3ae576bf6a3646351118a8be 100644 --- a/roles/php_website/molecule/default/tests/test_default.py +++ b/roles/php_website/molecule/default/tests/test_default.py @@ -1,5 +1,7 @@ +import os + import testinfra.utils.ansible_runner testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( - '.molecule/ansible_inventory.yml').get_hosts('all') + os.environ['MOLECULE_INVENTORY_FILE']).get_hosts(['all']) diff --git a/roles/php_website/molecule/default/tests/test_parameters_mandatory.py b/roles/php_website/molecule/default/tests/test_parameters_mandatory.py index 68be874582b7860c21556aa8bdeee23064207d3d..9733e171a6d23812d2f17ef6804d6b5892c507ca 100644 --- a/roles/php_website/molecule/default/tests/test_parameters_mandatory.py +++ b/roles/php_website/molecule/default/tests/test_parameters_mandatory.py @@ -1,12 +1,12 @@ +import os import re import time - import testinfra.utils.ansible_runner testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( - '.molecule/ansible_inventory.yml').get_hosts('all') + os.environ['MOLECULE_INVENTORY_FILE']).get_hosts(['all']) def test_website_group(host): diff --git a/roles/php_website/molecule/default/tests/test_parameters_optional.py b/roles/php_website/molecule/default/tests/test_parameters_optional.py index 43922e4f4055b1a05b1a70531fa7fff407b53d5b..34596bb746c8aec615f20cf703a91a1ea634babb 100644 --- a/roles/php_website/molecule/default/tests/test_parameters_optional.py +++ b/roles/php_website/molecule/default/tests/test_parameters_optional.py @@ -1,12 +1,12 @@ +import os import re import time - import testinfra.utils.ansible_runner testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( - '.molecule/ansible_inventory.yml').get_hosts('all') + os.environ['MOLECULE_INVENTORY_FILE']).get_hosts(['all']) def test_website_group(host): diff --git a/roles/php_website/tasks/main.yml b/roles/php_website/tasks/main.yml index f1d255983d64240a005e38f6150514a4554df279..6fa535ad41c4b3e7a29d546fb1127f9af7e897e0 100644 --- a/roles/php_website/tasks/main.yml +++ b/roles/php_website/tasks/main.yml @@ -12,7 +12,7 @@ uid: "{{ admin_uid | default(omit) }}" group: "{{ user }}" shell: /bin/bash - createhome: yes + createhome: true home: "{{ home }}" state: present @@ -30,8 +30,8 @@ uid: "{{ uid | default(omit) }}" group: "{{ user }}" comment: "umask=0007" - system: yes - createhome: no + system: true + createhome: false state: present home: "{{ home }}" @@ -56,7 +56,7 @@ - name: Install extra packages for website apt: name: "{{ item }}" - state: installed + state: present with_items: "{{ packages }}" - name: Set-up MariaDB mysql_config symbolic link for compatibility (workaround for Debian bug 766996)