diff options
| -rw-r--r-- | dan/host_vars/ele-media.yml | 26 | ||||
| -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 |
4 files changed, 27 insertions, 18 deletions
diff --git a/dan/host_vars/ele-media.yml b/dan/host_vars/ele-media.yml index 6f82dc76..c02bfedf 100644 --- a/dan/host_vars/ele-media.yml +++ b/dan/host_vars/ele-media.yml @@ -1,13 +1,15 @@ $ANSIBLE_VAULT;1.2;AES256;dan -36336431633737313134623361343333336337383961656534373537616562326436313434643533 -6565363937373161306436623535653563353965343835360a626435623931326461366336366235 -65316666303333336437326461653734613331666334343465633238303130323937333466393165 -6339373030663538650a373064306562633437316237633235336562386665376430376162303339 -33616236333066316663653563663532326338376437363134306462323239316463653234353338 -34323737663263323239663536643935316138306335316233323832333362323536313265373034 -37643963333364366539623066643233333531353332363837343763333161656161356561313365 -64363331333965326434646264346462643865323237383131393963343831303939363331663137 -38366233343134343336316330633463626331643265643631306232393734653231383863663130 -65386532323963333562653939663635313030626238366535636363326239663132323538376131 -34373935626332373462353833366139393637366233343933353937373738633436653835643835 -34626264323162373132 +33326531333361326665353430333562333230616233323433353630313038656236613065336361 +3530313637373961353938613364383335666366373732380a383236353630356530663462613963 +34393737353666346232303530353561303065323933373132313762666161313433653964386465 +3736336436346134370a613238626331636331386361343766336630626662333630343665363963 +62396336323137306166396131343063613436623833666535303135663739353636393637643034 +63393038623233336562666239336363333963633933386564303666396232373462316335383264 +31316265353061633161663765383638623636643231633966353562656565633363643232303431 +31623237646231326165653239396361383436393966613636633934646337343530383538623137 +38363533376366396236636639343531333166386533396465336130643864376632306565636238 +30326563633735393634396434326561376537616536323737343736636465366564323131343063 +31333664306130636232306165613732356565653130366330613630653333383864626133353530 +36356163623837383065623463363364653637636364653362393332616661633562383333303165 +34653466356434633364303238333261613938626264316530613462313837663436653739313835 +3861383261373662343733646638333963643035636462643661 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 |