diff --git a/README.md b/README.md index 11f8195..7775bfb 100755 --- a/README.md +++ b/README.md @@ -11,6 +11,6 @@ ansible-playbook -i inventory.yaml -e @secrets.enc --ask-vault-pass github-runne # gitea server ansible-playbook -i inventory.yaml -e @secrets.enc --ask-vault-pass gitea.yaml -# gitea server +# graphana + prometheus ansible-playbook -i inventory.yaml -e @secrets.enc --ask-vault-pass monitor.yaml ``` diff --git a/gitea.yaml b/gitea.yaml index c7ebf3c..cbdbbfa 100644 --- a/gitea.yaml +++ b/gitea.yaml @@ -9,10 +9,10 @@ mounts: gitea_repos: local: "/mnt/gitea-repos" - remote: "/volume1/gitea-repos" + remote: "/var/nfs/shared/gitea_repos" gitea_backups: local: "/mnt/gitea-backups" - remote: "/volume1/gitea-backups" + remote: "/var/nfs/shared/gitea_backups" @@ -45,6 +45,19 @@ # update_cache: true # become: true + - name: Stop gitea services if running + community.docker.docker_compose_v2: + project_src: "{{ ansible_env.HOME }}/gitea/" + state: absent + ignore_errors: true + + - name: Unmount NFS volumes before creating mountpoint directories + ansible.posix.mount: + path: "{{ item.value.local }}" + state: unmounted + loop: "{{ mounts | dict2items }}" + become: true + - name: Create mountpoint directories for gitea ansible.builtin.file: path: "{{ item.value.local }}" @@ -55,7 +68,7 @@ - name: Mount an NFS volume for repositories ansible.posix.mount: - src: "nas.localdomain:{{ item.value.remote }}" + src: "192.168.1.160:{{ item.value.remote }}" path: "{{ item.value.local }}" opts: nfsvers=3,proto=tcp,rw state: mounted diff --git a/gitea/compose.yaml b/gitea/compose.yaml index f5a8c78..c612bf2 100644 --- a/gitea/compose.yaml +++ b/gitea/compose.yaml @@ -6,8 +6,8 @@ services: environment: # Gitea-supported vars for internal ownership/permissions - - USER_UID=1027 - - USER_GID=65536 + - USER_UID=977 + - USER_GID=988 - TZ=Europe/London volumes: