samba.sh fix #252

This commit is contained in:
David Personette 2020-03-20 11:30:02 -04:00
parent 64db87725f
commit f4f12a653a
4 changed files with 9 additions and 7 deletions

View File

@ -64,7 +64,7 @@ COPY samba.sh /usr/bin/
EXPOSE 137/udp 138/udp 139 445 EXPOSE 137/udp 138/udp 139 445
HEALTHCHECK --interval=60s --timeout=15s \ HEALTHCHECK --interval=60s --timeout=15s \
CMD smbclient -L '\\localhost' -U '%' -m SMB3 CMD smbclient -L \\localhost -U % -m SMB3
VOLUME ["/etc", "/var/cache/samba", "/var/lib/samba", "/var/log/samba",\ VOLUME ["/etc", "/var/cache/samba", "/var/lib/samba", "/var/log/samba",\
"/run/samba"] "/run/samba"]

View File

@ -65,7 +65,7 @@ COPY samba.sh /usr/bin/
EXPOSE 137/udp 138/udp 139 445 EXPOSE 137/udp 138/udp 139 445
HEALTHCHECK --interval=60s --timeout=15s \ HEALTHCHECK --interval=60s --timeout=15s \
CMD smbclient -L '\\localhost' -U '%' -m SMB3 CMD smbclient -L \\localhost -U % -m SMB3
VOLUME ["/etc", "/var/cache/samba", "/var/lib/samba", "/var/log/samba",\ VOLUME ["/etc", "/var/cache/samba", "/var/lib/samba", "/var/log/samba",\
"/run/samba"] "/run/samba"]

View File

@ -65,7 +65,7 @@ COPY samba.sh /usr/bin/
EXPOSE 137/udp 138/udp 139 445 EXPOSE 137/udp 138/udp 139 445
HEALTHCHECK --interval=60s --timeout=15s \ HEALTHCHECK --interval=60s --timeout=15s \
CMD smbclient -L '\\localhost' -U '%' -m SMB3 CMD smbclient -L \\localhost -U % -m SMB3
VOLUME ["/etc", "/var/cache/samba", "/var/lib/samba", "/var/log/samba",\ VOLUME ["/etc", "/var/cache/samba", "/var/lib/samba", "/var/log/samba",\
"/run/samba"] "/run/samba"]

View File

@ -105,10 +105,12 @@ share() { local share="$1" path="$2" browsable="${3:-yes}" ro="${4:-yes}" \
echo " browsable = $browsable" >>$file echo " browsable = $browsable" >>$file
echo " read only = $ro" >>$file echo " read only = $ro" >>$file
echo " guest ok = $guest" >>$file echo " guest ok = $guest" >>$file
echo -n " veto files = /._*/.apdisk/.AppleDouble/.DS_Store/" >>$file [[ $VETO == no ]] || {
echo -n ".TemporaryItems/.Trashes/desktop.ini/ehthumbs.db/" >>$file echo -n " veto files = /._*/.apdisk/.AppleDouble/.DS_Store/" >>$file
echo "Network Trash Folder/Temporary Items/Thumbs.db/" >>$file echo -n ".TemporaryItems/.Trashes/desktop.ini/ehthumbs.db/" >>$file
echo " delete veto files = yes" >>$file echo "Network Trash Folder/Temporary Items/Thumbs.db/" >>$file
echo " delete veto files = yes" >>$file
}
[[ ${users:-""} && ! ${users:-""} == all ]] && [[ ${users:-""} && ! ${users:-""} == all ]] &&
echo " valid users = $(tr ',' ' ' <<< $users)" >>$file echo " valid users = $(tr ',' ' ' <<< $users)" >>$file
[[ ${admins:-""} && ! ${admins:-""} =~ none ]] && [[ ${admins:-""} && ! ${admins:-""} =~ none ]] &&