Merge pull request 'Adds support to provision trusted_proxies; fixes docker-compose's TTY error' (#9) from feature/trusted_proxies into master
Reviewed-on: #9
This commit is contained in:
commit
abafdee753
2 changed files with 14 additions and 5 deletions
|
@ -8,6 +8,7 @@ nextcloud_mariadb_password: nextcloud
|
|||
nextcloud_admin_user: admin
|
||||
nextcloud_admin_password: mynextcloud
|
||||
nextcloud_trusted_domains: localhost
|
||||
nextcloud_trusted_proxies: [ '172.18.0.0/16' ]
|
||||
virtual_host: localhost
|
||||
letsencrypt_host:
|
||||
letsencrypt_email:
|
||||
|
|
|
@ -134,27 +134,35 @@
|
|||
- name: "docker-compose: Set overwriteprotocol using occ"
|
||||
shell:
|
||||
chdir: /home/{{ docker_user }}/nextcloud/
|
||||
cmd: docker-compose exec -u www-data nextcloud-app /bin/sh -c './occ config:system:set overwriteprotocol --value="{{ nextcloud_overwrite_protocol }}"'
|
||||
cmd: docker-compose exec -T -u www-data nextcloud-app ./occ config:system:set overwriteprotocol --value="{{ nextcloud_overwrite_protocol }}"
|
||||
|
||||
- name: "docker-compose: Set overwrite.cli.url using occ"
|
||||
shell:
|
||||
chdir: /home/{{ docker_user }}/nextcloud/
|
||||
cmd: docker-compose exec -u www-data nextcloud-app /bin/sh -c './occ config:system:set overwrite.cli.url --value="{{ nextcloud_overwrite_cli_url }}"'
|
||||
cmd: docker-compose exec -T -u www-data nextcloud-app /bin/sh -c './occ config:system:set overwrite.cli.url --value="{{ nextcloud_overwrite_cli_url }}"'
|
||||
|
||||
- name: "docker-compose: Set overwritehost using occ"
|
||||
shell:
|
||||
chdir: /home/{{ docker_user }}/nextcloud/
|
||||
cmd: docker-compose exec -u www-data nextcloud-app /bin/sh -c './occ config:system:set overwritehost --value="{{ nextcloud_overwrite_host }}"'
|
||||
cmd: docker-compose exec -T -u www-data nextcloud-app /bin/sh -c './occ config:system:set overwritehost --value="{{ nextcloud_overwrite_host }}"'
|
||||
|
||||
- name: "docker-compose: Set trusted_proxies using occ"
|
||||
shell:
|
||||
chdir: /home/{{ docker_user }}/nextcloud/
|
||||
cmd: docker-compose exec -T -u www-data nextcloud-app /bin/sh -c './occ config:system:set trusted_proxies {{ idx }} --value="{{ item }}"'
|
||||
loop: "{{ nextcloud_trusted_proxies }}"
|
||||
loop_control:
|
||||
index_var: idx
|
||||
|
||||
- name: "docker-compose: Fix ownership of /var/www/html"
|
||||
shell:
|
||||
chdir: /home/{{ docker_user }}/nextcloud/
|
||||
cmd: "docker-compose exec --user root nextcloud-app /bin/sh -c 'chown -R www-data: /var/www/html'"
|
||||
cmd: "docker-compose exec -T --user root nextcloud-app /bin/sh -c 'chown -R www-data: /var/www/html'"
|
||||
|
||||
- name: "docker-compose: Install Nextcloud apps (will not fail)"
|
||||
shell:
|
||||
chdir: /home/{{ docker_user }}/nextcloud/
|
||||
cmd: docker-compose exec -u www-data nextcloud-app /bin/sh -c './occ app:install "{{ item }}"'
|
||||
cmd: docker-compose exec -T -u www-data nextcloud-app /bin/sh -c './occ app:install "{{ item }}"'
|
||||
loop: "{{ nextcloud_app_list_to_install }}"
|
||||
when: nextcloud_app_list_to_install | count
|
||||
failed_when: false
|
||||
|
|
Loading…
Add table
Reference in a new issue