LiittleCookie/vpn-install
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

misspell; continue bugfix; mkdir -p option

Browse Source
This commit is contained in:
bedefaced 2017-08-23 13:32:58 +03:00 committed by bedefaced
parent 0393cada72
commit d95f1d351a
3 changed files with 39 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ipsec/adduser.sh
View File

@ -8,10 +8,10 @@ if [[ ! -e $CHAPSECRETS ]] || [[ ! -r $CHAPSECRETS ]] || [[ ! -w $CHAPSECRETS ]]
exit 1 exit 1
fi fi
ADDUSER="no" NOTADDUSER="no"
ANSUSER="yes" ANSUSER="yes"
while [ "$ANSUSER" != "$ADDUSER" ]; while [ "$ANSUSER" != "$NOTADDUSER" ];
do do
if [[ $# -gt 0 ]]; then if [[ $# -gt 0 ]]; then
@ -42,6 +42,10 @@ do
if [ "$NOTREM" == "$ANSREM" ]; then if [ "$NOTREM" == "$ANSREM" ]; then
unset LOGIN PASSWORD unset LOGIN PASSWORD
if [[ $# -gt 0 ]]; then
# exit, if script is called with params
ANSUSER=$NOTADDUSER
fi
continue continue
else else
$DIR/deluser.sh $LOGIN $DIR/deluser.sh $LOGIN
@ -52,14 +56,14 @@ do
echo -e "$LOGIN\t *\t $PASSWORD\t *" >> $CHAPSECRETS echo -e "$LOGIN\t *\t $PASSWORD\t *" >> $CHAPSECRETS
if [ $DELETED -eq 0 ]; then if [ $DELETED -eq 0 ]; then
echo "$CHAPSECRETS updated!" echo "$CHAPSECRETS has been updated!"
fi fi
PSK=$(sed -n "s/^[^#]\+[[:space:]]\+PSK[[:space:]]\+\"\(.\+\)\"/\1/p" $SECRETSFILE) PSK=$(sed -n "s/^[^#]\+[[:space:]]\+PSK[[:space:]]\+\"\(.\+\)\"/\1/p" $SECRETSFILE)
STARTDIR=$(pwd) STARTDIR=$(pwd)
mkdir "$STARTDIR/$LOGIN" mkdir -p "$STARTDIR/$LOGIN"
DISTFILE=$STARTDIR/$LOGIN/setup.sh DISTFILE=$STARTDIR/$LOGIN/setup.sh
cp -rf setup.sh.dist "$DISTFILE" cp -rf setup.sh.dist "$DISTFILE"
sed -i -e "s@_PSK_@$PSK@g" "$DISTFILE" sed -i -e "s@_PSK_@$PSK@g" "$DISTFILE"
@ -89,14 +93,14 @@ do
USERNAME=${SUDO_USER:-$USER} USERNAME=${SUDO_USER:-$USER}
chown -R $USERNAME:$USERNAME $STARTDIR/$LOGIN/ chown -R $USERNAME:$USERNAME $STARTDIR/$LOGIN/
echo echo
echo "Created directory $STARTDIR/$LOGIN with client-side installation file." echo "Directory $STARTDIR/$LOGIN with client-side installation script has been created."
if [[ $# -eq 0 ]]; then if [[ $# -eq 0 ]]; then
echo echo
read -p "Would you want add another user? [no] " ANSUSER read -p "Would you want to add another user? [no] " ANSUSER
: ${ANSUSER:=$ADDUSER} : ${ANSUSER:=$NOTADDUSER}
else else
ANSUSER=$ADDUSER ANSUSER=$NOTADDUSER
fi fi
done done

21
openvpn/adduser.sh
View File

@ -13,11 +13,15 @@ fi
cd $CADIR cd $CADIR
source ./vars source ./vars
ADDUSER="no" NOTADDUSER="no"
ANSUSER="yes" ANSUSER="yes"
while [ "$ANSUSER" != "$ADDUSER" ]; while [ "$ANSUSER" != "$NOTADDUSER" ];
do do
if [[ $# -gt 0 ]]; then
LOGIN="$1"
fi
while [[ -z "$LOGIN" ]]; while [[ -z "$LOGIN" ]];
do do
read -p "Enter name: " LOGIN read -p "Enter name: " LOGIN
@ -28,7 +32,7 @@ do
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
# copy files and OVPN config # copy files and OVPN config
mkdir "$STARTDIR/$LOGIN" mkdir -p "$STARTDIR/$LOGIN"
cp $CADIR/keys/ca.crt $CADIR/keys/$LOGIN.key $CADIR/keys/$LOGIN.crt ta.key "$STARTDIR/$LOGIN/" cp $CADIR/keys/ca.crt $CADIR/keys/$LOGIN.key $CADIR/keys/$LOGIN.crt ta.key "$STARTDIR/$LOGIN/"
DIST="$STARTDIR/$LOGIN/openvpn-server.ovpn" DIST="$STARTDIR/$LOGIN/openvpn-server.ovpn"
@ -58,13 +62,18 @@ do
echo "</tls-auth>" >> $DIST echo "</tls-auth>" >> $DIST
echo echo
echo "Created directory $STARTDIR/$LOGIN with necessary files." echo "Directory $STARTDIR/$LOGIN with necessary files has been created."
USERNAME=${SUDO_USER:-$USER} USERNAME=${SUDO_USER:-$USER}
chown -R $USERNAME:$USERNAME $STARTDIR/$LOGIN/ chown -R $USERNAME:$USERNAME $STARTDIR/$LOGIN/
fi fi
read -p "Would you want add another user? [no] " ANSUSER if [[ $# -eq 0 ]]; then
: ${ANSUSER:=$ADDUSER} echo
read -p "Would you want to add another user? [no] " ANSUSER
: ${ANSUSER:=$NOTADDUSER}
else
ANSUSER=$NOTADDUSER
fi
done done

20
pptp/adduser.sh
View File

@ -8,10 +8,10 @@ if [[ ! -e $CHAPSECRETS ]] || [[ ! -r $CHAPSECRETS ]] || [[ ! -w $CHAPSECRETS ]]
exit 1 exit 1
fi fi
ADDUSER="no" NOTADDUSER="no"
ANSUSER="yes" ANSUSER="yes"
while [ "$ANSUSER" != "$ADDUSER" ]; while [ "$ANSUSER" != "$NOTADDUSER" ];
do do
if [[ $# -gt 0 ]]; then if [[ $# -gt 0 ]]; then
@ -42,6 +42,10 @@ do
if [ "$NOTREM" == "$ANSREM" ]; then if [ "$NOTREM" == "$ANSREM" ]; then
unset LOGIN PASSWORD unset LOGIN PASSWORD
if [[ $# -gt 0 ]]; then
# exit, if script is called with params
ANSUSER=$NOTADDUSER
fi
continue continue
else else
$DIR/deluser.sh $LOGIN $DIR/deluser.sh $LOGIN
@ -52,12 +56,12 @@ do
echo -e "$LOGIN\t *\t $PASSWORD\t *" >> $CHAPSECRETS echo -e "$LOGIN\t *\t $PASSWORD\t *" >> $CHAPSECRETS
if [ $DELETED -eq 0 ]; then if [ $DELETED -eq 0 ]; then
echo "$CHAPSECRETS updated!" echo "$CHAPSECRETS has been updated!"
fi fi
STARTDIR=$(pwd) STARTDIR=$(pwd)
mkdir "$STARTDIR/$LOGIN" mkdir -p "$STARTDIR/$LOGIN"
DISTFILE=$STARTDIR/$LOGIN/setup.sh DISTFILE=$STARTDIR/$LOGIN/setup.sh
cp -rf setup.sh.dist "$DISTFILE" cp -rf setup.sh.dist "$DISTFILE"
sed -i -e "s@_LOGIN_@$LOGIN@g" "$DISTFILE" sed -i -e "s@_LOGIN_@$LOGIN@g" "$DISTFILE"
@ -68,13 +72,13 @@ do
USERNAME=${SUDO_USER:-$USER} USERNAME=${SUDO_USER:-$USER}
chown -R $USERNAME:$USERNAME $STARTDIR/$LOGIN/ chown -R $USERNAME:$USERNAME $STARTDIR/$LOGIN/
echo echo
echo "Created directory $STARTDIR/$LOGIN with client-side installation file." echo "Directory $STARTDIR/$LOGIN with client-side installation script has been created."
if [[ $# -eq 0 ]]; then if [[ $# -eq 0 ]]; then
echo echo
read -p "Would you want add another user? [no] " ANSUSER read -p "Would you want to add another user? [no] " ANSUSER
: ${ANSUSER:=$ADDUSER} : ${ANSUSER:=$NOTADDUSER}
else else
ANSUSER=$ADDUSER ANSUSER=$NOTADDUSER
fi fi
done done