Merge remote-tracking branch 'origin/master' into erp5-component

software/html5ide/instance-html5ide.cfg

+[buildout]
+parts =
+  httpd-launcher
+  httpd-graceful
+  httpd-dav-htaccess
+  httpd-make-dummy-index-html
+  promise-httpd-ipv6
+  publish-connection-information
+
+## Monitoring part
+###Parts to add for monitoring
+  certificate-authority
+  cron-entry-monitor
+  cron-entry-rss
+  deploy-index
+  deploy-settings-cgi
+  deploy-status-cgi
+  deploy-status-history-cgi
+  setup-static-files
+  zero-parameters
+  public-symlink
+  cgi-httpd-wrapper
+  cgi-httpd-graceful-wrapper
+  monitor-promise
+  monitor-instance-log-access
+## Monitor for apache
+
+extends = ${monitor-template:output}
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+# Create all needed directories
+[directory]
+recipe = slapos.cookbook:mkdirectory
+etc = $${buildout:directory}/etc/
+var = $${buildout:directory}/var/
+srv = $${buildout:directory}/srv
+bin = $${buildout:directory}/bin/
+tmp = $${buildout:directory}/tmp/
+
+service = $${:etc}/service/
+etc-run = $${:etc}/run/
+log = $${:var}/log/
+run = $${:var}/run/
+backup = $${:srv}/backup/
+promise = $${:etc}/promise/
+
+# Jinja Common
+
+[jinja2-template-base]
+recipe = slapos.recipe.template:jinja2
+rendered = $${buildout:directory}/$${:filename}
+extra-context =
+context =
+    import json_module json
+    key eggs_directory buildout:eggs-directory
+    key develop_eggs_directory buildout:develop-eggs-directory
+    key slap_software_type instance-parameter:slap-software-type
+    key slapparameter_dict instance-parameter:configuration
+    section directory directory
+    $${:extra-context}
+
+###########################
+# Apache configuration
+#
+
+[apache-directory]
+recipe = slapos.cookbook:mkdirectory
+www = $${directory:srv}/www
+dav = $${directory:srv}/dav
+slave-configuration = $${directory:etc}/apache-slave-conf.d/
+ssl = $${directory:etc}/ssl
+
+[apache-configuration]
+httpd-launcher = $${directory:service}/httpd
+httpd-graceful = $${directory:etc-run}/httpd-graceful
+frontend-configuration = $${directory:etc}/httpd.conf
+access-log = $${directory:log}/httpd-access.log
+error-log = $${directory:log}/httpd-error.log
+pid-file = $${directory:run}/httpd.pid
+httpd-graceful-command = kill -USR1 $(cat $${:pid-file})
+
+# Configuration
+[httpd-parameter]
+path_pid = $${directory:run}/httpd.pid
+global_ip = $${slap-network-information:global-ipv6}
+global_port = 6666
+path_error_log = $${apache-configuration:error-log}
+path_access_log = $${apache-configuration:access-log}
+key_file = $${ca-httpd:key-file}
+cert_file = $${ca-httpd:cert-file}
+document_root = $${apache-directory:www}
+dav_lock = $${directory:var}/DavLock
+dav_home = $${apache-directory:dav}
+htpassword_path = $${directory:etc}/.htpasswd
+etc_dir = $${directory:etc}
+var_dir = $${directory:var}
+
+[httpd-conf]
+recipe = slapos.recipe.template:jinja2
+template = ${template_httpd_conf:location}/${template_httpd_conf:filename}
+rendered = $${apache-configuration:frontend-configuration}
+context =
+    section parameter httpd-parameter
+
+# Htaccess for dav storage
+[httpd-dav-htaccess]
+recipe = plone.recipe.command
+stop-on-error = true
+htaccess-path = $${httpd-parameter:htpassword_path}
+command = ${apache:location}/bin/htpasswd -cb $${:htaccess-path} $${:user} $${:password}
+user = admin
+password = admin
+
+# Launcher and Graceful
+[httpd-launcher]
+recipe = slapos.cookbook:wrapper
+apache-executable = ${apache:location}/bin/httpd
+wrapper-path = $${apache-configuration:httpd-launcher}
+command-line = $${:apache-executable} -f $${httpd-conf:rendered} -DFOREGROUND
+
+[httpd-graceful]
+recipe = slapos.recipe.template:jinja2
+template = ${template-wrapper:output}
+rendered = $${apache-configuration:httpd-graceful}
+mode = 0700
+context =
+    key content apache-configuration:httpd-graceful-command
+
+# Create Dummu index.html
+[httpd-make-dummy-index-html]
+recipe = plone.recipe.command
+command = if [ ! -f $${httpd-parameter:document_root}/index.html ]; then echo "Hello World!!!" > $${httpd-parameter:document_root}/index.html ; fi
+
+# Promise
+[promise-httpd-ipv6]
+recipe = slapos.cookbook:check_port_listening
+path = $${directory:promise}/httpd_ipv6
+hostname = $${httpd-parameter:global_ip}
+port = $${httpd-parameter:global_port}
+
+###########################
+# Certificate Authority
+#
+
+[cadirectory]
+recipe = slapos.cookbook:mkdirectory
+ca-dir = $${directory:srv}/ssl
+requests = $${:ca-dir}/requests/
+private = $${:ca-dir}/private/
+certs = $${:ca-dir}/certs/
+newcerts = $${:ca-dir}/newcerts/
+crl = $${:ca-dir}/crl/
+
+[certificate-authority]
+recipe = slapos.cookbook:certificate_authority
+openssl-binary = ${openssl:location}/bin/openssl
+ca-dir = $${cadirectory:ca-dir}
+requests-directory = $${cadirectory:requests}
+wrapper = $${directory:service}/certificate_authority
+ca-private = $${cadirectory:private}
+ca-certs = $${cadirectory:certs}
+ca-newcerts = $${cadirectory:newcerts}
+ca-crl = $${cadirectory:crl}
+
+[ca-httpd]
+<= certificate-authority
+recipe = slapos.cookbook:certificate_authority.request
+key-file = $${cadirectory:certs}/httpd.key
+cert-file = $${cadirectory:certs}/httpd.crt
+executable = $${directory:service}/ca-certificate
+wrapper = $${directory:service}/ca-certificate
+# Put domain name
+name = example.com
+
+###########################
+# Monitor Part
+#
+
+[publish-connection-information]
+recipe = slapos.cookbook:publish
+server_url = https://[$${httpd-parameter:global_ip}]:$${httpd-parameter:global_port}

software/html5ide/instance.cfg

+[buildout]
+parts =
+  switch-softwaretype
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+[switch-softwaretype]
+recipe = slapos.cookbook:softwaretype
+default = ${template-html5-ide:output}

software/html5ide/software.cfg

+[buildout]
+extends =
+  ../../stack/slapos.cfg
+  ../../stack/monitor/buildout.cfg
+  ../../component/apache/buildout.cfg
+  ../../component/curl/buildout.cfg
+  ../../component/dash/buildout.cfg
+  ../../component/nodejs/buildout.cfg
+
+parts =
+  monitor-eggs
+  slapos-cookbook
+  nodejs
+  template
+  template_httpd_conf
+
+[template]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg
+md5sum = 8fd9378f81c26be62e5c93bf52c837a5
+output = ${buildout:directory}/template.cfg
+mode = 0644
+
+[template-html5-ide]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance-html5ide.cfg
+md5sum = e4d8adb5b7f0e5bf6ea12e47c5a13f8e
+output = ${buildout:directory}/template-html5ide.cfg
+mode = 0644
+
+[template_httpd_conf]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/template/httpd.conf.jinja2
+download-only = true
+md5sum = 0c9e75bcbaf5ed97f7b33d472107b634
+filename = httpd_conf.in
+mode = 0644
+
+[template-wrapper]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/template/wrapper.in
+output = ${buildout:directory}/template-wrapper.cfg
+mode = 0644
+md5sum = 8cde04bfd0c0e9bd56744b988275cfd8
+
+[versions]
+Jinja2 = 2.7.3
+MarkupSafe = 0.23
+PyRSS2Gen = 1.1
+Werkzeug = 0.9.6
+buildout-versions = 1.7
+cffi = 0.8.6
+cliff = 1.6.1
+cmd2 = 0.6.7
+cns.recipe.symlink = 0.2.3
+collective.recipe.template = 1.11
+cryptography = 0.5.1
+inotifyx = 0.2.0-1
+itsdangerous = 0.24
+lxml = 3.3.5
+meld3 = 1.0.0
+mr.developer = 1.30
+netaddr = 0.7.12
+netifaces = 0.10.4
+plone.recipe.command = 1.1
+pyOpenSSL = 0.14
+pyparsing = 2.0.2
+pytz = 2014.4
+requests = 2.3.0
+six = 1.7.3
+slapos.cookbook = 0.87
+slapos.core = 1.1.2
+slapos.recipe.cmmi = 0.2
+slapos.recipe.template = 2.5
+stevedore = 0.15
+supervisor = 3.0
+xml-marshaller = 0.9.7
+
+# Required by:
+# slapos.core==1.1.2
+Flask = 0.10.1
+
+# Required by:
+# slapos.cookbook==0.87
+lock-file = 2.0
+
+# Required by:
+# slapos.core==1.1.2
+psutil = 2.1.1
+
+# Required by:
+# cffi==0.8.6
+pycparser = 2.10
+
+# Required by:
+# slapos.core==1.1.2
+zope.interface = 4.1.1
\ No newline at end of file

software/html5ide/template/httpd.conf.jinja2

+PidFile "{{ parameter.path_pid }}"
+ServerName example.com
+ServerAdmin someone@email
+
+Listen [{{ parameter.global_ip }}]:{{ parameter.global_port }}
+
+LoadModule unixd_module modules/mod_unixd.so
+LoadModule access_compat_module modules/mod_access_compat.so
+LoadModule auth_basic_module modules/mod_auth_basic.so
+LoadModule authz_core_module modules/mod_authz_core.so
+LoadModule authz_user_module modules/mod_authz_user.so
+LoadModule authz_host_module modules/mod_authz_host.so
+LoadModule authn_core_module modules/mod_authn_core.so
+LoadModule authn_file_module modules/mod_authn_file.so
+LoadModule mime_module modules/mod_mime.so
+LoadModule cgid_module modules/mod_cgid.so
+LoadModule ssl_module modules/mod_ssl.so
+LoadModule alias_module modules/mod_alias.so
+LoadModule env_module modules/mod_env.so
+LoadModule rewrite_module modules/mod_rewrite.so
+LoadModule log_config_module modules/mod_log_config.so
+LoadModule dav_module modules/mod_dav.so
+LoadModule dav_fs_module modules/mod_dav_fs.so
+LoadModule dir_module modules/mod_dir.so
+
+ErrorLog "{{ parameter.path_error_log }}"
+LogFormat "%h %l %u %t \"%r\" %>s %b" common
+CustomLog "{{ parameter.path_access_log }}" common
+
+# SSL Configuration
+Define SSLConfigured
+SSLCertificateFile {{ parameter.cert_file }}
+SSLCertificateKeyFile {{ parameter.key_file }}
+SSLRandomSeed startup builtin
+SSLRandomSeed connect builtin
+SSLRandomSeed startup /dev/urandom 256
+SSLRandomSeed connect builtin
+SSLProtocol -ALL +SSLv3 +TLSv1
+SSLHonorCipherOrder On
+SSLCipherSuite RC4-SHA:HIGH:!ADH
+SSLEngine   On
+
+
+DavLockDB {{ parameter.dav_lock }}
+Alias /share {{ parameter.dav_home }}
+<Directory {{ parameter.dav_home }}>
+    DirectoryIndex disabled
+    DAV On
+    Options Indexes FollowSymLinks
+    AuthType Basic
+    AuthName "webdav"
+    AuthUserFile "{{ parameter.htpassword_path }}"
+    Require valid-user
+</Directory>
+
+Alias / {{ parameter.document_root }}/
+<Directory {{ parameter.document_root }}/>
+    Order Allow,Deny
+    Allow from all
+    Satisfy Any
+    DirectoryIndex index.html
+    Options FollowSymLinks
+</Directory>
\ No newline at end of file

software/html5ide/template/wrapper.in

+#!${dash-output:dash}
+{{ content }}
\ No newline at end of file

software/nginx-push-stream/instance-nginx.cfg.in

@@ -33,6 +33,7 @@ mode = 0600
 access_log = $${directory:log}/nginx-access.log
 error_log = $${directory:log}/nginx-error.log
 ip = $${slap-network-information:global-ipv6}
+local_ip = $${slap-network-information:local-ipv4}
 port = 9443
 publisher_push_stream_store_messages = off
 publisher_client_max_body_size = 16k

software/nginx-push-stream/software.cfg

@@ -30,14 +30,14 @@ mode = 0644
 [template-nginx-configuration]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/template-nginx.cfg.in
-md5sum = da3012177cbe913ffb47723367d9de54
+md5sum = 58cd6a59089ab93bb3ec0f5d12888500
 output = ${buildout:directory}/template-nginx.cfg.in
 mode = 0644
 
 [template-nginx]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-nginx.cfg.in
-md5sum = 12e6063eed46aa7f02f976f18da96e8a
+md5sum = 478085d0abb0ffc0b259c038bddae205
 output = ${buildout:directory}/instance-nginx.cfg.in
 mode = 0644
 

software/nginx-push-stream/template-nginx.cfg.in

@@ -56,6 +56,7 @@ http {
 
 server {
   listen [$${nginx-configuration:ip}]:$${nginx-configuration:port};
+  listen $${nginx-configuration:local_ip}:$${nginx-configuration:port};
 
   fastcgi_temp_path  $${directory:varnginx} 1 2;
   uwsgi_temp_path  $${directory:varnginx} 1 2;