From cfe0767d3871a61feb29710171804351e6c714a0 Mon Sep 17 00:00:00 2001
From: Rafael Monnerat <rafael@nexedi.com>
Date: Fri, 27 May 2016 16:04:03 +0200
Subject: [PATCH] apache-frontend: Fix json definition.

---
 .../instance-apache-input-schema.json            | 16 +++++++++-------
 .../instance-slave-apache-input-schema.json      |  3 ++-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/software/apache-frontend/instance-apache-input-schema.json b/software/apache-frontend/instance-apache-input-schema.json
index 32e73e74c..036b61168 100644
--- a/software/apache-frontend/instance-apache-input-schema.json
+++ b/software/apache-frontend/instance-apache-input-schema.json
@@ -5,8 +5,8 @@
 	"title": "Input Parameters",
 	"properties": {
 		"public-ipv4": {
-			"title": "Backend URL",
-			"description": "Url of the backend",
+			"title": "Public IPv4",
+			"description": "Public IPv4 that will be provided to Slaves to configure DNS.",
 			"type": "string"
 		},
 		"-frontend-authorized-slave-string": {
@@ -16,30 +16,32 @@
 		},
 		"apache-key": {
 			"title": "Apache Key",
-			"description": "Url of the Backend",
+			"description": "Apache Key",
+                        "textarea": true,
 			"type": "string"
 		},
 		"apache-certificate": {
 			"title": "Apache Certificate",
 			"description": "Apache Certificate",
+                        "textarea": true,
 			"type": "string"
 		},
 		"apache-ca-certificate": {
 			"title": "Apache CA Certificate",
 			"description": "Apache CA Certificate",
+                        "textarea": true,
 			"type": "string"
 		},
 		"domain": {
 			"title": "Domain",
-			"description": "Base Domain for create subdomains.",
+			"description": "Base Domain for create subdomains (ie.: example.com).",
 			"type": "string",
 			"pattern": "^([a-zA-Z0-9]([a-zA-Z0-9\\-]{0,61}[a-zA-Z0-9])?\\.)+[a-zA-Z]{2,6}$"
 		},
 		"-frontend-quantity": {
 			"title": "Frontend Replication Quantity",
 			"description": "Quantity of Frontends Replicate.",
-			"type": "integer",
-			"default": ""
+			"type": "integer"
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/software/apache-frontend/instance-slave-apache-input-schema.json b/software/apache-frontend/instance-slave-apache-input-schema.json
index 94969c433..93eae4eef 100644
--- a/software/apache-frontend/instance-slave-apache-input-schema.json
+++ b/software/apache-frontend/instance-slave-apache-input-schema.json
@@ -7,7 +7,8 @@
     "url": {
       "title": "Backend URL",
       "description": "Url of the backend",
-      "type": "string"
+      "type": "string",
+      "pattern": "^(http|https|ftp)://"
     },
     "custom_domain": {
       "title": "Custom Domain",
-- 
2.30.9