revert: add must staple flag for certificate obtaining request #292

0xJacky · Mar 14, 2024 · 817eee3 · 817eee3
1 parent 1cdd2f9
commit 817eee3
Show file tree

Hide file tree

Showing 8 changed files with 50 additions and 49 deletions.
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/app/.idea/.gitignore b/app/.idea/.gitignore
diff --git a/app/package.json b/app/package.json
@@ -17,8 +17,8 @@
     "@vue/shared": "^3.4.13",
     "@vueuse/core": "^10.7.2",
     "ant-design-vue": "4.1.2",
-    "apexcharts": "^3.45.1",
-    "axios": "^1.6.5",
+    "apexcharts": "^3.46.0",
+    "axios": "^1.6.7",
     "dayjs": "^1.11.10",
     "highlight.js": "^11.9.0",
     "lodash": "^4.17.21",
@@ -33,8 +33,8 @@
     "vue-github-button": "https://github.com/0xJacky/vue-github-button",
     "vue-router": "^4.2.5",
     "vue3-ace-editor": "2.2.4",
-    "vue3-apexcharts": "^1.4.4",
-    "vue3-gettext": "^3.0.0-beta.3",
+    "vue3-apexcharts": "^1.5.2",
+    "vue3-gettext": "^3.0.0-beta.4",
     "vuedraggable": "^4.1.0",
     "xterm": "^5.3.0",
     "xterm-addon-attach": "^0.9.0",

diff --git a/app/pnpm-lock.yaml b/app/pnpm-lock.yaml
diff --git a/app/src/version.json b/app/src/version.json
@@ -1 +1 @@
-{"version":"2.0.0-beta.17","build_id":119,"total_build":323}
+{"version":"2.0.0-beta.18","build_id":120,"total_build":324}
diff --git a/app/version.json b/app/version.json
@@ -1 +1 @@
-{"version":"2.0.0-beta.17","build_id":119,"total_build":323}
+{"version":"2.0.0-beta.18","build_id":120,"total_build":324}
diff --git a/app/vite.config.ts b/app/vite.config.ts
@@ -33,11 +33,7 @@ export default defineConfig(({ mode }) => {
       ],
     },
     plugins: [
-      vue({
-        script: {
-          defineModel: true,
-        },
-      }),
+      vue(),
       vueJsx(),
 
       vitePluginBuildId(),

diff --git a/internal/cert/cert.go b/internal/cert/cert.go
@@ -166,9 +166,8 @@ func IssueCert(payload *ConfigPayload, logChan chan string, errChan chan error)
 	user.Registration = reg
 
 	request := certificate.ObtainRequest{
-		Domains:    domain,
-		Bundle:     true,
-		MustStaple: true,
+		Domains: domain,
+		Bundle:  true,
 	}
 
 	l.Println("[INFO] [Nginx UI] Obtaining certificate")
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"version":"2.0.0-beta.17","build_id":119,"total_build":323}
		{"version":"2.0.0-beta.18","build_id":120,"total_build":324}