Update Release Candidate

CHANGES.txt

 Changes
 =======
 
+1.0.31 (2016-05-30)
+-------------------
+
+  * Implement cross recipe cache for registerComputerPartition
+  * Fixup! workarround for long shebang (place script on bin)  
+
+1.0.30 (2016-05-23)
+-------------------
+
+  * Implement a workarround for long shebang
+  * Implement Validation for user inputs ssl certificates 
+
 1.0.25 (2016-04-15)
 -------------------
- * fixup slap configuration: provide instance and root instance title
+
+  * fixup slap configuration: provide instance and root instance title
 
 1.0.22 (2016-04-01)
 -------------------
- * slap configuration: provide instance and root instance title
+
+  * slap configuration: provide instance and root instance title
 
 1.0.16 (2015-10.27)
 -------------------
- * kvm recipe: fix bugs dowload image and disk creation
+
+  * kvm recipe: fix bugs dowload image and disk creation
 
 1.0.14 (2015-10.26)
+
 -------------------
- * kvm recipe: Allow to set keyboard layout language used by qemu and VNC
- * simplehttpserver-recipe: fix encoding error
+  * kvm recipe: Allow to set keyboard layout language used by qemu and VNC
+  * simplehttpserver-recipe: fix encoding error
 
 0.103 (2015-07-24)
 ------------------
+
   * kvm: fix issues with boolean parameters and add 'qed' in external disk format list.
   * simplehttpserver-recipe: Add support for POST method which only get content and save into specified file.
 
 0.102 (2015-05-22)
 ------------------
+
  * kvm-recipe: vm of kvm-cluster can get ipv4/hostname of all other vm in the same cluster
  * simplehttpserver-recipe: simple http server to serve files
 
 0.101 (2015-04-29)
 ------------------
+
  * kvm recipe: new parameters: external-disk-format, numa and cpu-options.
  * kvm recipe: allow guest VM to connect to host http service via a local predefined ipv4 address (guestfwd).
 
 0.100 (2015-04-20)
 ------------------
+
  * re6stnet recipe: re6st-registry log can now be reopened with SIGUSR1
  * re6stnet recipe: re6st certificate generation is improved.
 
 0.99 (2015-04-10)
 -----------------
+
  * re6stnet: new recipe to deploy re6st registry (re6st master) with slapos.
 
 0.98 (2015-04-09)
 -----------------
+
  * shellinabox: do not run in debug mode, it is much slower !
 
 0.97 (2015-03-26)
 -----------------
+
  * switch softwaretype recipe: the recipe is backward compatible with old slapos node packages.
  * kvm recipe: Avoid getting wrong storage path when creating kvm external disk
 
 0.96 (2015-03-20)
 -----------------
+
  * slap configuration: recipe can read from master network information releated to a tap interface
  * slap configuration: recipe will setup data folder in DATA directory of computer partition if disk is mounted
  * switch softwaretype recipe: also generate tap network information when they exist

setup.py

@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
 import glob
 import os
 
-version = '1.0.31.dev0'
+version = '1.0.31'
 name = 'slapos.cookbook'
 long_description = open("README.txt").read() + "\n" + \
     open("CHANGES.txt").read() + "\n"

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

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",

software/erp5/software.cfg.json

+{
+  "name": "ERP5",
+  "description": "ERP5, Open-Source ERP",
+  "serialisation": "json-in-xml",
+  "software-type": {
+    "default": {
+      "title": "Default",
+      "description": "Default deployment of ERP5 with auto-create instance.",
+      "request": "instance-erp5-input-schema.json",
+      "response": "instance-erp5-output-schema.json",
+      "index": 0
+    },
+    "create-erp5-site": {
+      "title": "Create ERP5 Site", 
+      "description": "Default deployment of ERP5 with automatic creation of the instance.",
+      "request": "instance-erp5-input-schema.json",
+      "response": "instance-erp5-output-schema.json",
+      "index": 1
+    }
+  }
+}

software/slaprunner/common.cfg

@@ -92,7 +92,7 @@ mode = 0644
 [template-resilient]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-resilient.cfg.jinja2
-md5sum = 6373b2cf3c0cee78bd858959976271d3
+md5sum = bf853ab13b564be991b42e74f631023a
 filename = instance-resilient.cfg.jinja2
 mode = 0644
 

software/slaprunner/instance-resilient.cfg.jinja2

@@ -60,6 +60,9 @@ webdav_url = ${request-runner:connection-webdav_url}
 public_url = ${request-runner:connection-public_url}
 git_public_url = ${request-runner:connection-git_public_url}
 git_private_url = ${request-runner:connection-git_private_url}
+{% if slapparameter_dict.get('custom-frontend-backend-url') -%}
+custom-frontend-url = https://${request-custom-frontend:connection-domain}
+{% endif %}
 {% for key in monitor_return -%}
 {{ key }} = ${request-runner:connection-{{ key }}}
 {% endfor -%}

stack/slapos.cfg

@@ -135,7 +135,7 @@ requests = 2.10.0
 setuptools = 19.6.2
 simplejson = 3.8.2
 six = 1.10.0
-slapos.cookbook = 1.0.30
+slapos.cookbook = 1.0.31
 slapos.core = 1.3.15
 slapos.extension.strip = 0.1
 slapos.libnetworkcache = 0.14.5