Loading src/samba.sh +119 −15 Original line number Diff line number Diff line Loading @@ -4,6 +4,8 @@ set -Eeuo pipefail : "${SAMBA:="Y"}" # Enable Samba : "${SAMBA_LEVEL:="1"}" # Logging level : "${SAMBA_DEBUG:="N"}" # Disable debug : "${SAMBA_UID:="1000"}" # Samba user ID : "${SAMBA_GID:="1000"}" # Samba group ID tmp="/tmp/smb" rm -rf "$tmp" Loading Loading @@ -42,12 +44,27 @@ addShare() { local ref="$2" local name="$3" local comment="$4" local user="$5" local group="$6" local cfg="$7" mkdir -p "$dir" || return 1 ls -A "$dir" >/dev/null 2>&1 || return 1 if ! ls -A "$dir" >/dev/null 2>&1; then error "Failed to access directory $dir" && return 1 fi if [ -z "$(ls -A "$dir")" ]; then chmod 777 "$dir" || return 1 if ! chmod 777 "$dir"; then error "Failed to set permissions for directory $dir" && return 1 fi if [[ "$user" != "root" || "$group" != "root" ]]; then if ! chown "$user:$group" "$dir" ; then error "Failed to set ownership for directory $dir" && return 1 fi fi fi if [[ "$dir" == "$tmp" ]]; then Loading Loading @@ -81,13 +98,84 @@ addShare() { echo " writable = yes" echo " guest ok = yes" echo " guest only = yes" echo " force user = root" echo " force group = root" } >> "/etc/samba/smb.conf" echo " force user = $user" echo " force group = $group" } >> "$cfg" return 0 } addUser() { local username="$1" local uid="$2" local groupname="$3" local gid="$4" local password="$1" local cfg="$5" # Check if the group exists, if not, create it if ! getent group "$groupname" &>/dev/null; then if ! groupadd -o -g "$gid" "$groupname" > /dev/null; then error "Failed to create group $groupname" && return 1 fi else # Check if the gid is right, if not, change it local current_gid current_gid=$(getent group "$groupname" | cut -d: -f3) if [[ "$current_gid" != "$gid" ]]; then if ! groupmod -o -g "$gid" "$groupname" > /dev/null; then error "Failed to update GID for group $groupname" && return 1 fi fi fi # Check if the user already exists, if not, create it if ! id "$username" &>/dev/null; then if ! adduser --gid "$gid" --uid "$uid" --comment "$username" --no-create-home --disabled-login "$username"; then error "Failed to create user $username" && return 1 fi else # Check if the uid is right, if not, change it local current_uid current_uid=$(id -u "$username") if [[ "$current_uid" != "$uid" ]]; then if ! usermod -o -u "$uid" "$username" > /dev/null; then error "Failed to update UID for user $username" && return 1 fi fi # Update user's group if ! usermod -g "$groupname" "$username" > /dev/null; then echo "Failed to update group for user $username" && return 1 fi fi # Check if the user is a samba user pdb_output=$(pdbedit -s "$cfg" -L) if echo "$pdb_output" | grep -q "^$username:"; then # skip samba password update if password is * or ! if [[ "$password" != "*" && "$password" != "!" ]]; then # If the user is a samba user, update its password in case it changed if ! echo -e "$password\n$password" | smbpasswd -c "$cfg" -s "$username" > /dev/null; then error "Failed to update Samba password for $username" && return 1 fi fi else # If the user is not a samba user, create it and set a password if ! echo -e "$password\n$password" | smbpasswd -a -c "$cfg" -s "$username" > /dev/null; then error "Failed to add Samba user $username" && return 1 fi fi return 0 } SAMBA_USER="root" SAMBA_GROUP="root" SAMBA_CONFIG="/etc/samba/smb.conf" { echo "[global]" echo " server string = Dockur" echo " netbios name = $hostname" Loading @@ -108,8 +196,19 @@ addShare() { echo " printing = bsd" echo " printcap name = /dev/null" echo " disable spoolss = yes" } > "/etc/samba/smb.conf" } > "$SAMBA_CONFIG" # Setup user and group if [[ "$SAMBA_UID" != "1000" || "$SAMBA_GID" != "1000" ]]; then SAMBA_USER="samba" SAMBA_GROUP="samba" ! addUser "$SAMBA_USER" "$SAMBA_UID" "$SAMBA_GROUP" "$SAMBA_GID" "$SAMBA_CONFIG" && return 0 fi # Add shared folders share="/shared" [ ! -d "$share" ] && [ -d "$STORAGE/shared" ] && share="$STORAGE/shared" [ ! -d "$share" ] && [ -d "/data" ] && share="/data" Loading @@ -119,23 +218,23 @@ share="/shared" m1="Failed to add shared folder" m2="Please check its permissions." if ! addShare "$share" "/shared" "Data" "Shared"; then if ! addShare "$share" "/shared" "Data" "Shared" "$SAMBA_USER" "$SAMBA_GROUP" "$SAMBA_CONFIG"; then error "$m1 '$share'. $m2" && return 0 fi if [ -d "/shared2" ]; then addShare "/shared2" "/shared2" "Data2" "Shared" || error "$m1 '/shared2'. $m2" addShare "/shared2" "/shared2" "Data2" "Shared" "$SAMBA_USER" "$SAMBA_GROUP" "$SAMBA_CONFIG" || error "$m1 '/shared2'. $m2" else if [ -d "/data2" ]; then addShare "/data2" "/shared2" "Data2" "Shared" || error "$m1 '/data2'. $m2." addShare "/data2" "/shared2" "Data2" "Shared" "$SAMBA_USER" "$SAMBA_GROUP" "$SAMBA_CONFIG" || error "$m1 '/data2'. $m2." fi fi if [ -d "/shared3" ]; then addShare "/shared3" "/shared3" "Data3" "Shared" || error "$m1 '/shared3'. $m2" addShare "/shared3" "/shared3" "Data3" "Shared" "$SAMBA_USER" "$SAMBA_GROUP" "$SAMBA_CONFIG" || error "$m1 '/shared3'. $m2" else if [ -d "/data3" ]; then addShare "/data3" "/shared3" "Data3" "Shared" || error "$m1 '/data3'. $m2" addShare "/data3" "/shared3" "Data3" "Shared" "$SAMBA_USER" "$SAMBA_GROUP" "$SAMBA_CONFIG" || error "$m1 '/data3'. $m2" fi fi Loading @@ -146,6 +245,11 @@ for dir in "${dirs[@]}"; do addShare "$dir" "/shared" "$dir_name" "Shared $dir_name" || error "Failed to create shared folder for $dir!" done # Create directories if missing mkdir -p /var/lib/samba/sysvol mkdir -p /var/lib/samba/private mkdir -p /var/lib/samba/bind-dns # Try to repair Samba permissions [ -d /run/samba/msg.lock ] && chmod -R 0755 /run/samba/msg.lock 2>/dev/null || : [ -d /var/log/samba/cores ] && chmod -R 0700 /var/log/samba/cores 2>/dev/null || : Loading Loading
src/samba.sh +119 −15 Original line number Diff line number Diff line Loading @@ -4,6 +4,8 @@ set -Eeuo pipefail : "${SAMBA:="Y"}" # Enable Samba : "${SAMBA_LEVEL:="1"}" # Logging level : "${SAMBA_DEBUG:="N"}" # Disable debug : "${SAMBA_UID:="1000"}" # Samba user ID : "${SAMBA_GID:="1000"}" # Samba group ID tmp="/tmp/smb" rm -rf "$tmp" Loading Loading @@ -42,12 +44,27 @@ addShare() { local ref="$2" local name="$3" local comment="$4" local user="$5" local group="$6" local cfg="$7" mkdir -p "$dir" || return 1 ls -A "$dir" >/dev/null 2>&1 || return 1 if ! ls -A "$dir" >/dev/null 2>&1; then error "Failed to access directory $dir" && return 1 fi if [ -z "$(ls -A "$dir")" ]; then chmod 777 "$dir" || return 1 if ! chmod 777 "$dir"; then error "Failed to set permissions for directory $dir" && return 1 fi if [[ "$user" != "root" || "$group" != "root" ]]; then if ! chown "$user:$group" "$dir" ; then error "Failed to set ownership for directory $dir" && return 1 fi fi fi if [[ "$dir" == "$tmp" ]]; then Loading Loading @@ -81,13 +98,84 @@ addShare() { echo " writable = yes" echo " guest ok = yes" echo " guest only = yes" echo " force user = root" echo " force group = root" } >> "/etc/samba/smb.conf" echo " force user = $user" echo " force group = $group" } >> "$cfg" return 0 } addUser() { local username="$1" local uid="$2" local groupname="$3" local gid="$4" local password="$1" local cfg="$5" # Check if the group exists, if not, create it if ! getent group "$groupname" &>/dev/null; then if ! groupadd -o -g "$gid" "$groupname" > /dev/null; then error "Failed to create group $groupname" && return 1 fi else # Check if the gid is right, if not, change it local current_gid current_gid=$(getent group "$groupname" | cut -d: -f3) if [[ "$current_gid" != "$gid" ]]; then if ! groupmod -o -g "$gid" "$groupname" > /dev/null; then error "Failed to update GID for group $groupname" && return 1 fi fi fi # Check if the user already exists, if not, create it if ! id "$username" &>/dev/null; then if ! adduser --gid "$gid" --uid "$uid" --comment "$username" --no-create-home --disabled-login "$username"; then error "Failed to create user $username" && return 1 fi else # Check if the uid is right, if not, change it local current_uid current_uid=$(id -u "$username") if [[ "$current_uid" != "$uid" ]]; then if ! usermod -o -u "$uid" "$username" > /dev/null; then error "Failed to update UID for user $username" && return 1 fi fi # Update user's group if ! usermod -g "$groupname" "$username" > /dev/null; then echo "Failed to update group for user $username" && return 1 fi fi # Check if the user is a samba user pdb_output=$(pdbedit -s "$cfg" -L) if echo "$pdb_output" | grep -q "^$username:"; then # skip samba password update if password is * or ! if [[ "$password" != "*" && "$password" != "!" ]]; then # If the user is a samba user, update its password in case it changed if ! echo -e "$password\n$password" | smbpasswd -c "$cfg" -s "$username" > /dev/null; then error "Failed to update Samba password for $username" && return 1 fi fi else # If the user is not a samba user, create it and set a password if ! echo -e "$password\n$password" | smbpasswd -a -c "$cfg" -s "$username" > /dev/null; then error "Failed to add Samba user $username" && return 1 fi fi return 0 } SAMBA_USER="root" SAMBA_GROUP="root" SAMBA_CONFIG="/etc/samba/smb.conf" { echo "[global]" echo " server string = Dockur" echo " netbios name = $hostname" Loading @@ -108,8 +196,19 @@ addShare() { echo " printing = bsd" echo " printcap name = /dev/null" echo " disable spoolss = yes" } > "/etc/samba/smb.conf" } > "$SAMBA_CONFIG" # Setup user and group if [[ "$SAMBA_UID" != "1000" || "$SAMBA_GID" != "1000" ]]; then SAMBA_USER="samba" SAMBA_GROUP="samba" ! addUser "$SAMBA_USER" "$SAMBA_UID" "$SAMBA_GROUP" "$SAMBA_GID" "$SAMBA_CONFIG" && return 0 fi # Add shared folders share="/shared" [ ! -d "$share" ] && [ -d "$STORAGE/shared" ] && share="$STORAGE/shared" [ ! -d "$share" ] && [ -d "/data" ] && share="/data" Loading @@ -119,23 +218,23 @@ share="/shared" m1="Failed to add shared folder" m2="Please check its permissions." if ! addShare "$share" "/shared" "Data" "Shared"; then if ! addShare "$share" "/shared" "Data" "Shared" "$SAMBA_USER" "$SAMBA_GROUP" "$SAMBA_CONFIG"; then error "$m1 '$share'. $m2" && return 0 fi if [ -d "/shared2" ]; then addShare "/shared2" "/shared2" "Data2" "Shared" || error "$m1 '/shared2'. $m2" addShare "/shared2" "/shared2" "Data2" "Shared" "$SAMBA_USER" "$SAMBA_GROUP" "$SAMBA_CONFIG" || error "$m1 '/shared2'. $m2" else if [ -d "/data2" ]; then addShare "/data2" "/shared2" "Data2" "Shared" || error "$m1 '/data2'. $m2." addShare "/data2" "/shared2" "Data2" "Shared" "$SAMBA_USER" "$SAMBA_GROUP" "$SAMBA_CONFIG" || error "$m1 '/data2'. $m2." fi fi if [ -d "/shared3" ]; then addShare "/shared3" "/shared3" "Data3" "Shared" || error "$m1 '/shared3'. $m2" addShare "/shared3" "/shared3" "Data3" "Shared" "$SAMBA_USER" "$SAMBA_GROUP" "$SAMBA_CONFIG" || error "$m1 '/shared3'. $m2" else if [ -d "/data3" ]; then addShare "/data3" "/shared3" "Data3" "Shared" || error "$m1 '/data3'. $m2" addShare "/data3" "/shared3" "Data3" "Shared" "$SAMBA_USER" "$SAMBA_GROUP" "$SAMBA_CONFIG" || error "$m1 '/data3'. $m2" fi fi Loading @@ -146,6 +245,11 @@ for dir in "${dirs[@]}"; do addShare "$dir" "/shared" "$dir_name" "Shared $dir_name" || error "Failed to create shared folder for $dir!" done # Create directories if missing mkdir -p /var/lib/samba/sysvol mkdir -p /var/lib/samba/private mkdir -p /var/lib/samba/bind-dns # Try to repair Samba permissions [ -d /run/samba/msg.lock ] && chmod -R 0755 /run/samba/msg.lock 2>/dev/null || : [ -d /var/log/samba/cores ] && chmod -R 0700 /var/log/samba/cores 2>/dev/null || : Loading