diff --git a/.gitignore b/.gitignore index 76e579a..830379a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ test - +roles/initnextcloud/files/resources/.netrc diff --git a/roles/initnextcloud/files/resources/.vimrc b/roles/initnextcloud/files/resources/.vimrc new file mode 100644 index 0000000..c98f537 --- /dev/null +++ b/roles/initnextcloud/files/resources/.vimrc @@ -0,0 +1,4 @@ +set number +set ff=unix +set nocompatible +syntax on diff --git a/roles/initnextcloud/tasks/docker.yml b/roles/initnextcloud/tasks/docker.yml index a94837e..5325516 100644 --- a/roles/initnextcloud/tasks/docker.yml +++ b/roles/initnextcloud/tasks/docker.yml @@ -18,7 +18,7 @@ - name: Run docker-compose up community.docker.docker_compose: - project_src: '{{dockerdir }}/compose/nextcloud' + project_src: '{{dockerdir }}/nextcloud' state: present become: true diff --git a/roles/initnextcloud/tasks/main.yml b/roles/initnextcloud/tasks/main.yml index 9a08c31..59e3e2d 100644 --- a/roles/initnextcloud/tasks/main.yml +++ b/roles/initnextcloud/tasks/main.yml @@ -1,12 +1,11 @@ - include_vars: "roles/initnextcloud/vars/dirs.yml" - include_vars: "roles/initnextcloud/vars/partuuid.yml" - include_vars: "roles/initnextcloud/vars/pckg.yml" -- include_tasks: ../subtasks/upgrade.yml - import_tasks: install.yml +- import_tasks: optional.yml - import_tasks: mount.yml - import_tasks: dirs.yml - import_tasks: docker.yml -- import_tasks: optional.yml diff --git a/roles/initnextcloud/tasks/mount.yml b/roles/initnextcloud/tasks/mount.yml index 59be744..d4e574b 100644 --- a/roles/initnextcloud/tasks/mount.yml +++ b/roles/initnextcloud/tasks/mount.yml @@ -1,16 +1,28 @@ -- name: Add Nextcloud mount to fstab +- name: create mount dir become: true - ansible.builtin.blockinfile: - path: /etc/fstab - marker: "# {mark} ANSIBLE MANAGED BLOCK nextcloud" - block: | - PARTUUID={{ partuuid }} /mnt/nextcloud ext4 defaults,noatime,fail 0 1 + file: + path: "/mnt/nextcloud" + state: directory -- name: Mount /mnt/nextcloud +- name: Backup der /etc/fstab anlegen + become: true + ansible.builtin.copy: + src: /etc/fstab + dest: /etc/fstab.backup.{{ ansible_date_time.iso8601 }} + remote_src: yes + mode: '0644' + + +- name: Ensure /mnt/nextcloud is mounted and in fstab become: true ansible.posix.mount: path: /mnt/nextcloud + src: "PARTUUID={{ partuuid }}" + fstype: "ext4" + opts: "defaults,noatime" state: mounted - fstype: ext4 - src: PARTUUID={{ partuuid }} + +- name: Facts aktualisieren + setup: + filter: ansible_mounts diff --git a/roles/initnextcloud/vars/dirs.yml b/roles/initnextcloud/vars/dirs.yml index 88d3661..b6281a0 100644 --- a/roles/initnextcloud/vars/dirs.yml +++ b/roles/initnextcloud/vars/dirs.yml @@ -1,11 +1,9 @@ -dockerrepo: "https://git.olli-cloud.de/olli/dockercmd" +dockerrepo: "https://raspithekgit.srv64.de/raspithek/docker" dockerdir: "/home/pi/git/dockercmd" volumedirs: - /mnt/nextcloud - /opt/clamav - - /opt/grafana - - /opt/influxdb homedirs: - bin diff --git a/roles/initnextcloud/vars/partuuid.yml b/roles/initnextcloud/vars/partuuid.yml index 962b2c2..4190ca8 100644 --- a/roles/initnextcloud/vars/partuuid.yml +++ b/roles/initnextcloud/vars/partuuid.yml @@ -1 +1,2 @@ partuuid: "011ad286-01" +mark: "---"