setup default share directory

conf/post_user_create

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+
+echo "${YNH_USER_PASSWORD}
+${YNH_USER_PASSWORD}
+" | sudo smbpasswd -a $YNH_USER_USERNAME

conf/post_user_delete

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+user=$1

conf/post_user_update

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+echo "${YNH_USER_PASSWORD}
+${YNH_USER_PASSWORD}
+" | sudo smbpasswd -a $YNH_USER_USERNAME
+

conf/smb.conf

@@ -1,250 +1,40 @@
-# This is the main Samba configuration file. You should read the
-# smb.conf(5) manual page in order to understand the options listed
-# here. Samba has a huge number of configurable options most of which 
-# are not shown in this example
-#
-# Some options that are often worth tuning have been included as
-# commented-out examples in this file.
-#  - When such options are commented with ";", the proposed setting
-#    differs from the default Samba behaviour
-#  - When commented with "#", the proposed setting is the default
-#    behaviour of Samba but the option is considered important
-#    enough to be mentioned here
-#
-# NOTE: Whenever you modify this file you should run the command
-# "testparm" to check that you have not made any basic syntactic 
-# errors. 
-
-#======================= Global Settings =======================
-
 [global]
 
-## Browsing/Identification ###
-
-# Change this to the workgroup/NT-domain name your Samba server will part of
-   workgroup = __WORKGROUP__
-
-# server string is the equivalent of the NT Description field
-   server string = Toaster Data
-
-   security = user
-   map to guest = Bad User
-
-# This will prevent nmbd to search for NetBIOS names through DNS.
-   dns proxy = no
-
-#### Networking ####
-
-# The specific set of interfaces / networks to bind to
-# This can be either the interface name or an IP address/netmask;
-# interface names are normally preferred
-#   interfaces = 0.0.0.0/32
-
-
-# Only bind to the named interfaces and/or networks; you must use the
-# 'interfaces' option above to use this.
-# It is recommended that you enable this feature if your Samba machine is
-# not protected by a firewall or is a firewall itself.  However, this
-# option cannot handle dynamic or non-broadcast interfaces correctly.
-   bind interfaces only = yes
-
-
-
-#### Debugging/Accounting ####
-
-# This tells Samba to use a separate log file for each machine
-# that connects
    log file = /var/log/samba/log.%m
-
-# Cap the size of the individual log files (in KiB).
    max log size = 1000
+   logging = file
+   panic action = /usr/share/samba/panic-action %d
 
-####### Authentication #######
-
-# Server role. Defines in which mode Samba will operate. Possible
-# values are "standalone server", "member server", "classic primary
-# domain controller", "classic backup domain controller", "active
-# directory domain controller". 
-#
-# Most people will want "standalone sever" or "member server".
-# Running as "active directory domain controller" will require first
-# running "samba-tool domain provision" to wipe databases and create a
-# new domain.
    server role = standalone server
 
-# If you are using encrypted passwords, Samba will need to know what
-# password database type you are using.  
-   passdb backend = tdbsam
-
    obey pam restrictions = yes
-
-# This boolean parameter controls whether Samba attempts to sync the Unix
-# password with the SMB password when the encrypted SMB password in the
-# passdb is changed.
    unix password sync = yes
-
-# For Unix password sync to work on a Debian GNU/Linux system, the following
-# parameters must be set (thanks to Ian Kahan <<kahan@informatik.tu-muenchen.de> for
-# sending the correct chat script for the passwd program in Debian Sarge).
    passwd program = /usr/bin/passwd %u
    passwd chat = *Enter\snew\s*\spassword:* %n\n *Retype\snew\s*\spassword:* %n\n *password\supdated\ssuccessfully* .
-
-# This boolean controls whether PAM will be used for password changes
-# when requested by an SMB client instead of the program listed in
-# 'passwd program'. The default is 'no'.
    pam password change = yes
+   map to guest = bad user
 
-########## Domains ###########
+   usershare allow guests = yes
 
-#
-# The following settings only takes effect if 'server role = primary
-# classic domain controller', 'server role = backup domain controller'
-# or 'domain logons' is set 
-#
 
-# It specifies the location of the user's
+[homes]
-# profile directory from the client point of view) The following
+   comment = Home Directories
-# required a [profiles] share to be setup on the samba server (see
+   browseable = yes
-# below)
+   read only = yes
-;   logon path = \\%N\profiles\%U
+   create mask = 0700
-# Another common choice is storing the profile in the user's home directory
+   directory mask = 0700
-# (this is Samba's default)
+   valid users = %S
-#   logon path = \\%N\%U\profile
 
-# The following setting only takes effect if 'domain logons' is set
+[share]
-# It specifies the location of a user's home directory (from the client
+   comment = share (D)
-# point of view)
-;   logon drive = H:
-#   logon home = \\%N\%U
-
-# The following setting only takes effect if 'domain logons' is set
-# It specifies the script to run during logon. The script must be stored
-# in the [netlogon] share
-# NOTE: Must be store in 'DOS' file format convention
-;   logon script = logon.cmd
-
-# This allows Unix users to be created on the domain controller via the SAMR
-# RPC pipe.  The example command creates a user account with a disabled Unix
-# password; please adapt to your needs
-; add user script = /usr/sbin/adduser --quiet --disabled-password --gecos "" %u
-
-# This allows machine accounts to be created on the domain controller via the 
-# SAMR RPC pipe.  
-# The following assumes a "machines" group exists on the system
-; add machine script  = /usr/sbin/useradd -g machines -c "%u machine account" -d /var/lib/samba -s /bin/false %u
-
-# This allows Unix groups to be created on the domain controller via the SAMR
-# RPC pipe.  
-; add group script = /usr/sbin/addgroup --force-badname %g
-
-############ Misc ############
-
-# Using the following line enables you to customise your configuration
-# on a per machine basis. The %m gets replaced with the netbios name
-# of the machine that is connecting
-;   include = /home/samba/etc/smb.conf.%m
-
-# Some defaults for winbind (make sure you're not using the ranges
-# for something else.)
-;   idmap uid = 10000-20000
-;   idmap gid = 10000-20000
-;   template shell = /bin/bash
-
-# Setup usershare options to enable non-root users to share folders
-# with the net usershare command.
-
-# Maximum number of usershare. 0 (default) means that usershare is disabled.
-;   usershare max shares = 100
-
-# Allow users who've been granted usershare privileges to create
-# public shares, not just authenticated ones
-#   usershare allow guests = yes
-
-#======================= Share Definitions =======================
-
-# Un-comment the following (and tweak the other settings below to suit)
-# to enable the default home directory shares. This will share each
-# user's home directory as \\server\username
-;[homes]
-;   comment = Home Directories
-;   browseable = no
-
-# By default, the home directories are exported read-only. Change the
-# next parameter to 'no' if you want to be able to write to them.
-;   read only = yes
-
-# File creation mask is set to 0700 for security reasons. If you want to
-# create files with group=rw permissions, set next parameter to 0775.
-;   create mask = 0700
-
-# Directory creation mask is set to 0700 for security reasons. If you want to
-# create dirs. with group=rw permissions, set next parameter to 0775.
-;   directory mask = 0700
-
-# By default, \\server\username shares can be connected to by anyone
-# with access to the samba server.
-# Un-comment the following parameter to make sure that only "username"
-# can connect to \\server\username
-# This might need tweaking when using external authentication schemes
-;   valid users = %S
-
-# Un-comment the following and create the netlogon directory for Domain Logons
-# (you need to configure Samba to act as a domain controller too.)
-;[netlogon]
-;   comment = Network Logon Service
-;   path = /home/samba/netlogon
-;   guest ok = yes
-;   read only = yes
-
-# Un-comment the following and create the profiles directory to store
-# users profiles (see the "logon path" option above)
-# (you need to configure Samba to act as a domain controller too.)
-# The path below should be writable by all users so that their
-# profile directory may be created the first time they log on
-;[profiles]
-;   comment = Users profiles
-;   path = /home/samba/profiles
-;   guest ok = no
-;   browseable = no
-;   create mask = 0600
-;   directory mask = 0700
-
-;[printers]
-;   comment = All Printers
-;   browseable = no
-;   path = /var/spool/samba
-;   printable = yes
-;   guest ok = no
-;   read only = yes
-;   create mask = 0700
-
-# Windows clients look for this share name as a source of downloadable
-# printer drivers
-;[print$]
-;   comment = Printer Drivers
-;   path = /var/lib/samba/printers
-;   browseable = yes
-;   read only = yes
-;   guest ok = no
-# Uncomment to allow remote administration of Windows print drivers.
-# You may need to replace 'lpadmin' with the name of the group your
-# admin users are members of.
-# Please note that you also need to set appropriate Unix permissions
-# to the drivers directory for these users to have write rights in it
-;   write list = root, @lpadmin
-
-[workdir]
-   path = /workdir
-   public = yes
-   case sensitive = yes
-   map archive = no
-   only guest = yes
-   writable = yes
-   force user = smbuser
-   force group = smbuser
-
-[sambashare]
-    comment = Samba YunoHost
-    path = __DATADIR__
    read only = no
+   path = /home/yunhost.app/samba/share
+   guest ok = no
    browsable = yes
+   valid users = @samba.share
+   directory mask = 770
+   create mask = 0660
+   vfs objects = dfs_samba4 acl_xattr recycle
+   recycle:repository = .recycle
+   recycle:keeptree = yes
+   recycle:versions = yes

scripts/_common.sh

@@ -5,7 +5,7 @@
 #=================================================
 
 # dependencies used by the app
-pkg_dependencies="samba smbfs"
+pkg_dependencies="samba"
 
 #=================================================
 # PERSONAL HELPERS

scripts/install

@@ -20,30 +20,19 @@ ynh_abort_if_errors
 # RETRIEVE ARGUMENTS FROM THE MANIFEST
 #=================================================
 
-domain=$YNH_APP_ARG_DOMAIN
-path_url=$YNH_APP_ARG_PATH
-admin=$YNH_APP_ARG_ADMIN
-
 app=$YNH_APP_INSTANCE_NAME
 
-#=================================================
-# CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
-#=================================================
-ynh_script_progression --message="Validating installation parameters..." --time --weight=1
-
-final_path=/var/www/$app
-test ! -e "$final_path" || ynh_die --message="This path already contains a folder"
-
-# Register (book) web path
-ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url
-
 #=================================================
 # STORE SETTINGS FROM MANIFEST
 #=================================================
 ynh_script_progression --message="Storing installation settings..." --time --weight=1
 
-ynh_app_setting_set --app=$app --key=domain --value=$domain
+#=================================================
-ynh_app_setting_set --app=$app --key=path --value=$path_url
+# FIND AND OPEN A PORT
+#=================================================
+
+ynh_exec_warn_less yunohost firewall allow Both 445 --no-upnp
+
 
 #=================================================
 # INSTALL DEPENDENCIES
@@ -57,21 +46,31 @@ ynh_install_app_dependencies $pkg_dependencies
 #=================================================
 ynh_script_progression --message="Creating a data directory..." --time --weight=1
 
-datadir=/home/yunohost.app/$app
+datadir=/home/yunohost.app/samba
-ynh_app_setting_set --app=$app --key=datadir --value=$datadir
+ynh_app_setting_set --app=samba --key=datadir --value=$datadir
 
-mkdir -p $datadir
+mkdir -p $datadir/share
 
-chmod 750 "$datadir"
+chmod 750 "$datadir/share"
-chmod -R o-rwx "$datadir"
+chmod -R o-rwx "$datadir/share"
-chown -R $app:www-data "$datadir"
+chown -R root:root "$datadir/share"
+setfacl -R -m g:all_users:rwx,d:g:all_users:rwx $datadir/share
 
 #=================================================
 # ADD A CONFIGURATION
 #=================================================
 ynh_script_progression --message="Adding a configuration file..." --time --weight=1
 
-echo -e "[sambashare]\ncomment = YunoHost\npath = ${datadir}\nread only = no\nbrowsable = yes" >> /etc/samba/smb.conf
+ynh_add_config --template="smb.conf" --destination="/etc/samba/smb.conf"
+ynh_add_config --template="post_user_create" --destination="/etc/yunohost/hooks.d/post_user_create/$app"
+ynh_add_config --template="post_user_delete" --destination="/etc/yunohost/hooks.d/post_user_delete/$app"
+ynh_add_config --template="post_user_update" --destination="/etc/yunohost/hooks.d/post_user_update/$app"
+
+#================================================
+# INTEGRATE SERVICE IN YUNOHOST
+#================================================
+
+yunohost service add smbd --description="Samba service" --log="/var/log/smbd/smbd.log"
 
 #=================================================
 # START SYSTEMD SERVICE
@@ -81,6 +80,12 @@ ynh_script_progression --message="Starting a systemd service..." --time --weight
 # Start a systemd service
 ynh_systemd_action --service_name=smbd --action="start"
 
+#=================================================
+# SETUP SSOWAT
+#=================================================
+
+ynh_permission_create --permission="share" --allowed=all_users
+
 #=================================================
 # END OF SCRIPT
 #=================================================