diff --git a/ansible/roles/nextcloud/tasks/main.yml b/ansible/roles/nextcloud/tasks/main.yml index aeba551..66a9832 100644 --- a/ansible/roles/nextcloud/tasks/main.yml +++ b/ansible/roles/nextcloud/tasks/main.yml @@ -11,17 +11,7 @@ with_items: - {src: 'nextcloud-compose.yml', dest: '/home/josiah/apps/nextcloud/docker-compose.yml'} -- name: Deploy nextcloud db only - docker_compose: - state: present - services: db - project_src: "/home/josiah/apps/nextcloud/" - -- name: Wait for the fucking idiot DB to actually initialize. - pause: - seconds: 60 - -- name: Deploy the rest of nextcloud. +- name: Deploy the nextcloud stack. docker_compose: state: present project_src: "/home/josiah/apps/nextcloud/" diff --git a/ansible/roles/nextcloud/templates/nextcloud-compose.yml b/ansible/roles/nextcloud/templates/nextcloud-compose.yml index ae217cc..8f6c717 100644 --- a/ansible/roles/nextcloud/templates/nextcloud-compose.yml +++ b/ansible/roles/nextcloud/templates/nextcloud-compose.yml @@ -6,13 +6,15 @@ volumes: services: db: - image: postgres:12.2 + image: postgres:9.6 ports: - 5432:5432 restart: always volumes: - /mnt/shared_document_store/nextcloud/sql:/var/lib/postgresql environment: + - USER_UID=1000 + - USER_GID=1000 - POSTGRES_ROOT_PASSWORD={{ NEXTCLOUD_POSTGRES_ROOT_PASSWORD }} - POSTGRES_PASSWORD={{ NEXTCLOUD_POSTGRES_PASSWORD }} - POSTGRES_DB={{ NEXTCLOUD_POSTGRES_DATABASE }} @@ -30,8 +32,10 @@ services: volumes: - /mnt/shared_document_store/nextcloud/html/:/var/www/html/ depends_on: - - db + - db environment: + - USER_UID=1000 + - USER_GID=1000 - POSTGRES_ROOT_PASSWORD={{ NEXTCLOUD_POSTGRES_ROOT_PASSWORD }} - POSTGRES_PASSWORD={{ NEXTCLOUD_POSTGRES_PASSWORD }} - POSTGRES_DB={{ NEXTCLOUD_POSTGRES_DATABASE }}