Comparison

prosodyctl: Ask about the distinguished name in a in a consistent order

comparison

equal deleted inserted replaced

-:d22416f8a836
+:edc97af48d19
 		end
 		local conf = openssl.config.new();
 		conf:from_prosody(hosts, config, arg);
 		show_message("Please provide details to include in the certificate config file.");
 		show_message("Leave the field empty to use the default value or '.' to exclude the field.")
-		for k, v in pairs(conf.distinguished_name) do
+		for i, k in ipairs(openssl._DN_order) do
-			local nv;
+			local v = conf.distinguished_name[k];
-			if k == "commonName" then
+			if v then
-				v = arg[1]
+				local nv;
-			elseif k == "emailAddress" then
+				if k == "commonName" then
-				v = "xmpp@" .. arg[1];
+					v = arg[1]
-			end
+				elseif k == "emailAddress" then
-			nv = show_prompt(("%s (%s):"):format(k, nv or v));
+					v = "xmpp@" .. arg[1];
-			nv = (not nv or nv == "") and v or nv;
+				end
-			if nv:find"[\192-\252][\128-\191]+" then
+				nv = show_prompt(("%s (%s):"):format(k, nv or v));
-				conf.req.string_mask = "utf8only"
+				nv = (not nv or nv == "") and v or nv;
-			end
+				if nv:find"[\192-\252][\128-\191]+" then
-			conf.distinguished_name[k] = nv ~= "." and nv or nil;
+					conf.req.string_mask = "utf8only"
+				end
+				conf.distinguished_name[k] = nv ~= "." and nv or nil;
+			end
 		end
 		local conf_file = io.open(conf_filename, "w");
 		conf_file:write(conf:serialize());
 		conf_file:close();
 		print("");