diff --git a/install.sh b/install.sh index 743f643..5d327a9 100755 --- a/install.sh +++ b/install.sh @@ -61,15 +61,17 @@ fi # Get root pass (to create the database and the user) mysql_root_pass="" +mysql_root_user="" status_code=1 while [ $status_code -ne 0 ]; do + read -p "MySQL user root permissions: " -s mysql_root_user; echo read -p "MySQL root password: " -s mysql_root_pass; echo - echo "SHOW DATABASES" | mysql -u root --password="$mysql_root_pass" &> /dev/null + echo "SHOW DATABASES" | mysql -u $mysql_root_user --password="$mysql_root_pass" &> /dev/null status_code=$? done -sql_result=$(echo "SHOW DATABASES" | mysql -u root --password="$mysql_root_pass" | grep -e "^openvpn-admin$") +sql_result=$(echo "SHOW DATABASES" | mysql -u $mysql_root_user --password="$mysql_root_pass" | grep -e "^openvpn-admin$") # Check if the database doesn't already exist if [ "$sql_result" != "" ]; then echo "The openvpn-admin database already exists." @@ -80,7 +82,7 @@ fi # Check if the user doesn't already exist read -p "MySQL user name for OpenVPN-Admin (will be created): " mysql_user -echo "SHOW GRANTS FOR $mysql_user@localhost" | mysql -u root --password="$mysql_root_pass" &> /dev/null +echo "SHOW GRANTS FOR $mysql_user@localhost" | mysql -u $mysql_root_user --password="$mysql_root_pass" &> /dev/null if [ $? -eq 0 ]; then echo "The MySQL user already exists." exit @@ -204,10 +206,10 @@ iptables -t nat -A POSTROUTING -s 10.8.0.2/24 -o $primary_nic -j MASQUERADE printf "\n################## Setup MySQL database ##################\n" -echo "CREATE DATABASE \`openvpn-admin\`" | mysql -u root --password="$mysql_root_pass" -echo "CREATE USER $mysql_user@localhost IDENTIFIED BY '$mysql_pass'" | mysql -u root --password="$mysql_root_pass" -echo "GRANT ALL PRIVILEGES ON \`openvpn-admin\`.* TO $mysql_user@localhost" | mysql -u root --password="$mysql_root_pass" -echo "FLUSH PRIVILEGES" | mysql -u root --password="$mysql_root_pass" +echo "CREATE DATABASE \`openvpn-admin\`" | mysql -u $mysql_root_user --password="$mysql_root_pass" +echo "CREATE USER $mysql_user@localhost IDENTIFIED BY '$mysql_pass'" | mysql -u $mysql_root_user --password="$mysql_root_pass" +echo "GRANT ALL PRIVILEGES ON \`openvpn-admin\`.* TO $mysql_user@localhost" | mysql -u $mysql_root_user --password="$mysql_root_pass" +echo "FLUSH PRIVILEGES" | mysql -u $mysql_root_user --password="$mysql_root_pass" printf "\n################## Setup web application ##################\n" @@ -246,6 +248,9 @@ for file in $(find -name client.ovpn); do fi done +#Replace windows config to old client openVPN +sed -n -e :a -e '1,46!{P;N;D;};N;ba' < ./client-conf/windows/client.ovpn + # Copy ta.key inside the client-conf directory for directory in "./client-conf/gnu-linux/" "./client-conf/osx-viscosity/" "./client-conf/windows/"; do cp "/etc/openvpn/"{ca.crt,ta.key} $directory @@ -259,7 +264,7 @@ printf "\033[1m\n#################################### Finish ################### echo -e "# Congratulations, you have successfully setup OpenVPN-Admin! #\r" echo -e "Please, finish the installation by configuring your web server (Apache, NGinx...)" -echo -e "and install the web application by visiting http://your-installation/index.php?installation\r" +echo -e "and install the web application by visiting http://$ip_server/index.php?installation\r" echo -e "Then, you will be able to run OpenVPN with systemctl start openvpn@server\r" -echo "Please, report any issues here https://github.com/Chocobozzz/OpenVPN-Admin" +echo "Please, report any issues here https://github.com/misterzym/OpenVPN-Admin" printf "\n################################################################################ \033[0m\n"