Merge branch 'master' of github.com:skylime/mi-core-base

Changelog.md

@@ -1,5 +1,19 @@
 # Changelog
 
+# 15.3.0
+
+### New
+
+* Update to new version 15.3.0 [Tobias Schäfer]
+
+  Use new minimal base image from joyent and latest pkgsrc release.
+  Update manifest to new version.
+
+### Fix
+
+* Complete mdata description in manifest JSON file. [Tobias Schäfer]
+* Adapt README. [Tobias Schäfer]
+
 ## 15.1.3
 
 ### New

README.md

@@ -43,3 +43,13 @@ To have cron emails on errors we like to configure postfix as local smtp server.
 - `mail_auth_user`: smtp username for authentication
 - `mail_auth_pass`: smtp password for authentication
 - `mail_adminaddr`: admin email address for everything from root@localhost
+
+### ssh daemon
+
+Configure ssh public and private key pairs for the host daemon via `mdata`.
+
+- `ssh_host_rsa_key`:     private SSH rsa key
+- `ssh_host_rsa_key.pub`: public SSH rsa key
+- `ssh_host_dsa_key`:     private SSH dsa key
+- `ssh_host_dsa_key.pub`: public SSH dsa key
+

customize

@@ -4,7 +4,7 @@ set -o errexit
 
 PATH=/opt/local/gnu/bin:/opt/local/bin:/opt/local/sbin:/usr/bin:/usr/sbin
 
-PKGSRC_VERSION='2015Q1'
+PKGSRC_VERSION='2015Q3'
 
 # Munin plugins
 MUNIN_PLUGIN_VERSION='0.7'

manifest.json

@@ -7,11 +7,18 @@
 	"homepage":     "https://github.com/skylime/mi-core-base",
 	"base":         "fec7e254-6e98-11e5-9284-3f9c607cb3e7",
 	"customer_metadata": {
-		"root_authorized_keys": {"type": "text", "description": "SSH public key(s) for the root user"},
+		"root_authorized_keys": {"type": "text", "description": "SSH public authorized key(s) for the root user"},
+		"root_ssh_rsa":         {"type": "text", "description": "private SSH rsa key for root user"},
+		"root_ssh_rsa_pub":     {"type": "text", "description": "public SSH rsa key for root user (mostly not required)"},
 		"syslog_host":          {"type": "text", "description": "syslog server IP address and port seperated by colon"},
 		"mail_smarthost":       {"type": "text", "description": "hostname of remote smtp server"},
 		"mail_auth_user":       {"type": "text", "description": "smtp username if authentication is required"},
 		"mail_auth_pass":       {"type": "text", "description": "smtp password"},
-		"mail_adminaddr":       {"type": "text", "description": "admin email address alias for all mails to root@localhost"}
+		"mail_adminaddr":       {"type": "text", "description": "admin email address alias for all mails to root@localhost"},
+		"ssh_host_rsa_key":     {"type": "text", "description": "private SSH rsa key for the host daemon"},
+		"ssh_host_rsa_key.pub": {"type": "text", "description": "public SSH rsa key for the host daemon"},
+		"ssh_host_dsa_key":     {"type": "text", "description": "private SSH dsa key for the host daemon"},
+		"ssh_host_dsa_key.pub": {"type": "text", "description": "public SSH dsa key for the host daemon"},
+		"munin_master_allow":   {"type": "text", "description": "ip addresses (alternative hostname) of the munin master node"}
 	}
 }