diff --git a/README.md b/README.md
index d77f094..0d07188 100644
--- a/README.md
+++ b/README.md
@@ -26,14 +26,15 @@ Requirements
Role Variables
--------------
-| Variable | Description | Default |
-| --------------------------- | ------------------------------------------------------------------------------- | ------------------ |
-| docker_user | The user who is going to manage/run the Docker Compose services | deploy |
-| onlyoffice_virtual_host | The host under which ONLYOFFICE is available from the outside (e.g. docsrv.example.org) | localhost |
-| onlyoffice_allow_origin_list | Satisfy [CORS](https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS) [Access-Control-Allow-Origin](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Origin):
A comma-separated list of hosts incl. scheme, e.g. https://nextcloud.example.tld | localhost |
-| onlyoffice_jwt_enabled | Whether JWT authentication should be used | "false" |
-| onlyoffice_jwt_secret | A shared secret used by ONLYOFFICE and the integrator apps, e.g. Nextcloud | "secret" |
-
+| Variable | Description | Default |
+| --------------------------- | ------------------------------------------------------------------------------- | ------------------ |
+| onlyoffice_install_user | The user who is going to manage/run the Docker Compose services | {{ ansible_user } |
+| onlyoffice_install_path | The location where the service should be deployed | /home/{{ onlyoffice_install_user }} |
+| onlyoffice_virtual_host | The host under which ONLYOFFICE is available from the outside (e.g. docsrv.example.org) | localhost |
+| onlyoffice_allow_origin_list | Satisfy [CORS](https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS) [Access-Control-Allow-Origin](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Origin):
A comma-separated list of hosts incl. scheme, e.g. https://nextcloud.example.tld | localhost |
+| onlyoffice_jwt_enabled | Whether JWT authentication should be used | false |
+| onlyoffice_jwt_secret | A shared secret used by ONLYOFFICE and the integrator apps, e.g. Nextcloud | "secret" |
+| onlyoffice_jwt_header | The authorization header included in the JWT token | "Authorization" |
Dependencies
------------
diff --git a/defaults/main.yml b/defaults/main.yml
index b0b61f7..86cbfa4 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,4 +1,8 @@
---
# defaults file for ONLYOFFICE Document Server
-docker_user: deploy
+onlyoffice_install_user: '{{ ansible_user }}' # This user must be present on the host
+onlyoffice_install_path: '/home/{{ onlyoffice_install_user }}'
onlyoffice_virtual_host: localhost
+onlyoffice_jwt_enabled: false
+onlyoffice_jwt_secret: 'secret'
+onlyoffice_jwt_header: 'Authorization'
\ No newline at end of file
diff --git a/tasks/main.yml b/tasks/main.yml
index c61fd33..1cec38e 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -2,23 +2,23 @@
# tasks file for ONLYOFFICE Document Server
- name: Ensure ONLYOFFICE Document Server config directory exists
file:
- path: /home/{{ docker_user }}/onlyoffice-document-server
+ path: "{{ onlyoffice_install_path }}/onlyoffice-document-server"
state: directory
- owner: '{{ docker_user }}'
- group: '{{ docker_user }}'
+ owner: '{{ onlyoffice_install_user }}'
+ group: '{{ onlyoffice_install_user }}'
tags: config
- name: Provide docker-compose.yml
template:
src: templates/docker-compose.onlyoffice-document-server.yml.j2
- dest: /home/{{ docker_user }}/onlyoffice-document-server/docker-compose.yml
- owner: "{{ docker_user }}"
- group: "{{ docker_user }}"
+ dest: "{{ onlyoffice_install_path }}/onlyoffice-document-server/docker-compose.yml"
+ owner: "{{ onlyoffice_install_user }}"
+ group: "{{ onlyoffice_install_user }}"
mode: '0644'
tags: config
- name: Output docker-compose.yml
- shell: cat /home/{{ docker_user }}/onlyoffice-document-server/docker-compose.yml
+ shell: cat {{ onlyoffice_install_path }}/onlyoffice-document-server/docker-compose.yml
register: output
tags: config
@@ -28,21 +28,21 @@
- name: Provide env vars
template:
src: templates/env.onlyoffice-document-server.j2
- dest: /home/{{ docker_user }}/onlyoffice-document-server/.env
- owner: "{{ docker_user }}"
- group: "{{ docker_user }}"
+ dest: "{{ onlyoffice_install_path }}/onlyoffice-document-server/.env"
+ owner: "{{ onlyoffice_install_user }}"
+ group: "{{ onlyoffice_install_user }}"
mode: '0640'
tags: config
- name: "docker-compose: Teardown existing service"
docker_compose:
- project_src: "/home/{{ docker_user }}/onlyoffice-document-server/"
+ project_src: "{{ onlyoffice_install_path }}/onlyoffice-document-server/"
state: absent
tags: ['never', 'teardown']
- name: "docker-compose: Bootstrap service"
docker_compose:
- project_src: "/home/{{ docker_user }}/onlyoffice-document-server/"
+ project_src: "{{ onlyoffice_install_path }}/onlyoffice-document-server/"
register: output
- debug:
diff --git a/templates/env.onlyoffice-document-server.j2 b/templates/env.onlyoffice-document-server.j2
index 7875271..ee40814 100644
--- a/templates/env.onlyoffice-document-server.j2
+++ b/templates/env.onlyoffice-document-server.j2
@@ -1,3 +1,3 @@
-JWT_ENABLED={{ onlyoffice_jwt_enabled | default('false')}}
-JWT_SECRET={{ onlyoffice_jwt_secret | default('secret') }}
-JWT_HEADER={{ onlyoffice_jwt_header | default('Authorization') }}
\ No newline at end of file
+JWT_ENABLED={{ onlyoffice_jwt_enabled }}
+JWT_SECRET={{ onlyoffice_jwt_secret }}
+JWT_HEADER={{ onlyoffice_jwt_header }}
\ No newline at end of file