Merge pull request #27 from d3vilh/dev

v.0.9.1

Author: d3vilh

build/Dockerfile

@@ -3,7 +3,7 @@
 
 FROM DEFINE-YOUR-ARCH
 LABEL maintainer="Mr.Philipp <[email protected]>"
-LABEL version="0.9"
+LABEL version="0.9.1"
 WORKDIR /opt
 EXPOSE 8080/tcp
 

conf/easyrsa-vars.tpl

@@ -11,4 +11,4 @@ set_var EASYRSA_CA_EXPIRE    {{ .EasyRSACaExpire }}
 set_var EASYRSA_CERT_EXPIRE  {{ .EasyRSACertExpire }}
 set_var EASYRSA_CERT_RENEW   {{ .EasyRSACertRenew }}
 set_var EASYRSA_CRL_DAYS     {{ .EasyRSACrlDays }}
-# Auto generated by OpenVPN-UI v.0.9
+# Auto generated by OpenVPN-UI v.0.9.1

conf/openvpn-client-config.tpl

@@ -26,4 +26,4 @@ verb 3
 <tls-crypt>
 {{ .Ta }}
 </tls-crypt>
-# Auto generated by OpenVPN-UI v.0.9
+# Auto generated by OpenVPN-UI v.0.9.1

conf/openvpn-server-config.tpl

@@ -51,4 +51,4 @@ status-version {{ .OVConfigStatusLogVersion }}
 {{ .CustomOptTwo }}
 {{ .CustomOptThree }}
 
-# Auto generated by OpenVPN-UI v.0.9
+# Auto generated by OpenVPN-UI v.0.9.1

controllers/certificates.go

@@ -112,6 +112,9 @@ func (c *CertificatesController) Post() {
 			}
 		}
 	}
+	cfg := models.EasyRSAConfig{Profile: "default"}
+	_ = cfg.Read("Profile")
+	c.Data["EasyRSA"] = &cfg
 	c.showCerts()
 }
 
@@ -168,7 +171,7 @@ func (c *CertificatesController) Renew() {
 		//flash.Error(err.Error())
 		//flash.Store(&c.Controller)
 	} else {
-		flash.Success("Success! Certificate for the name \"" + name + "\"  and \"" + localip + "\" and \"" + serial + "\" has been renewed")
+		flash.Success("Success! Certificate for the name \"" + name + "\"  and IP \"" + localip + "\" and Serial \"" + serial + "\" has been renewed")
 		flash.Store(&c.Controller)
 	}
 	c.showCerts()

docs/images/OpenVPN-UI-Certs-Details-Expire.png

@@ -1,13 +1,15 @@
 package lib
 
 import (
+	"fmt"
 	"runtime"
+	"strconv"
 	"time"
 
 	sigar "github.com/cloudfoundry/gosigar"
 )
 
-//SystemInfo contains basic information about system load
+// SystemInfo contains basic information about system load
 type SystemInfo struct {
 	Memory      sigar.Mem
 	Swap        sigar.Swap
@@ -20,7 +22,7 @@ type SystemInfo struct {
 	CurrentTime time.Time
 }
 
-//GetSystemInfo returns short info about system load
+// GetSystemInfo returns short info about system load
 func GetSystemInfo() SystemInfo {
 	s := SystemInfo{}
 
@@ -33,6 +35,9 @@ func GetSystemInfo() SystemInfo {
 	avg := sigar.LoadAverage{}
 	if err := avg.Get(); err == nil {
 		s.LoadAvg = avg
+		s.LoadAvg.One = formatFloat(s.LoadAvg.One)
+		s.LoadAvg.Five = formatFloat(s.LoadAvg.Five)
+		s.LoadAvg.Fifteen = formatFloat(s.LoadAvg.Fifteen)
 	}
 
 	s.CurrentTime = time.Now()
@@ -57,3 +62,8 @@ func GetSystemInfo() SystemInfo {
 
 	return s
 }
+
+func formatFloat(f float64) float64 {
+	formatted, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", f), 64)
+	return formatted
+}