Changes from Devel-Server to master

Author: Wutze

CHANGELOG.md

@@ -1,5 +1,15 @@
 # OpenVPN-WebAdmin Version History
 
+## 1.4.2
+
+Sorry, only new installation. The version with the updates from 1.4.0 to currently 1.4.2 will only be available with 1.5.0.
+
+- Display OpenVPN-Server Version in the overview
+- The OpenVPN server is now installed directly by the maintainer Openvpn. The update cycles of the respective distributions simply take too long. Security comes first.
+- Update nodejs 10 auf 12
+- added Spanish lang (es_ES) in web frontend/installation (Many thanks to @victorhck)
+- Changes in the installation procedure
+
 ## 1.4.1
 
 - Installation script completely rebuilt

README.md

@@ -1,4 +1,4 @@
-# OpenVPN WebAdmin 1.4.1
+# OpenVPN WebAdmin 1.4.2
 
 You lock your front door. But why do you leave the back entrances open? This is the same with almost all Internet accesses to your IoT, webcams and other devices.
 
@@ -77,6 +77,7 @@ Without deactivated firewall the installation will not be completed. Only those
 * curl
 * git
 * net-tools (for the includes simple firewall)
+* gnupg
 
 ## Note MySQL
 
@@ -86,7 +87,7 @@ For a local installation of a MySQL server, you will automatically be asked to e
 
 ## Tested on
 
-* Debian 10/Buster, PHP 7.2.x, 10.3.22-MariaDB.
+* Debian 10/Buster, PHP 7.3.x, 10.3.22-MariaDB.
 * RaspberryPi 4 with Debian Buster
 * CentOS 8
 

install.sh

@@ -14,7 +14,7 @@
 # @copyright  2020 OpenVPN-WebAdmin
 # @link       https://github.com/Wutze/OpenVPN-WebAdmin
 # @see        Internal Documentation ~/doc/
-# @version    1.4.1
+# @version    1.4.2
 # @todo       new issues report here please https://github.com/Wutze/OpenVPN-WebAdmin/issues
 
 
@@ -285,13 +285,32 @@ check_config(){
   message_print_out 1 "read install-config"
 }
 
+#
+# Security updates come in too late from the distributions.
+# Therefore, the openvpn repo will be used from now on.
+# @callfrom function collect_param_install_programs
+#
+set_openvpn_repo(){
+  message_print_out i "set openvpn repo"
+  if [ "${OS}" == "debian" ]; then
+    apt-get update && apt-get -y install ca-certificates wget net-tools gnupg >> ${CURRENT_PATH}/loginstall.log
+    wget -O - https://swupdate.openvpn.net/repos/repo-public.gpg | apt-key add -
+    echo "deb http://build.openvpn.net/debian/openvpn/stable/ ${CODENAME} main" > /etc/apt/sources.list.d/openvpn-as-repo.list
+    apt-get update >> ${CURRENT_PATH}/loginstall.log
+  elif [ "${OS}" == "centos" ]; then
+    yum copr enable dsommers/openvpn-git >> ${CURRENT_PATH}/loginstall.log
+  fi
+  message_print_out 1 "set openvpn repo ${OS}"
+}
+
 #
 # you need this programs
 # Here it is defined which operating system needs which programs
 # @callfrom function do_select_start_install
 # @pos017
 #
 collect_param_install_programs(){
+  set_openvpn_repo
   message_print_out i "collect install programms"
   if [ "${OS}" == "debian" ]; then
     autoinstall="openvpn php-mysql php-zip php unzip git wget sed curl git net-tools nodejs"

installation/functions.sh

@@ -187,16 +187,15 @@ check_user(){
 # @pos012
 #
 set_os_version(){
-  if [[ -e /etc/debian_version ]]; then
-    OS="debian"
-    OSVERSION=$(grep -oE '[0-9]+' /etc/debian_version | head -1)
-    message_print_out i "Install on:  ${OS} ${OSVERSION}"
+  if [[ -e /etc/os-release ]]; then
+    OS=$(grep "\bID\b" /etc/os-release | cut -d '=' -f2 | tr -d '"')
+    OSVERSION=$(grep "\bVERSION_ID\b" /etc/os-release | cut -d '=' -f2 | tr -d '"')
+    CODENAME=$(grep "\bVERSION_CODENAME\b" /etc/os-release | cut -d '=' -f2 | tr -d '"')
+    message_print_out i "Install on:  ${OS} ${CODENAME}"
     # Fix Debian 10 Fehler
-    export PATH=$PATH:/usr/sbin:/sbin
-  elif [[ -e /etc/centos-release ]]; then
-    OS="centos"
-    OSVERSION=$(grep -oE '[0-9]+' /etc/centos-release | head -1)
-    message_print_out i "Install on:  ${OS} ${OSVERSION}"
+    if [ ${OS} = 'debian' ]; then
+      export PATH=$PATH:/usr/sbin:/sbin
+    fi
   else
     message_print_out 0 "No suitable operating system found, sorry"
     message_print_out 0 ${BREAK}

wwwroot/include/html/modules/admin/admin-sysoverview.php

@@ -15,7 +15,7 @@
  * @copyright 2020 OpenVPN-WebAdmin
  * @link			https://github.com/Wutze/OpenVPN-WebAdmin
  * @see				Internal Documentation ~/doc/
- * @version		1.2.0
+ * @version		1.4.2
  * @todo			new issues report here please https://github.com/Wutze/OpenVPN-WebAdmin/issues
  */
 
@@ -34,6 +34,8 @@
 preg_match_all('/^(NAME=|VERSION=)"([0-9a-zA-Z\/\.\s\(\)]*)"/m', shell_exec("cat /etc/os-release"), $matches, PREG_SET_ORDER, 0);
 $stat['osversion'] = $matches[1][2];
 $stat['osname'] = $matches[0][2];
+preg_match_all('/^OpenVPN[0-9\.\s\_\-a-z]*/m', shell_exec("openvpn --version"), $matches, PREG_SET_ORDER, 0);
+$stat['ovpnversion'] = $matches[0][0];
 
 if(file_exists(REAL_BASE_DIR.'/dev/dev.version.php') and defined('preview')){
   include_once(REAL_BASE_DIR.'/dev/dev.version.php');
@@ -116,6 +118,9 @@
                     <li class="list-group-item">
                       <b>Version:</b> <a class="float-right"><?php echo $stat['osversion']; ?></a>
                     </li>
+                    <li class="list-group-item">
+                      <b>OpenVPN Version:</b> <a class="float-right"><?php echo $stat['ovpnversion']; ?></a>
+                    </li>
                     <li class="list-group-item">
                       <b>PHP:</b> <a class="float-right"><?php echo phpversion(); ?></a>
                     </li>