From 0154ad30c4b15939a0147a5da72aaed64f6c0a1f Mon Sep 17 00:00:00 2001 From: Sam Al-Sapti Date: Sat, 15 Feb 2025 18:57:29 +0100 Subject: [PATCH] Fixup --- .ansible/.lock | 0 .../plugins/modules/fake_module.py | 32 +++++++++++++++++++ .../modules/fake_module/fake_submodule.py | 32 +++++++++++++++++++ .ansible/modules/zuul_return.py | 32 +++++++++++++++++++ .vscode/settings.json | 3 ++ roles/docker/tasks/pre_deploy/nodebb.yml | 19 +++++------ 6 files changed, 107 insertions(+), 11 deletions(-) create mode 100644 .ansible/.lock create mode 100644 .ansible/collections/ansible_collections/fake_namespace/fake_collection/plugins/modules/fake_module.py create mode 100644 .ansible/collections/ansible_collections/fake_namespace/fake_collection/plugins/modules/fake_module/fake_submodule.py create mode 100644 .ansible/modules/zuul_return.py create mode 100644 .vscode/settings.json diff --git a/.ansible/.lock b/.ansible/.lock new file mode 100644 index 0000000..e69de29 diff --git a/.ansible/collections/ansible_collections/fake_namespace/fake_collection/plugins/modules/fake_module.py b/.ansible/collections/ansible_collections/fake_namespace/fake_collection/plugins/modules/fake_module.py new file mode 100644 index 0000000..184419d --- /dev/null +++ b/.ansible/collections/ansible_collections/fake_namespace/fake_collection/plugins/modules/fake_module.py @@ -0,0 +1,32 @@ +# This is a mocked Ansible module generated by ansible-lint +from ansible.module_utils.basic import AnsibleModule + +DOCUMENTATION = ''' +module: fake_namespace.fake_collection.fake_module + +short_description: Mocked +version_added: "1.0.0" +description: Mocked + +author: + - ansible-lint (@nobody) +''' +EXAMPLES = '''mocked''' +RETURN = '''mocked''' + + +def main(): + result = dict( + changed=False, + original_message='', + message='') + + module = AnsibleModule( + argument_spec=dict(), + supports_check_mode=True, + ) + module.exit_json(**result) + + +if __name__ == "__main__": + main() diff --git a/.ansible/collections/ansible_collections/fake_namespace/fake_collection/plugins/modules/fake_module/fake_submodule.py b/.ansible/collections/ansible_collections/fake_namespace/fake_collection/plugins/modules/fake_module/fake_submodule.py new file mode 100644 index 0000000..2f55578 --- /dev/null +++ b/.ansible/collections/ansible_collections/fake_namespace/fake_collection/plugins/modules/fake_module/fake_submodule.py @@ -0,0 +1,32 @@ +# This is a mocked Ansible module generated by ansible-lint +from ansible.module_utils.basic import AnsibleModule + +DOCUMENTATION = ''' +module: fake_namespace.fake_collection.fake_module.fake_submodule + +short_description: Mocked +version_added: "1.0.0" +description: Mocked + +author: + - ansible-lint (@nobody) +''' +EXAMPLES = '''mocked''' +RETURN = '''mocked''' + + +def main(): + result = dict( + changed=False, + original_message='', + message='') + + module = AnsibleModule( + argument_spec=dict(), + supports_check_mode=True, + ) + module.exit_json(**result) + + +if __name__ == "__main__": + main() diff --git a/.ansible/modules/zuul_return.py b/.ansible/modules/zuul_return.py new file mode 100644 index 0000000..68540e6 --- /dev/null +++ b/.ansible/modules/zuul_return.py @@ -0,0 +1,32 @@ +# This is a mocked Ansible module generated by ansible-lint +from ansible.module_utils.basic import AnsibleModule + +DOCUMENTATION = ''' +module: zuul_return + +short_description: Mocked +version_added: "1.0.0" +description: Mocked + +author: + - ansible-lint (@nobody) +''' +EXAMPLES = '''mocked''' +RETURN = '''mocked''' + + +def main(): + result = dict( + changed=False, + original_message='', + message='') + + module = AnsibleModule( + argument_spec=dict(), + supports_check_mode=True, + ) + module.exit_json(**result) + + +if __name__ == "__main__": + main() diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..9d14cfb --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "ansible.python.interpreterPath": "/bin/python" +} \ No newline at end of file diff --git a/roles/docker/tasks/pre_deploy/nodebb.yml b/roles/docker/tasks/pre_deploy/nodebb.yml index 6c1ccf2..1022fb4 100644 --- a/roles/docker/tasks/pre_deploy/nodebb.yml +++ b/roles/docker/tasks/pre_deploy/nodebb.yml @@ -2,38 +2,35 @@ --- - name: Create subfolder for uploads file: - name: "{{ services.mastodon.volume_folder }}/nodebb-uploads" + name: "{{ services.nodebb.volume_folder }}/nodebb-uploads" state: directory owner: '1001' - group: '1001' - mode: u=rwx,g=rx,o=rx + mode: u=rwx,go= - name: Create subfolder for config file: - name: "{{ services.mastodon.volume_folder }}/nodebb-config" + name: "{{ services.nodebb.volume_folder }}/nodebb-config" state: directory owner: '1001' - group: '1001' - mode: u=rwx,g=rx,o=rx + mode: u=rwx,go= - name: Create subfolder for MongoDB file: - name: "{{ services.mastodon.volume_folder }}/mongodb" + name: "{{ services.nodebb.volume_folder }}/mongodb" state: directory owner: '999' - group: root - mode: u=rwx,g=rx,o=rx + mode: u=rwx,go= - name: Upload setup.json template: src: nodebb/setup.json.j2 dest: "{{ services.nodebb.volume_folder }}/setup.json" - owner: root + owner: '1001' mode: u=rw,go= - name: Upload mongodb-user-init.js template: src: nodebb/mongodb-user-init.js.j2 - dest: "{{ services.nodebb.volume_folder }}/setup.json" + dest: "{{ services.nodebb.volume_folder }}/mongodb-user-init.js" owner: root mode: u=rw,go=