diff --git a/README.md b/README.md index 4838446..fd23f2a 100644 --- a/README.md +++ b/README.md @@ -16,8 +16,7 @@ Role Variables | Variable | Description | Default | | --------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------ | -| cryptpad_install_user | The user who is going to manage/run the Docker Compose services | {{ ansible_user }} | -| cryptpad_install_path | The location where the service should be deployed | /home/{{ cryptpad_install_user }} | +| docker_user | The user who is going to manage/run the Docker Compose services | deploy | | cryptpad_virtual_host | The virtual host that is e.g. used by Traefik, usually part of the public url | localhost | | cryptpad_safe_virtual_host | See above, and: this additonal domain is used together with `cryptpad_virtual_host` for additional security and must not be the same! More docs are in the `config.js` template | | | cryptpad_http_unsafe_origin_url | The URL of the public entrypoint URL, e.g. `https://pad.example.tld` | https:// + $cryptpad_virtual_host | diff --git a/defaults/main.yml b/defaults/main.yml index dcb67b3..9050ece 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,7 +1,5 @@ --- # defaults file for jotbe.cryptpad-docker -cryptpad_install_user: '{{ ansible_user }}' # This user must be present on the host -cryptpad_install_path: '/home/{{ cryptpad_install_user }}' cryptpad_http_address: 127.0.0.1 cryptpad_http_unsafe_origin_url: https://{{ cryptpad_virtual_host }} cryptpad_http_safe_origin_url: https://{{ cryptpad_safe_virtual_host }} diff --git a/tasks/main.yml b/tasks/main.yml index fa41e6d..d0d15d9 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -2,21 +2,21 @@ # tasks file for jotbe.cryptpad-docker - name: Ensure Docker Compose project directory exists file: - path: "{{ cryptpad_install_path }}/cryptpad" + path: /home/{{ docker_user }}/cryptpad state: directory - owner: '{{ cryptpad_install_user }}' - group: '{{ cryptpad_install_user }}' + owner: '{{ docker_user }}' + group: '{{ docker_user }}' - name: Provide docker-compose.yml template: src: templates/docker-compose.cryptpad.yml.j2 - dest: "{{ cryptpad_install_path }}/cryptpad/docker-compose.yml" - owner: "{{ cryptpad_install_user }}" - group: "{{ cryptpad_install_user }}" + dest: /home/{{ docker_user }}/cryptpad/docker-compose.yml + owner: "{{ docker_user }}" + group: "{{ docker_user }}" mode: '0644' - name: Output docker-compose.yml - shell: cat {{ cryptpad_install_path }}/cryptpad/docker-compose.yml + shell: cat /home/{{ docker_user }}/cryptpad/docker-compose.yml register: output - debug: @@ -24,9 +24,9 @@ - name: Provide env vars copy: - dest: "{{ cryptpad_install_path }}/cryptpad/.env" - owner: "{{ cryptpad_install_user }}" - group: "{{ cryptpad_install_user }}" + dest: /home/{{ docker_user }}/cryptpad/.env + owner: "{{ docker_user }}" + group: "{{ docker_user }}" mode: '0640' content: | VERSION=v3.24.0 @@ -36,28 +36,28 @@ - name: Ensure cryptpad config directory exists file: - path: "{{ cryptpad_install_path }}/cryptpad/data/config" + path: /home/{{ docker_user }}/cryptpad/data/config state: directory - owner: '{{ cryptpad_install_user }}' - group: '{{ cryptpad_install_user }}' + owner: '{{ docker_user }}' + group: '{{ docker_user }}' - name: Provide cryptpad config template: src: templates/config.js.j2 - dest: "{{ cryptpad_install_path }}/cryptpad/data/config/config.js" - owner: "{{ cryptpad_install_user }}" - group: "{{ cryptpad_install_user }}" + dest: /home/{{ docker_user }}/cryptpad/data/config/config.js + owner: "{{ docker_user }}" + group: "{{ docker_user }}" mode: '0644' - name: "docker-compose: Teardown existing cryptpad service" docker_compose: - project_src: "{{ cryptpad_install_path }}/cryptpad/" + project_src: "/home/{{ docker_user }}/cryptpad/" state: absent tags: ['never', 'teardown'] - name: "docker-compose: Start cryptpad service" docker_compose: - project_src: "{{ cryptpad_install_path }}/cryptpad/" + project_src: "/home/{{ docker_user }}/cryptpad/" pull: yes register: output tags: service_start