diff --git a/roles/server_docker-nextcloud/tasks/main.yml b/roles/server_docker-nextcloud/tasks/main.yml index e9923713..7340a4bc 100644 --- a/roles/server_docker-nextcloud/tasks/main.yml +++ b/roles/server_docker-nextcloud/tasks/main.yml @@ -8,16 +8,16 @@ dest: "/etc/nginx/conf.d/{{domain}}.conf" notify: restart nginx -- name: "create {{path_volumes_docker}}nextcloud/" +- name: "create {{path_docker_volumes}}nextcloud/" file: - path: "{{path_volumes_docker}}nextcloud" + path: "{{path_docker_volumes}}nextcloud" state: directory mode: 0755 - name: configure nginx.conf template: src: "templates/nginx.conf.j2" - dest: "{{path_volumes_docker}}nextcloud/nginx.conf" + dest: "{{path_docker_volumes}}nextcloud/nginx.conf" notify: recreate nextcloud - name: "create {{path_docker_compose_files}}nextcloud/" diff --git a/roles/server_docker-nextcloud/templates/docker-compose.yml.j2 b/roles/server_docker-nextcloud/templates/docker-compose.yml.j2 index cccdc4a8..106780c1 100644 --- a/roles/server_docker-nextcloud/templates/docker-compose.yml.j2 +++ b/roles/server_docker-nextcloud/templates/docker-compose.yml.j2 @@ -44,7 +44,7 @@ services: depends_on: - application volumes: - - "{{path_volumes_docker}}nextcloud/nginx.conf:/etc/nginx/nginx.conf:ro" + - "{{path_docker_volumes}}nextcloud/nginx.conf:/etc/nginx/nginx.conf:ro" volumes_from: - application redis: diff --git a/roles/server_native-backups-consumer/files/pull-remote-backup.sh b/roles/server_native-backups-consumer/files/pull-remote-backup.sh index 80bdb898..ab2af05d 100644 --- a/roles/server_native-backups-consumer/files/pull-remote-backup.sh +++ b/roles/server_native-backups-consumer/files/pull-remote-backup.sh @@ -55,9 +55,7 @@ for backup_type in $remote_backup_types; do eval "$rsync_command" && echo "removing: $status_pulling_file" && - rm -vf $status_pulling_file - - || ((errors+=1)); + rm -vf $status_pulling_file || ((errors+=1)); fi done exit $errors;