fix
This commit is contained in:
parent
34f74ef5a3
commit
0f7c1ba477
@ -0,0 +1,3 @@
|
|||||||
|
luca
|
||||||
|
aaaa
|
||||||
|
prova
|
@ -31,17 +31,20 @@ fi
|
|||||||
SHARE_NAME=$(basename "$FOLDER_PATH")
|
SHARE_NAME=$(basename "$FOLDER_PATH")
|
||||||
|
|
||||||
# 4. Ensure shares.d directory exists
|
# 4. Ensure shares.d directory exists
|
||||||
if [ ! -d "$SHARE_CONFIG_DIR" ]; then
|
if [ ! -d "$SHARE_CONFIG_DIR/$USERNAME" ]; then
|
||||||
mkdir -p "$SHARE_CONFIG_DIR"
|
mkdir -p "$SHARE_CONFIG_DIR/$USERNAME"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Controllare che uerfolder esista
|
||||||
|
|
||||||
# 5. Create Samba share config file
|
# 5. Create Samba share config file
|
||||||
SHARE_CONFIG_FILE="$SHARE_CONFIG_DIR/$SHARE_NAME.conf"
|
SHARE_CONFIG_FILE="$SHARE_CONFIG_DIR/$USERNAME/$SHARE_NAME.conf"
|
||||||
|
echo $SHARE_CONFIG_FILE
|
||||||
if [ -f "$SHARE_CONFIG_FILE" ]; then
|
if [ -f "$SHARE_CONFIG_FILE" ]; then
|
||||||
echo "Warning: Share config already exists: $SHARE_CONFIG_FILE"
|
echo "Warning: Share config already exists: $SHARE_CONFIG_FILE"
|
||||||
else
|
else
|
||||||
cat <<EOF > "$SHARE_CONFIG_FILE"
|
cat <<EOF > "$SHARE_CONFIG_FILE"
|
||||||
[$SHARE_NAME]
|
[$USERNAME-$SHARE_NAME]
|
||||||
path = $FOLDER_PATH
|
path = $FOLDER_PATH
|
||||||
valid users = $USERNAME
|
valid users = $USERNAME
|
||||||
read only = no
|
read only = no
|
||||||
|
@ -7,7 +7,7 @@ if [ "$#" -ne 1 ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
USERNAME="$1"
|
USERNAME="$1"
|
||||||
SHARE_DIR="/etc/samba/shares.d"
|
SHARE_DIR="/etc/samba/shares.d/$USERNAME"
|
||||||
|
|
||||||
# Loop through share config files
|
# Loop through share config files
|
||||||
for file in "$SHARE_DIR"/*.conf; do
|
for file in "$SHARE_DIR"/*.conf; do
|
||||||
|
@ -5,15 +5,16 @@
|
|||||||
|
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
if [ "$#" -ne 1 ]; then
|
if [ "$#" -ne 2 ]; then
|
||||||
echo "Usage: $0 <share_name>"
|
echo "Usage: $0 <share_name> <username>"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
SHARE_NAME="$1"
|
SHARE_NAME="$1"
|
||||||
|
USERNAME="$2"
|
||||||
SHARE_CONFIG_DIR="/etc/samba/shares.d"
|
SHARE_CONFIG_DIR="/etc/samba/shares.d"
|
||||||
SMBCONF="/etc/samba/smb.conf"
|
SMBCONF="/etc/samba/smb.conf"
|
||||||
SHARE_CONFIG_FILE="$SHARE_CONFIG_DIR/$SHARE_NAME.conf"
|
SHARE_CONFIG_FILE="$SHARE_CONFIG_DIR/$USERNAME/$SHARE_NAME.conf"
|
||||||
TRASH_BASE="$SMB_DATA_FOLDER/trash"
|
TRASH_BASE="$SMB_DATA_FOLDER/trash"
|
||||||
|
|
||||||
# 1. Read the .conf file if it exists
|
# 1. Read the .conf file if it exists
|
||||||
|
@ -65,7 +65,7 @@ SHARE=$(<"$TMP_FILE")
|
|||||||
|
|
||||||
|
|
||||||
# Call the external script to create the share
|
# Call the external script to create the share
|
||||||
bash $SMB_TOOLS_PATH/functions/remove_share.sh "$SHARE" >"$TMP_OUT" 2>&1
|
bash $SMB_TOOLS_PATH/functions/remove_share.sh "$SHARE" "$USERNAME" >"$TMP_OUT" 2>&1
|
||||||
|
|
||||||
# Display the result
|
# Display the result
|
||||||
dialog --backtitle "Remove SMB share" \
|
dialog --backtitle "Remove SMB share" \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user