Skip to content

Commit

Permalink
Merge pull request #171 from anarion80/pull_upstream
Browse files Browse the repository at this point in the history
🔀 Pull upstream
  • Loading branch information
anarion80 authored Jun 11, 2024
2 parents fd7094e + d4a35b7 commit b49ca5e
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 10 deletions.
2 changes: 1 addition & 1 deletion nas.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
- ansible-nas-users
- ansible-nas

- role: bertvv.samba
- role: vladgh.samba.server
tags:
- samba
- skip_ansible_lint
Expand Down
7 changes: 1 addition & 6 deletions requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,6 @@ roles:
- name: geerlingguy.docker
version: 7.1.0

- name: geerlingguy.docker_arm
version: 5.0.0

- name: bertvv.samba
version: v2.7.1

- name: geerlingguy.nfs
version: 2.0.0

Expand All @@ -23,3 +17,4 @@ collections:
- name: community.docker
- name: community.general
- name: community.windows
- name: vladgh.samba
4 changes: 2 additions & 2 deletions roles/mealie/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
volumes:
- "{{ mealie_data_directory }}:/app/data:rw"
ports:
- "{{ mealie_port }}:80"
- "{{ mealie_port }}:9000"
env:
TZ: "{{ ansible_nas_timezone }}"
PUID: "{{ mealie_user_id }}"
Expand All @@ -36,7 +36,7 @@
traefik.http.routers.mealie.tls.certresolver: "letsencrypt"
traefik.http.routers.mealie.tls.domains[0].main: "{{ ansible_nas_domain }}"
traefik.http.routers.mealie.tls.domains[0].sans: "*.{{ ansible_nas_domain }}"
traefik.http.services.mealie.loadbalancer.server.port: "80"
traefik.http.services.mealie.loadbalancer.server.port: "9000"
when: mealie_enabled is true

- name: Stop Mealie
Expand Down
2 changes: 1 addition & 1 deletion website/docs/further-configuration/samba-shares.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Samba Shares

Ansible-NAS uses the awesome [bertvv.samba](https://github.com/bertvv/ansible-role-samba) Ansible role to configure Samba - check out the project page for the many different options you can use to configure a share.
Ansible-NAS uses the awesome [vladgh.samba](https://github.com/vladgh/ansible-collection-vladgh-samba) Ansible role to configure Samba - check out [the Ansible Galaxy page](https://galaxy.ansible.com/vladgh/samba) for the many different options you can use to configure a share.

## Share Examples

Expand Down

0 comments on commit b49ca5e

Please sign in to comment.