ssfs rev 33
Tiny edits
| author | Paul Issott <paul@slitaz.org> |
|---|---|
| date | Sun Jun 12 12:02:48 2011 +0100 (2011-06-12) |
| parents | bb7a9ec53298 |
| children | c7205f3db649 |
| files | README data/ssfs-server.conf ssfs-server ssfs-sh web/ssfs.cgi web/style.css |
line diff
1.1 --- a/README Sun Jun 12 11:08:53 2011 +0200 1.2 +++ b/README Sun Jun 12 12:02:48 2011 +0100 1.3 @@ -88,12 +88,12 @@ 1.4 1.5 Ssfs chroot SHell 1.6 ----------------- 1.7 -The tool ssfs-sh is used to chroot a user on login and set minimal environment 1.8 -variables. For each users ssfs-sh is the default SHell on the server and is 1.9 +The tool ssfs-sh is used to chroot a user on login and sets minimal environment 1.10 +variables. For each user ssfs-sh is the default SHell on the server and is 1.11 executed inside the new root. So ssfs-sh must be installed on the server and 1.12 in the virtual disk minimal chroot. Using a custom tool such as Ssfs SHell 1.13 -enforce security and let execute commands on login, ssfs-sh also export the 1.14 -new user $HOME and change directory do it since chroot will drop us in / by 1.15 +enforces security and lets you execute commands on login, ssfs-sh also exports the 1.16 +new user $HOME and changes the directory to it since chroot will drop us in / by 1.17 default. 1.18 1.19
2.1 --- a/data/ssfs-server.conf Sun Jun 12 11:08:53 2011 +0200 2.2 +++ b/data/ssfs-server.conf Sun Jun 12 12:02:48 2011 +0100 2.3 @@ -13,5 +13,5 @@ 2.4 # User configuration file path. 2.5 SSFS_USERS="/etc/ssfs/users" 2.6 2.7 -# Default quota peer user in Mb. 2.8 +# Default quota per user in Mb. 2.9 DEFAULT_QUOTA="250"
3.1 --- a/ssfs-server Sun Jun 12 11:08:53 2011 +0200 3.2 +++ b/ssfs-server Sun Jun 12 12:02:48 2011 +0100 3.3 @@ -58,12 +58,12 @@ 3.4 chroot $(gettext "Chroot to Ssfs storage root.") 3.5 gen-vdisk $(gettext "Create a vdisk with chroot for files storage.") 3.6 clean-vdisk $(gettext "Clean the vdisk but skip home and root.") 3.7 - check-vdisk $(gettext "Check vdisk filesystem with e2fsck.") 3.8 - mount-vdisk $(gettext "Mount ssfs virtual disk.") 3.9 + check-vdisk $(gettext "Check the vdisk filesystem with e2fsck.") 3.10 + mount-vdisk $(gettext "Mount a ssfs virtual disk.") 3.11 umount-vdisk $(gettext "Unmount the vdisk and free loop device.") 3.12 3.13 $(echo -e "\033[1m$(gettext "Options:")\033[0m") 3.14 - --login= $(gettext "Login name for add or del an user.") 3.15 + --login= $(gettext "Login name to add or del an user.") 3.16 --id= $(gettext "User id for adduser command.") 3.17 --pass= $(gettext "User password for adduser.") 3.18 --root= $(gettext "The path to the Ssfs vdisk chroot.") 3.19 @@ -160,7 +160,7 @@ 3.20 user_paths 3.21 3.22 # We need chroot command allowed for users to chroot them on SSH 3.23 - # login. Ssfs user have /bin/ssfs-sh as SHell. 3.24 + # login. Ssfs users have /bin/ssfs-sh as SHell. 3.25 grep -q ^chroot /etc/busybox.conf || 3.26 echo 'chroot = ssx root.root' >> /etc/busybox.conf 3.27 3.28 @@ -210,7 +210,7 @@ 3.29 gettext -e "\nBack to the host system:" 3.30 echo -e " $(hostname)\n" ;; 3.31 gen-vdisk) 3.32 - # Generated a virtual disk with a minimal chroot for Ssfs users home. 3.33 + # Generate a virtual disk with a minimal chroot for Ssfs users home. 3.34 if [ -d "$root/bin" ]; then 3.35 gettext -e "A chroot already exists in:"; echo " $root" 3.36 exit 0 3.37 @@ -230,7 +230,7 @@ 3.38 mount_vdisk 3.39 fi 3.40 3.41 - # Create a radicaly minimal chroot with all libs in /lib. 3.42 + # Create a radically minimal chroot with all libs in /lib. 3.43 gettext "Creating base files..." 3.44 mkdir -p $root && cd $root 3.45 for d in etc tmp lib usr home root 3.46 @@ -250,7 +250,7 @@ 3.47 status 3.48 3.49 # Busybox without deps (get && extract). No system comands are allowed 3.50 - # in /etc/busybox.conf to restrict SSHed users. 3.51 + # in /etc/busybox.conf to restrict SSH'd users. 3.52 gettext "Installing Busybox..." 3.53 cd $root/tmp 3.54 tazpkg get busybox >/dev/null
4.1 --- a/ssfs-sh Sun Jun 12 11:08:53 2011 +0200 4.2 +++ b/ssfs-sh Sun Jun 12 12:02:48 2011 +0100 4.3 @@ -1,11 +1,11 @@ 4.4 #!/bin/sh 4.5 # 4.6 # Ssfs users SHell - Chroot user into the virtual disk on login. This tool must 4.7 -# be installed on server and in the vdisk chroot, it is executed when login and 4.8 -# when chrooting. 4.9 +# be installed on the server and in the vdisk chroot, it is executed when logging 4.10 +# in and when chrooting. 4.11 # 4.12 4.13 -# Ssfs server config dont exist in chroot. 4.14 +# Ssfs server config doesn't exist in chroot. 4.15 if [ -f /etc/ssfs/ssfs-server.conf ]; then 4.16 . /etc/ssfs/ssfs-server.conf 4.17 root=$SSFS_CHROOT 4.18 @@ -14,8 +14,8 @@ 4.19 clear && exec chroot $root /bin/ssfs-sh 4.20 else 4.21 # Chroot will drop user into /, so set new HOME and cd. Set also 4.22 - # some env variables but dont source any profile. 4.23 - echo -e "\nWelcome to Ssfs SHell $USER\n" 4.24 + # some env variables but don't source any profile. 4.25 + echo -e "\nWelcome to the Ssfs SHell $USER\n" 4.26 HOME=/home/$USER 4.27 SYNC=$HOME/Sync 4.28 SHELL=/bin/sh
5.1 --- a/web/ssfs.cgi Sun Jun 12 11:08:53 2011 +0200 5.2 +++ b/web/ssfs.cgi Sun Jun 12 12:02:48 2011 +0100 5.3 @@ -46,7 +46,7 @@ 5.4 5.5 case ${QUERY_STRING} in 5.6 doc) 5.7 - # Open a dic for content but keep small margins. 5.8 + # Open a doc for content but keep small margins. 5.9 echo '<div>' 5.10 #echo '<h1>Ssfs Documentation</h1>' 5.11 echo '<pre>' 5.12 @@ -82,7 +82,7 @@ 5.13 <div style="background: #d66018; width: $pct;">$pct</div> 5.14 </div> 5.15 <p> 5.16 - Filesystem usage provided by 'df' include ext3 reserved space. 5.17 + Filesystem usage provided by 'df' includes ext3 reserved space. 5.18 </p> 5.19 5.20 EOT