diff options
author | Christian Pointner <equinox@spreadspace.org> | 2019-01-14 01:31:30 +0100 |
---|---|---|
committer | Christian Pointner <equinox@spreadspace.org> | 2019-01-14 01:31:30 +0100 |
commit | a7679f05748b19ebcc3e44198e72e9d0aed1b292 (patch) | |
tree | 61b2531a1394682de6973856d373af4f4a816417 /roles | |
parent | rewording of comment (diff) |
update admin password if it gets changed later
Diffstat (limited to 'roles')
-rw-r--r-- | roles/elevate/media/tasks/main.yml | 6 | ||||
-rw-r--r-- | roles/elevate/media/tasks/nextcloud-config.yml | 6 | ||||
-rw-r--r-- | roles/elevate/media/tasks/nextcloud.yml | 7 |
3 files changed, 13 insertions, 6 deletions
diff --git a/roles/elevate/media/tasks/main.yml b/roles/elevate/media/tasks/main.yml index 1d1193c5..8d659de4 100644 --- a/roles/elevate/media/tasks/main.yml +++ b/roles/elevate/media/tasks/main.yml @@ -16,8 +16,8 @@ - name: configure samba import_tasks: samba.yml -- name: configure nginx - import_tasks: nginx.yml - - name: install and configure nextcloud import_tasks: nextcloud.yml + +- name: configure nginx + import_tasks: nginx.yml diff --git a/roles/elevate/media/tasks/nextcloud-config.yml b/roles/elevate/media/tasks/nextcloud-config.yml index 271aa33f..e76ace2e 100644 --- a/roles/elevate/media/tasks/nextcloud-config.yml +++ b/roles/elevate/media/tasks/nextcloud-config.yml @@ -44,3 +44,9 @@ - name: set up background tasks trigger to cron command: docker exec -u www-data nextcloud.service /var/www/html/occ background:cron changed_when: false + + + ## TODO: this is idempotent but flagging change would be nice +- name: set password for admin user + command: 'docker exec -u www-data -e "OC_PASS={{ nextcloud_admin.password }}" nextcloud.service /var/www/html/occ user:resetpassword -n --password-from-env "{{ nextcloud_admin.username }}"' + changed_when: false diff --git a/roles/elevate/media/tasks/nextcloud.yml b/roles/elevate/media/tasks/nextcloud.yml index 01d82add..9a278519 100644 --- a/roles/elevate/media/tasks/nextcloud.yml +++ b/roles/elevate/media/tasks/nextcloud.yml @@ -57,6 +57,7 @@ # systemctl stop nextcloud-cron.timer # systemctl disable nextcloud.service # systemctl stop nextcloud.service +# docker rm nextcloud.service # rm -rf /srv/nextcloud/config/nextcloud # rm -rf /srv/ncdata/nextcloud # rm -rf /srv/nextcloud/www @@ -70,10 +71,10 @@ - name: running nextcloud installer when: not nextcloud_config_file.stat.exists docker_container: - name: nextcloud-installer + name: nextcloud.installer image: "nextcloud:{{ inventory_hostname }}" ## For some reasons a newly created database schema is not up to date with the recommended settings... - ## so we will run the migrations right away. If in futuer this is not needed anymore use '/bin/true' here. + ## so we will run the migrations right away. If in future this is not needed anymore use '/bin/true' here. command: 'su -p www-data -s /bin/sh -c "php /var/www/html/occ db:convert-filecache-bigint"' network_mode: host detach: no @@ -92,7 +93,7 @@ MYSQL_USER: "{{ nextcloud_db.user }}" MYSQL_PASSWORD: "{{ nextcloud_db.password }}" NEXTCLOUD_ADMIN_USER: "{{ nextcloud_admin.username }}" - NEXTCLOUD_ADMIN_PASSWORD: "{{ nextcloud_admin.password }}" + NEXTCLOUD_ADMIN_PASSWORD: "will-be-changed-later" - name: install nextcloud service unit |