feat: 新增客户端ccd配置

Author: GavinTan

main.go

@@ -246,6 +246,11 @@ func init() {
 }
 
 func main() {
+	ovData, ok := os.LookupEnv("OVPN_DATA")
+	if !ok {
+		ovData = "/data"
+	}
+
 	ovManage, ok := os.LookupEnv("OVPN_MANAGEMENT")
 	if !ok {
 		ovManage = "127.0.0.1:7505"
@@ -527,10 +532,11 @@ func main() {
 			name := c.PostForm("name")
 			serverAddr := c.PostForm("serverAddr")
 			config := c.PostForm("config")
+			ccdConfig := c.PostForm("ccdConfig")
 
-			_, err := os.Stat(path.Join("clients", fmt.Sprintf("%s.ovpn", name)))
+			_, err := os.Stat(path.Join(ovData, "clients", fmt.Sprintf("%s.ovpn", name)))
 			if err != nil {
-				cmd := exec.Command("sh", "-c", fmt.Sprintf("/usr/bin/docker-entrypoint.sh genclient %s %s %#v", name, serverAddr, config))
+				cmd := exec.Command("sh", "-c", fmt.Sprintf("/usr/bin/docker-entrypoint.sh genclient %s %s %#v %#v", name, serverAddr, config, ccdConfig))
 				if out, err := cmd.CombinedOutput(); err != nil {
 					if out == nil {
 						out = []byte(err.Error())
@@ -560,7 +566,9 @@ func main() {
 				return
 			}
 
-			os.Remove(path.Join("/data/clients", fmt.Sprintf("%s.ovpn", name)))
+			os.Remove(path.Join(ovData, "/clients", fmt.Sprintf("%s.ovpn", name)))
+			os.Remove(path.Join(ovData, "/ccd", name))
+
 			c.JSON(http.StatusOK, gin.H{"message": "删除客户端成功"})
 		})
 

templates/index.tmpl

@@ -503,6 +503,13 @@
                 <input type="text" class="form-control form-control-sm" name="serverAddr" placeholder="VPN服务器外网IP或域名" />
               </div>
             </div>
+            <div class="row mb-2">
+              <label class="col-sm-3 col-form-label">CCD配置:</label>
+              <div class="col-sm-9">
+                <textarea class="form-control form-control-sm" name="ccdConfig" rows="6"
+                  placeholder="ifconfig-push 10.8.0.111 255.255.255.0"></textarea>
+              </div>
+            </div>
             <div class="row">
               <label class="col-sm-3 col-form-label">自定义配置:</label>
               <div class="col-sm-9">
@@ -570,7 +577,7 @@
       <div class="modal-content">
         <form>
           <div class="modal-header">
-            <h5 class="modal-title">更新证书</h5>
+            <h5 class="modal-title">提示</h5>
             <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
           </div>
           <div class="modal-body" style="text-align: center">
@@ -1184,9 +1191,10 @@
           $('#addClientModal input[name="serverAddr"]').val() ||
           location.hostname;
         const config = $('#addClientModal textarea[name="config"]').val();
+        const ccdConfig = $('#addClientModal textarea[name="ccdConfig"]').val();
 
         request
-          .post("/ovpn/client", { name, serverAddr, config })
+          .post("/ovpn/client", { name, serverAddr, config, ccdConfig })
           .then((data) => {
             ctable.ajax.reload(null, false);
             $("#addClientModal form").trigger("reset");