diff --git a/index.sh b/index.sh index e73eb1c..88816ea 100644 --- a/index.sh +++ b/index.sh @@ -7,12 +7,19 @@ echo "" echo " - -Simple OpenVPN Server + + + vpn.wberu.be + + -" - -echo "

Simple OpenVPN Server

" + +
+
+

vpn.wberu.be

+
Service de tunnel OpenVPN
+
+
" eval `echo "${QUERY_STRING}"|tr '&' ';'` @@ -20,7 +27,14 @@ IP=$(wget -4qO- "http://whatismyip.akamai.com/") newclient () { # Generates the custom client.ovpn - cp /etc/openvpn/client-common.txt /etc/openvpn/clients/$1.ovpn + case $2 in + "webaccess") + cp /etc/openvpn/client-webaccess.txt /etc/openvpn/clients/$1.ovpn + ;; + "telephony") + cp /etc/openvpn/client-telephony.txt /etc/openvpn/clients/$1.ovpn + ;; + esac echo "" >> /etc/openvpn/clients/$1.ovpn cat /etc/openvpn/easy-rsa/pki/ca.crt >> /etc/openvpn/clients/$1.ovpn echo "" >> /etc/openvpn/clients/$1.ovpn @@ -41,42 +55,49 @@ case $option in "add") #Add a client ./easyrsa build-client-full $client nopass # Generates the custom client.ovpn - newclient "$client" - echo "

Certificate for client $client added.

" + newclient "$client" "$type" + echo " Le certificat du client $client a été ajouté.

" ;; "revoke") #Revoke a client - echo "" - ./easyrsa --batch revoke $client - ./easyrsa gen-crl - echo "" + ./easyrsa --batch revoke $client > /dev/null + ./easyrsa gen-crl > /dev/null rm -rf pki/reqs/$client.req rm -rf pki/private/$client.key rm -rf pki/issued/$client.crt rm -rf /etc/openvpn/crl.pem cp /etc/openvpn/easy-rsa/pki/crl.pem /etc/openvpn/crl.pem # CRL is read with each client connection, when OpenVPN is dropped to nobody - echo "

Certificate for client $client revoked.

" + echo " Le certificat du client $client a été révoqué.

" ;; esac NUMBEROFCLIENTS=$(tail -n +2 /etc/openvpn/easy-rsa/pki/index.txt | grep -c "^V") if [[ "$NUMBEROFCLIENTS" = '0' ]]; then - echo "

You have no existing clients.

" + echo " Vous n'avez pas de clients existants." else while read c; do if [[ $(echo $c | grep -c "^V") = '1' ]]; then clientName=$(echo $c | cut -d '=' -f 2) - echo "

Revoke Download $clientName

" + echo " " + echo " " + echo "  $clientName
" fi done - -New Client: - -" - -echo "" +
+
+ +
Nouveau client:
+ + + +
+

+ +" exit 0