first version of re6st master software release

software/re6stnet/apache.conf.in

+LoadModule unixd_module modules/mod_unixd.so
+LoadModule access_compat_module modules/mod_access_compat.so
+LoadModule authz_core_module modules/mod_authz_core.so
+LoadModule authz_host_module modules/mod_authz_host.so
+LoadModule log_config_module modules/mod_log_config.so
+LoadModule setenvif_module modules/mod_setenvif.so
+LoadModule version_module modules/mod_version.so
+LoadModule proxy_module modules/mod_proxy.so
+LoadModule proxy_http_module modules/mod_proxy_http.so
+LoadModule socache_shmcb_module modules/mod_socache_shmcb.so
+LoadModule ssl_module modules/mod_ssl.so
+LoadModule mime_module modules/mod_mime.so
+#LoadModule dav_module modules/mod_dav.so
+#LoadModule dav_fs_module modules/mod_dav_fs.so
+LoadModule negotiation_module modules/mod_negotiation.so
+LoadModule rewrite_module modules/mod_rewrite.so
+LoadModule headers_module modules/mod_headers.so
+
+PidFile "{{ pid_file }}"
+ServerAdmin admin@
+TypesConfig conf/mime.types
+AddType application/x-compress .Z
+AddType application/x-gzip .gz .tgz
+
+ServerTokens Prod
+ServerSignature Off
+TraceEnable Off
+
+ErrorLog "{{ error_log }}"
+# Default apache log format with request time in microsecond at the end
+LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %D" combined
+CustomLog "{{ access_log }}" combined
+
+{% if uri_scheme == 'https'  -%}
+# SSL Configuration
+SSLCertificateFile {{ certificate }}
+SSLCertificateKeyFile {{ key }}
+SSLRandomSeed startup builtin
+SSLRandomSeed connect builtin
+SSLProtocol ALL -SSLv2
+{% endif -%}
+
+<Directory />
+  Options FollowSymLinks
+  AllowOverride None
+  Allow from all
+</Directory>
+
+Listen {{ ipv6 }}:{{ apache_port }}
+<VirtualHost *:{{ apache_port }}>
+{% if uri_scheme == 'https'  -%}
+  SSLEngine On
+  SSLProxyEngine On
+{% endif -%}
+
+  ProxyPass / {{ uri_scheme }}://{{ re6st_ipv4 }}:{{ re6st_port }}/
+</VirtualHost>
\ No newline at end of file

software/re6stnet/instance-logrotate-base.cfg.in

+[buildout]
+parts =
+  cron-entry-logrotate
+
+[cron]
+recipe = slapos.cookbook:cron
+cron-entries = ${logrotate-directory:cron-entries}
+dcrond-binary = {{ dcron_location }}/sbin/crond
+crontabs = ${logrotate-directory:crontabs}
+cronstamps = ${logrotate-directory:cronstamps}
+catcher = ${cron-simplelogger:wrapper}
+binary = ${logrotate-directory:services}/crond
+
+[cron-simplelogger]
+recipe = slapos.cookbook:simplelogger
+wrapper = ${logrotate-directory:bin}/cron_simplelogger
+log = ${logrotate-directory:log}/cron.log
+
+[logrotate]
+recipe = slapos.cookbook:logrotate
+logrotate-entries = ${logrotate-directory:logrotate-entries}
+backup = ${logrotate-directory:logrotate-backup}
+logrotate-binary = {{ logrotate_location }}/usr/sbin/logrotate
+gzip-binary = {{ gzip_location }}/bin/gzip
+gunzip-binary = {{ gzip_location }}/bin/gunzip
+wrapper = ${logrotate-directory:bin}/logrotate
+conf = ${logrotate-directory:etc}/logrotate.conf
+state-file = ${logrotate-directory:srv}/logrotate.status
+
+[cron-entry-logrotate]
+recipe = slapos.cookbook:cron.d
+cron-entries = ${cron:cron-entries}
+name = logrotate
+frequency = 0 0 * * *
+command = ${logrotate:wrapper}
+
+[logrotate-directory]
+recipe = slapos.cookbook:mkdirectory
+cron-entries = ${:etc}/cron.d
+cronstamps = ${:etc}/cronstamps
+crontabs = ${:etc}/crontabs
+logrotate-backup = ${:backup}/logrotate
+logrotate-entries = ${:etc}/logrotate.d
+bin = ${buildout:directory}/bin
+srv = ${buildout:directory}/srv
+backup = ${:srv}/backup
+etc = ${buildout:directory}/etc
+services = ${:etc}/service
+log = ${buildout:directory}/var/log
+

software/re6stnet/instance-re6stnet-input-schema.json

+{
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "properties": {
+        "ipv6-prefix": {
+            "title": "Ipv6 prefix to use to setup the new re6st network",
+            "description": "Prefix ipv6 used by re6st to setup network. It is something like 2001:db8:42::/48",
+            "type": "string"
+        },
+        "key-size": {
+            "title": "Number of bit to use for certificate generation",
+            "description": "Specify the size of certificate generated by re6st. by default, generate 2048-bit key length",
+            "type": "integer",
+            "minimum": 1024,
+            "default": 2048
+        }
+    }
+}
\ No newline at end of file

software/re6stnet/instance-re6stnet-output-schema.json

+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "description": "Values returned by Re6st Master instanciation",
+  "properties": {
+    "re6stry-url": {
+      "description": "ipv6 url to access your re6st registry service",
+      "type": "string"
+    }
+  },
+  "type": "object"
+}
\ No newline at end of file

software/re6stnet/instance-re6stnet.cfg.in

+
+{% set python_bin = parameter_dict['python-executable'] -%}
+{% set re6st_registry = parameter_dict['re6st-registry'] -%}
+{% set publish_dict = {} -%}
+{% set part_list = [] -%}
+{% set ipv6 = (ipv6_set | list)[0] -%}
+{% set ipv4 = (ipv4_set | list)[0] -%}
+{% set uri_scheme = slapparameter_dict.get('uri-scheme', 'http') -%}
+{% macro section(name) %}{% do part_list.append(name) %}{{ name }}{% endmacro -%}
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+bin = ${buildout:directory}/bin
+etc = ${buildout:directory}/etc
+srv = ${buildout:directory}/srv
+var = ${buildout:directory}/var
+log = ${:var}/log
+services = ${:etc}/service
+script = ${:etc}/run
+promises = ${:etc}/promise
+run = ${:var}/run
+ca-dir = ${:etc}/ssl
+requests = ${:ca-dir}/requests
+private = ${:ca-dir}/private
+certs = ${:ca-dir}/certs
+newcerts = ${:ca-dir}/newcerts
+crl = ${:ca-dir}/crl
+re6st = ${:srv}/res6stnet
+
+[re6stnet-dirs]
+recipe = slapos.cookbook:mkdirectory
+registry = ${directory:re6st}/registry
+log = ${directory:log}/re6stnet
+conf = ${directory:etc}/re6stnet
+ssl = ${:conf}/ssl
+token = ${:conf}/token
+
+[certificate-authority]
+recipe = slapos.cookbook:certificate_authority
+openssl-binary = {{ openssl_bin }}/openssl
+ca-dir = ${directory:ca-dir}
+requests-directory = ${directory:requests}
+wrapper = ${directory:services}/certificate_authority
+ca-private = ${directory:private}
+ca-certs = ${directory:certs}
+ca-newcerts = ${directory:newcerts}
+ca-crl = ${directory:crl}
+
+
+[apache-conf]
+recipe = slapos.recipe.template:jinja2
+template = {{ parameter_dict['template-apache-conf'] }}
+rendered = ${directory:etc}/apache.conf
+ipv6 = {{ ipv6 }}
+port = 9026
+error-log = ${directory:log}/apache-error.log
+access-log = ${directory:log}/apache-access.log
+pid-file = ${directory:run}/apache.pid
+context = 
+  key apache_port :port
+  key re6st_ipv4 re6st-registry:ipv4
+  key re6st_port re6st-registry:port
+  key access_log :access-log
+  key error_log :error-log
+  key pid_file :pid-file
+  raw certificate ${directory:certs}/apache.crt
+  raw key ${directory:private}/apache.key
+  raw ipv6 {{ ipv6 }}
+  raw uri_scheme {{ uri_scheme }}
+
+{% set apache_wrapper = '${directory:services}/httpd' -%}
+{% if uri_scheme == 'https' -%}
+{% set apache_wrapper = '${directory:bin}/httpd_raw' -%}
+{% endif -%}
+[apache-httpd]
+recipe = slapos.cookbook:wrapper
+wrapper-path = {{ apache_wrapper }}
+command-line = "{{ parameter_dict['apache-location'] }}/bin/httpd" -f "${apache-conf:rendered}" -DFOREGROUND
+
+{% if uri_scheme == 'https' %}
+[{{ section('apache-ca') }}]
+<= certificate-authority
+recipe = slapos.cookbook:certificate_authority.request
+executable = ${apache-httpd:wrapper-path}
+wrapper = ${directory:services}/httpd
+key-file = ${certificate-authority:ca-private}/apache.key
+cert-file = ${certificate-authority:ca-certs}/apache.crt
+{% endif %}
+
+[logrotate-apache]
+< = logrotate-entry-base
+name = apache
+log = ${apache-conf:error-log} ${apache-conf:access-log}
+post = {{ parameter_dict['bin-directory'] }}/slapos-kill --pidfile ${apache-conf:pid-file} -s USR1
+
+[logrotate-entry-base]
+recipe = slapos.cookbook:logrotate.d
+logrotate-entries = ${logrotate:logrotate-entries}
+backup = ${logrotate:backup}
+
+[re6st-registry-conf-dict]
+port = 9201
+ipv4 = {{ ipv4 }}
+ipv6 = {{ ipv6 }}
+db = ${re6stnet-dirs:registry}/registry.db
+ca = ${re6stnet-dirs:ssl}/re6stnet.crt
+key = ${re6stnet-dirs:ssl}/re6stnet.key
+mailhost = 127.0.0.1
+prefix-length = 16
+anonymous-prefix-length = 32
+logfile = ${re6stnet-dirs:log}/registry.log
+verbose = 2
+
+[re6st-registry-conf]
+recipe = slapos.recipe.template:jinja2
+template = {{ parameter_dict['template-re6st-registry-conf'] }}
+rendered = ${directory:etc}/re6st-registry.conf
+context = section parameter_dict re6st-registry-conf-dict
+
+[re6st-registry]
+recipe = slapos.cookbook:re6stnet.registry
+port = ${re6st-registry-conf-dict:port}
+ipv4 = ${re6st-registry-conf-dict:ipv4}
+command = {{ re6st_registry }}
+config-file = ${re6st-registry-conf:rendered}
+db-path = ${re6st-registry-conf-dict:db}
+wrapper = ${directory:services}/re6st-registry
+manager-wrapper = ${directory:bin}/re6stManageToken
+check-service-wrapper = ${directory:bin}/re6stCheckService
+drop-service-wrapper = ${directory:bin}/re6stManageDeleteToken
+key-file = ${re6st-registry-conf-dict:key}
+cert-file = ${re6st-registry-conf-dict:ca}
+openssl-bin = {{ openssl_bin }}/openssl
+python-bin = {{ python_bin }}
+ipv6-prefix = {{ slapparameter_dict.get('ipv6-prefix', '2001:db8:24::/48') }}
+key-size = {{ slapparameter_dict.get('key-size', 2048) }}
+conf-dir = ${re6stnet-dirs:conf}
+token-dir = ${re6stnet-dirs:token}
+
+slave-instance-list = ${slap-parameter:slave_instance_list}
+
+environment = 
+  PATH={{ openssl_bin }}
+
+[re6stnet-manage]
+recipe = slapos.cookbook:wrapper
+wrapper-path = ${directory:script}/re6st-token-manager
+command-line = "{{ python_bin }}" ${re6st-registry:manager-wrapper}
+
+[cron-entry-re6st-check]
+recipe = slapos.cookbook:cron.d
+cron-entries = ${cron:cron-entries}
+name = re6stnet-check-token
+frequency = 0 */1 * * *
+command = {{ python_bin }} ${re6st-registry:check-service-wrapper}
+
+[cron-entry-re6st-drop]
+recipe = slapos.cookbook:cron.d
+cron-entries = ${cron:cron-entries}
+name = re6stnet-drop-token
+frequency = */30 * * * *
+command = {{ python_bin }} ${re6st-registry:drop-service-wrapper}
+
+[logrotate-entry-re6stnet]
+< = logrotate-entry-base
+name = re6stnet
+log = ${re6st-registry-conf-dict:logfile}
+
+[re6st-registry-promise]
+recipe = slapos.cookbook:check_port_listening
+path = ${directory:promises}/re6st-registry
+hostname = ${re6st-registry:ipv4}
+port = ${re6st-registry:port}
+
+[apache-registry-promise]
+recipe = slapos.cookbook:check_port_listening
+path = ${directory:promises}/apache-re6st-registry
+hostname = ${apache-conf:ipv6}
+port = ${apache-conf:port}
+
+{% do publish_dict.__setitem__('re6stry-url', uri_scheme ~ '://[${apache-conf:ipv6}]:${apache-conf:port}') -%}
+[publish]
+recipe = slapos.cookbook:publish
+{% for name, value in publish_dict.items() -%}
+{{   name }} = {{ value }}
+{% endfor -%}
+
+[buildout]
+extends =
+  {{ logrotate_cfg }}
+
+parts = 
+  certificate-authority
+  logrotate-apache
+  logrotate-entry-re6stnet
+  re6stnet-manage
+  cron-entry-logrotate
+  cron-entry-re6st-check
+  cron-entry-re6st-drop
+  apache-httpd
+  publish
+  
+  re6st-registry-promise
+  apache-registry-promise
+# Complete parts with sections
+  {{ part_list | join('\n  ') }}
+
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
+offline = true
+
+[slap-parameter]
+slave_instance_list = {}
+

software/re6stnet/instance.cfg.in

+[buildout]
+parts = switch-softwaretype
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
+
+[slap-configuration]
+recipe = slapos.cookbook:slapconfiguration.serialised
+computer = ${slap-connection:computer-id}
+partition = ${slap-connection:partition-id}
+url = ${slap-connection:server-url}
+key = ${slap-connection:key-file}
+cert = ${slap-connection:cert-file}
+
+[jinja2-template-base]
+recipe = slapos.recipe.template:jinja2
+rendered = ${buildout:parts-directory}/${:_buildout_section_name_}/${:filename}
+extra-context =
+context =
+    key develop_eggs_directory buildout:develop-eggs-directory
+    key eggs_directory buildout:eggs-directory
+    key ipv6_set slap-configuration:ipv6
+    key ipv4_set slap-configuration:ipv4
+    key slapparameter_dict slap-configuration:configuration
+    key computer_id slap-configuration:computer
+    raw logrotate_cfg {{ template_logrotate_base }}
+    raw dash_binary {{ dash_location }}/bin/dash
+    raw openssl_bin {{ openssl_location}}/bin
+    ${:extra-context}
+
+[dynamic-template-re6stnet-parameters]
+bin-directory = {{ bin_directory }}
+python-executable  = {{ python_with_eggs }}
+re6st-registry = {{ re6stnet_registry }}
+template-apache-conf = {{ template_apache_conf }}
+apache-location = {{ apache_location }}
+template-re6st-registry-conf = {{ template_re6st_registry_conf }}
+
+[dynamic-template-re6stnet]
+< = jinja2-template-base
+template = {{ template_re6stnet }}
+filename = instance-re6stnet.cfg
+extensions = jinja2.ext.do
+extra-context =
+    section parameter_dict dynamic-template-re6stnet-parameters
+
+[switch-softwaretype]
+recipe = slapos.cookbook:softwaretype
+
+default = ${dynamic-template-re6stnet:rendered}
+registry = ${:default}

software/re6stnet/re6st-registry.conf.in

+port  {{ parameter_dict['port'] }}
+4  {{ parameter_dict['ipv4'] }}
+6  {{ parameter_dict['ipv6'] }}
+db  {{ parameter_dict['db'] }}
+ca  {{ parameter_dict['ca'] }}
+key  {{ parameter_dict['key'] }}
+mailhost {{ parameter_dict['mailhost'] }}
+prefix-length  {{ parameter_dict['prefix-length'] }}
+anonymous-prefix-length  {{ parameter_dict['anonymous-prefix-length'] }}
+logfile  {{ parameter_dict['logfile'] }}
+verbose  {{ parameter_dict['verbose'] }}
\ No newline at end of file

software/re6stnet/software.cfg

+[buildout]
+
+extends =
+  ../../component/re6stnet/buildout.cfg
+  ../../component/dash/buildout.cfg
+  ../../component/git/buildout.cfg
+  ../../component/dcron/buildout.cfg
+  ../../component/gzip/buildout.cfg
+  ../../component/openssl/buildout.cfg
+  ../../component/logrotate/buildout.cfg
+  ../../component/apache/buildout.cfg
+  ../../stack/slapos.cfg
+
+develop = 
+  ${:parts-directory}/re6stnet-repository
+  ${:parts-directory}/slapos.cookbook-repository
+
+parts = 
+  slapos-cookbook
+  eggs
+  dash
+  babeld
+  re6stnet-develop
+  re6stnet
+  template
+  slapos.cookbook-repository
+  check-recipe
+
+[eggs]
+recipe = zc.recipe.egg
+eggs =
+  ${lxml-python:egg}
+  slapos.toolbox
+scripts =
+  slapos-kill
+
+[extra-eggs]
+recipe = zc.recipe.egg
+interpreter = pythonwitheggs
+eggs =
+  ${lxml-python:egg}
+  ${python-cffi:egg}
+  ${python-cryptography:egg}
+  pyOpenSSL
+  miniupnpc
+  re6stnet
+
+[re6stnet-repository]
+repository = http://git.erp5.org/repos/re6stnet.git
+branch = re6st-slapos
+
+[slapos.cookbook-repository]
+recipe = slapos.recipe.build:gitclone
+repository = http://git.erp5.org/repos/slapos.git
+branch = re6st-master
+git-executable = ${git:location}/bin/git
+
+[download-base]
+recipe = slapos.recipe.build:download
+url = ${:_profile_base_location_}/${:filename}
+mode = 644
+
+[template-jinja2-base]
+recipe = slapos.recipe.template:jinja2
+template = ${:_profile_base_location_}/${:filename}.in
+rendered = ${buildout:directory}/${:filename}
+# XXX: extra-context is needed because we cannot append to a key of an extended
+# section.
+extra-context =
+context =
+    key bin_directory buildout:bin-directory
+    key develop_eggs_directory buildout:develop-eggs-directory
+    key eggs_directory buildout:eggs-directory
+    ${:extra-context}
+
+
+[template]
+< = template-jinja2-base
+filename = template.cfg
+template = ${:_profile_base_location_}/instance.cfg.in
+md5sum = 0929cf851c4883bcb5c69fc2f918eaeb
+extra-context =
+    key apache_location apache:location
+    key dash_location dash:location
+    key logrotate_location logrotate:location
+    key openssl_location openssl:location
+    key template_apache_conf template-apache-conf:target
+    key template_re6stnet template-re6stnet:target
+    key template_re6st_registry_conf template-re6st-registry-conf:target
+    key template_logrotate_base template-logrotate-base:rendered
+    raw python_with_eggs ${buildout:directory}/bin/${extra-eggs:interpreter}
+    raw re6stnet_registry ${buildout:directory}/bin/re6st-registry
+
+[template-re6stnet]
+< = download-base
+filename = instance-re6stnet.cfg.in
+md5sum = e088fb05ea6e1ceff8a5ac00fd28bd75
+
+[template-logrotate-base]
+< = template-jinja2-base
+filename = instance-logrotate-base.cfg
+md5sum = f28fbd310944f321ccb34b2a34c82005
+extra-context =
+    key dcron_location dcron:location
+    key gzip_location gzip:location
+    key logrotate_location logrotate:location
+
+[template-apache-conf]
+< = download-base
+filename = apache.conf.in
+md5sum = c220229ee37866c8cc404d602edd389d
+
+[template-re6st-registry-conf]
+< = download-base
+filename = re6st-registry.conf.in
+md5sum = ae910e8e154be6575bb19f6eae686a87
+
+[check-recipe]
+recipe = plone.recipe.command
+stop-on-error = true
+update-command = ${:command}
+command =
+  grep parts ${buildout:develop-eggs-directory}/re6stnet.egg-link
+  grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
+
+[versions]
+apache-libcloud = 0.17.0
+ecdsa = 0.13
+gitdb = 0.6.4
+plone.recipe.command = 1.1
+pycrypto = 2.6.1
+slapos.recipe.template = 2.6
+slapos.toolbox = 0.47.3
+smmap = 0.9.0
+
+# Required by:
+# slapos.toolbox==0.47.3
+GitPython = 0.3.6
+
+# Required by:
+# slapos.toolbox==0.47.3
+atomize = 0.2.0
+
+# Required by:
+# apache-libcloud==0.17.0
+backports.ssl-match-hostname = 3.4.0.2
+
+# Required by:
+# slapos.toolbox==0.47.3
+feedparser = 5.1.3
+
+# Required by:
+# slapos.toolbox==0.47.3
+lockfile = 0.10.2
+
+# Required by:
+# re6stnet===0-413.gbec6b3c.dirty
+miniupnpc = 1.9
+
+# Required by:
+# slapos.toolbox==0.47.3
+paramiko = 1.15.2
+
+# Required by:
+# slapos.toolbox==0.47.3
+rpdb = 0.1.5
+

software/re6stnet/software.cfg.json

+{
+    "name": "RE6STNET",
+    "description": "Master instance of re6st (Resilient, Scalable, IPv6 Network application)",
+    "serialisation": "xml",
+    "software-type": {
+        "default": {
+            "title": "Default",
+            "description": "Re6st registry",
+            "request": "instance-re6stnet-input-schema.json",
+            "response": "instance-re6stnet-output-schema.json",
+            "index": 0
+        },
+        "registry": {
+            "title": "registry",
+            "description": "Re6st registry",
+            "request": "instance-re6stnet-resilient-input-schema.json",
+            "response": "instance-re6stnet-output-schema.json",
+            "index": 1
+        }
+    }
+}
\ No newline at end of file

[Vincent Pelletier]

Dangerous use of raw, use key or section.