virtubox
/
bashrc
1
0
Fork 0
Code Releases Activity

Fix pwgen & add ftpadd

This commit is contained in:
VirtuBox 2019-10-18 17:24:15 +02:00
parent 077ff4b868
commit f344a47d49
Signed by: virtubox
GPG Key ID: 22EB296C97BAD476
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
mybashrc
View File

@ -14,6 +14,10 @@ command_exists() {
command -v "$@" > /dev/null 2>&1
}
apt_install() {
DEBIAN_FRONTEND=noninteractive apt-get install --option=Dpkg::options::=--force-confmiss --option=Dpkg::options::=--force-confold "$@" --assume-yes /dev/null 2>&1
}
transfer_vtbox_net() {
{ curl --progress-bar --upload-file "$1" https://transfer.vtbox.net/$(basename "$1") && echo ""; } | tee -a $HOME/.transfer.log && echo ""
}
@ -146,10 +150,10 @@ MAINTENANCE_APT() {
echo -e "${CGREEN}#############################################${CEND}"
echo -e ' APT UPDATE '
echo -e "${CGREEN}#############################################${CEND}"
if ! {
$NEED_SUDO apt-get update --allow-releaseinfo-change
if ! {
$NEED_SUDO apt-get update --allow-releaseinfo-change
}; then
$NEED_SUDO apt-get update
$NEED_SUDO apt-get update
fi
echo -e "${CGREEN}#############################################${CEND}"
echo -e ' APT FULL-UPGRADE '
@ -469,9 +473,15 @@ _FTP_ADD() {
echo "Usage : ftpadd <user> <domain>"
else
ftpaccountpass=$(_PWGEN)
echo "$ftpaccountpass"
$NEED_SUDO useradd -d /var/www/"$2"/htdocs -M -s /bin/false -G www-data "$1"
echo "$1:$ftpaccountpass" | $NEED_SUDO chpasswd -m
echo "user : $1"
echo "password : $ftpaccountpass"
if [ -d /var/www/"$2"/htdocs ]; then
$NEED_SUDO useradd -d /var/www/"$2"/htdocs -M -s /bin/false -G www-data "$1"
echo "$1:$ftpaccountpass" | $NEED_SUDO chpasswd -m
chmod -R g+rw /var/www/"$2"/htdocs
else
echo "site directory doesn't exist"
fi
fi
}
@ -510,8 +520,8 @@ _SSH_SECURE() {
}
_PWGEN() {
if [ -z "$(command -v pwgen)" ]; then
apt install pwgen -assume-yes
if ! command_exists pwgen; then
apt_install pwgen
fi
pwgen -s 24 1
}
@ -585,6 +595,7 @@ alias ee-mysql-optimize=EE_MYSQL_OPTIMIZATION
alias ee-syslog='tail -n 250 /var/log/syslog | ccze -A'
alias egrep='egrep --color=auto'
alias ffmpeg-cut-start=ffmpeg_start_time
alias ftpadd=_FTP_ADD
alias fgrep='fgrep --color=auto'
alias gg="ping google.fr"
alias gpg-crypt=encrypt_gpg