fix lint

apache · Dec 4, 2024 · 5e0bf52 · 5e0bf52
1 parent 8e77a77
commit 5e0bf52
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 43 deletions.
diff --git a/apisix/cli/util.lua b/apisix/cli/util.lua
@@ -134,52 +134,52 @@ function _M.file_exists(file_path)
 end
 
 do
-	local trusted_certs_paths = {
-		"/etc/ssl/certs/ca-certificates.crt",                -- Debian/Ubuntu/Gentoo
-		"/etc/pki/tls/certs/ca-bundle.crt",                  -- Fedora/RHEL 6
-		"/etc/ssl/ca-bundle.pem",                            -- OpenSUSE
-		"/etc/pki/tls/cacert.pem",                           -- OpenELEC
-		"/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem", -- CentOS/RHEL 7
-		"/etc/ssl/cert.pem",                                 -- OpenBSD, Alpine
-	}
-
-	-- Check if a file exists using Lua's built-in `io.open`
-	local function file_exists(path)
-		local file = io.open(path, "r")
-		if file then
-			file:close()
-			return true
-		else
-			return false
-		end
-	end
-
-	function _M.get_system_trusted_certs_filepath()
-		for _, path in ipairs(trusted_certs_paths) do
-			if file_exists(path) then
-				return path
-			end
-		end
-
-		return nil,
-			"Could not find trusted certs file in " ..
-			"any of the `system`-predefined locations. " ..
-			"Please install a certs file there or set " ..
-			"`lua_ssl_trusted_certificate` to a " ..
-			"specific file path instead of `system`"
-	end
+    local trusted_certs_paths = {
+        "/etc/ssl/certs/ca-certificates.crt",                -- Debian/Ubuntu/Gentoo
+        "/etc/pki/tls/certs/ca-bundle.crt",                  -- Fedora/RHEL 6
+        "/etc/ssl/ca-bundle.pem",                            -- OpenSUSE
+        "/etc/pki/tls/cacert.pem",                           -- OpenELEC
+        "/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem", -- CentOS/RHEL 7
+        "/etc/ssl/cert.pem",                                 -- OpenBSD, Alpine
+    }
+
+    -- Check if a file exists using Lua's built-in `io.open`
+    local function file_exists(path)
+        local file = io.open(path, "r")
+        if file then
+            file:close()
+            return true
+        else
+            return false
+        end
+    end
+
+    function _M.get_system_trusted_certs_filepath()
+        for _, path in ipairs(trusted_certs_paths) do
+            if file_exists(path) then
+                return path
+            end
+        end
+
+        return nil,
+            "Could not find trusted certs file in " ..
+            "any of the `system`-predefined locations. " ..
+            "Please install a certs file there or set " ..
+            "`lua_ssl_trusted_certificate` to a " ..
+            "specific file path instead of `system`"
+    end
 end
 
 
 function _M.gen_trusted_certs_combined_file(combined_filepath, paths)
-	local combined_file = assert(io.open(combined_filepath, "w"))
-	for _, path in ipairs(paths) do
-		local cert_file = assert(io.open(path, "r"))
-		combined_file:write(cert_file:read("*a"))
-		combined_file:write("\n")
-		cert_file:close()
-	end
-	combined_file:close()
+    local combined_file = assert(io.open(combined_filepath, "w"))
+    for _, path in ipairs(paths) do
+        local cert_file = assert(io.open(path, "r"))
+        combined_file:write(cert_file:read("*a"))
+        combined_file:write("\n")
+        cert_file:close()
+    end
+    combined_file:close()
 end
 
 

diff --git a/conf/config.yaml.example b/conf/config.yaml.example
@@ -100,7 +100,7 @@ apisix:
       #   port: 9445
       #   enable_http3: true
     ssl_trusted_combined_path: /usr/local/apisix/conf/ssl_trusted_combined.pem # All the trusted certificates will be combined into a single file
-    #ssl_trusted_certificate: system              # Specifies comma separated list of trusted CA. Value can be either "system"(for using system available ca certs) or 
+    #ssl_trusted_certificate: system              # Specifies comma separated list of trusted CA. Value can be either "system"(for using system available ca certs) or
                                                 # a file path with trusted CA certificates in the PEM format
     ssl_protocols: TLSv1.2 TLSv1.3                # TLS versions supported.
     ssl_ciphers: ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384