external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2111 from holta/nextcloud-readability

Browse source 
Nextcloud minimal cleanup for code readability
This commit is contained in:
A Holt 2020-01-07 12:30:49 -05:00 • committed by GitHub
commit 14f23a5efb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
roles/nextcloud/tasks/enable_or_disable.yml
View file

@ -23,7 +23,7 @@
state: absent state: absent
when: not nextcloud_enabled and is_redhat when: not nextcloud_enabled and is_redhat
- name: Restart Apache, enabling/disabling http://box/nextcloud - name: Restart {{ apache_service }}, enabling/disabling http://box/nextcloud
systemd: systemd:
name: "{{ apache_service }}" name: "{{ apache_service }}"
daemon-reload: yes daemon-reload: yes

4
roles/nextcloud/tasks/main.yml
View file

@ -9,10 +9,10 @@
include_tasks: install.yml include_tasks: install.yml
when: nextcloud_install and (not nextcloud_installed is defined or not nextcloud_page.stat.exists) when: nextcloud_install and (not nextcloud_installed is defined or not nextcloud_page.stat.exists)
- name: Provision NextCloud's Mysql DB - name: Provision Nextcloud's MySQL DB, run Nextcloud's install wizard, etc
include_tasks: setup.yml include_tasks: setup.yml
when: nextcloud_install and not installing when: nextcloud_install and not installing
- name: Enables or disable Nextcloud! - name: Enable or disable Nextcloud
include_tasks: enable_or_disable.yml include_tasks: enable_or_disable.yml
when: nextcloud_install or nextcloud_installed is defined when: nextcloud_install or nextcloud_installed is defined

6
roles/nextcloud/tasks/setup.yml
View file

@ -14,7 +14,7 @@
- ::1 - ::1
- localhost - localhost
# the install wizard does not succeed if already installed # The install wizard fails if already installed.
- name: Determine if Nextcloud is installed - name: Determine if Nextcloud is installed
shell: > shell: >
php {{ nextcloud_prefix }}/nextcloud/occ status | php {{ nextcloud_prefix }}/nextcloud/occ status |
@ -37,7 +37,9 @@
become_user: "{{ apache_user }}" become_user: "{{ apache_user }}"
when: nextcloud_enabled and returned.stdout == "false" when: nextcloud_enabled and returned.stdout == "false"
- name: Allow access from all hosts and ips # RELATED: /etc/apache2/sites-available/nextcloud.conf sourced from
# https://github.com/iiab/iiab/blob/master/roles/nextcloud/templates/nextcloud.conf.j2
- name: 'Allow Nextcloud access from all hosts and IP addresses (SEE ALSO: /etc/apache2/sites-available/nextcloud.conf)'
command: php {{ nextcloud_prefix }}/nextcloud/occ config:system:set trusted_domains 1 --value=* command: php {{ nextcloud_prefix }}/nextcloud/occ config:system:set trusted_domains 1 --value=*
become: yes become: yes
become_user: "{{ apache_user }}" become_user: "{{ apache_user }}"