Add new folders & clean smb addon

This commit is contained in:
pvizeli
2017-05-18 11:13:41 +02:00
parent 009721d4f1
commit dac3d852a2
3 changed files with 25 additions and 40 deletions

View File

@@ -1,6 +1,6 @@
{ {
"name": "Samba share", "name": "Samba share",
"version": "0.4", "version": "0.5",
"slug": "samba", "slug": "samba",
"description": "Expose HassIO folders with Samba", "description": "Expose HassIO folders with Samba",
"url": "https://home-assistant.io/addons/samba/", "url": "https://home-assistant.io/addons/samba/",
@@ -9,13 +9,15 @@
"ports": { "ports": {
"445/tcp": 445 "445/tcp": 445
}, },
"map": ["config:rw", "ssl:rw", "addons:rw"], "map": ["config:rw", "ssl:rw", "addons:rw", "share:rw", "mnt:rw"],
"options": { "options": {
"workgroup": "WORKGROUP", "workgroup": "WORKGROUP",
"guest": true, "guest": true,
"map_config": true, "map_config": true,
"map_addons": true, "map_addons": true,
"map_ssl": false, "map_ssl": false,
"map_share": true,
"map_mnt": false,
"username": "", "username": "",
"password": "" "password": ""
}, },
@@ -25,6 +27,8 @@
"map_config": "bool", "map_config": "bool",
"map_addons": "bool", "map_addons": "bool",
"map_ssl": "bool", "map_ssl": "bool",
"map_share": "bool",
"map_mnt": "bool",
"username": "str", "username": "str",
"password": "str" "password": "str"
}, },

View File

@@ -10,12 +10,16 @@ PASSWORD=$(jq --raw-output ".password // empty" $CONFIG_PATH)
MAP_CONFIG=$(jq --raw-output ".map_config // empty" $CONFIG_PATH) MAP_CONFIG=$(jq --raw-output ".map_config // empty" $CONFIG_PATH)
MAP_ADDONS=$(jq --raw-output ".map_addons // empty" $CONFIG_PATH) MAP_ADDONS=$(jq --raw-output ".map_addons // empty" $CONFIG_PATH)
MAP_SSL=$(jq --raw-output ".map_ssl // empty" $CONFIG_PATH) MAP_SSL=$(jq --raw-output ".map_ssl // empty" $CONFIG_PATH)
MAP_SHARE=$(jq --raw-output ".map_share // empty" $CONFIG_PATH)
MAP_MNT=$(jq --raw-output ".map_mnt // empty" $CONFIG_PATH)
SMB_CONFIG="
[config] function write_config() {
echo "
[$1]
browseable = yes browseable = yes
writeable = yes writeable = yes
path = /config path = /$1
#guest ok = yes #guest ok = yes
#guest only = yes #guest only = yes
@@ -24,50 +28,27 @@ SMB_CONFIG="
#valid users = $USERNAME #valid users = $USERNAME
#force user = root #force user = root
#force group = root #force group = root
" " >> /etc/smb.conf
}
SMB_SSL="
[ssl]
browseable = yes
writeable = yes
path = /ssl
#guest ok = yes
#guest only = yes
#public = yes
#valid users = $USERNAME
#force user = root
#force group = root
"
SMB_ADDONS="
[addons]
browseable = yes
writeable = yes
path = /addons
#guest ok = yes
#guest only = yes
#public = yes
#valid users = $USERNAME
#force user = root
#force group = root
"
sed -i "s/%%WORKGROUP%%/$WORKGROUP/g" /etc/smb.conf sed -i "s/%%WORKGROUP%%/$WORKGROUP/g" /etc/smb.conf
## ##
# Write shares to config # Write shares to config
if [ "$MAP_CONFIG" == "true" ]; then if [ "$MAP_CONFIG" == "true" ]; then
echo "$SMB_CONFIG" >> /etc/smb.conf write_config "config"
fi fi
if [ "$MAP_ADDONS" == "true" ]; then if [ "$MAP_ADDONS" == "true" ]; then
echo "$SMB_ADDONS" >> /etc/smb.conf write_config "addons"
fi fi
if [ "$MAP_SSL" == "true" ]; then if [ "$MAP_SSL" == "true" ]; then
echo "$SMB_SSL" >> /etc/smb.conf write_config "ssl"
fi
if [ "$MAP_SHARE" == "true" ]; then
write_config "share"
fi
if [ "$MAP_MNT" == "true" ]; then
write_config "mnt"
fi fi
## ##

View File

@@ -9,7 +9,7 @@
"ports": { "ports": {
"22/tcp": 22 "22/tcp": 22
}, },
"map": ["config:rw", "ssl:rw", "addons:rw"], "map": ["config:rw", "ssl:rw", "addons:rw", "share:rw", "mnt:rw"],
"options": { "options": {
"authorized_keys": [null] "authorized_keys": [null]
}, },