Add hexaglobe-watermarking Software Release.

setup.py

@@ -196,7 +196,6 @@ setup(name=name,
           'zabbixagent = slapos.recipe.zabbixagent:Recipe',
           'zimbra.kvm = slapos.recipe.zimbra_kvm:Recipe',
           'zeo = slapos.recipe.zeo:Recipe',
-
         ],
         'slapos.recipe.nosqltestbed.plugin': [
           'kumo = slapos.recipe.nosqltestbed.kumo:KumoTestBed',

software/hexaglobe-watermarking/common.cfg

+[buildout]
+extends =
+  ../../component/dash/buildout.cfg
+  ../../component/dcron/buildout.cfg
+  ../../component/gzip/buildout.cfg
+  ../../component/logrotate/buildout.cfg
+  ../../component/nginx/buildout.cfg
+  ../../component/openssl/buildout.cfg
+  ../../stack/slapos.cfg
+
+parts =
+  slapos-cookbook
+  watermarkingadmin
+  eggs
+  instance-profile
+
+develop =
+  ${buildout:directory}/parts/watermarkingadmin
+
+[watermarkingadmin]
+recipe = hexagonit.recipe.download
+url = http://easicloud-p.cdn.hexaglobe.net/api10.tar.gz
+#md5sum = 
+
+[eggs]
+recipe = zc.recipe.egg
+eggs =
+  watermarkingadmin
+  slapos.toolbox
+
+[watermarkadmin.ini.in]
+recipe = slapos.recipe.download
+url = ${:_profile_base_location_}/template/${:_buildout_section_name_}
+md5sum = 2edc2acd102a465a0f21d8cd982ba4bf
+download-only = true
+#filename = template.in
+mode = 0644
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+
+[nginx.conf.in]
+recipe = slapos.recipe.download
+url = ${:_profile_base_location_}/template/${:_buildout_section_name_}
+md5sum = 7e41dfcb633ce52be42457ffd5b123d8
+download-only = true
+#filename = template.in
+mode = 0644
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+
+[instance-profile]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg.in
+output = ${buildout:directory}/instance.cfg
+#md5sum = 650cd2527158734fd6ccd9ec374b5e69
+mode = 0644
+
+[watermarking-instance-profile]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance-watermarking.cfg.in
+output = ${buildout:directory}/instance-watermarking.cfg
+#md5sum = 76c88bfc59bc9c2d05fa13cc960349c7
+mode = 0644
+
+[edge-instance-profile]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance-edge.cfg.in
+output = ${buildout:directory}/instance-edge.cfg
+#md5sum = 650cd2527158734fd6ccd9ec374b5e69
+mode = 0644

software/hexaglobe-watermarking/development.cfg

+[buildout]
+extends =
+  ../../component/git/buildout.cfg
+  common.cfg
+
+parts +=
+  slapos.cookbook-repository
+  check-recipe
+
+develop +=
+  ${:parts-directory}/slapos.cookbook-repository
+
+[slapos.cookbook-repository]
+recipe = slapos.recipe.build:gitclone
+repository = http://git.erp5.org/repos/slapos.git
+branch = hexaglobe-watermarking
+git-executable = ${git:location}/bin/git
+
+[check-recipe]
+recipe = plone.recipe.command
+stop-on-error = true
+update-command = ${:command}
+command =
+  grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
+

software/hexaglobe-watermarking/instance-edge.cfg.in

+# This instance will request other instances of lamp-generic depending on a
+# list of countries.
+
+[buildout]
+
+parts =
+  request-edge
+  publish-connection-parameter
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+[request-edge]
+<= slap-connection
+recipe = slapos.cookbook:request.edge
+# This magic parameter triggers several requests, one request per country.
+name = watermark
+country-list = $${slap-parameter:country-list}
+software-url = $${slap-connection:software-release-url}
+software-type = default
+return = url admin-url admin-url-ipv6
+
+[publish-connection-parameter]
+recipe = slapos.cookbook:publishsection
+section-list = request-edge

software/hexaglobe-watermarking/instance-watermarking.cfg.in

+[buildout]
+parts =
+  directory
+  nginx
+  watermarkadmin
+  logrotate
+  logrotate-entry-nginx
+  cron
+  cron-entry-logrotate
+  watermarkadmin-promise
+  publish-connection-parameter
+
+# Define egg directories to be the one from Software Release
+# (/opt/slapgrid/...)
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+# Fetch parameters defined in SlapOS Master for this instance
+[instance-parameter]
+recipe = slapos.cookbook:slapconfiguration
+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}
+
+# Set default parameters
+http-port = 8080
+administration-port = 5000
+
+
+# Create needed directories
+[directory]
+recipe = slapos.cookbook:mkdirectory
+home = $${buildout:directory}
+bin = $${:home}/bin
+etc = $${:home}/etc
+srv = $${:home}/srv
+service = $${:etc}/service
+promise = $${:etc}/promise
+var = $${:home}/var
+
+backup = $${:srv}/backup
+log = $${:var}/log
+run = $${:var}/run
+
+nginx-configuration = $${:etc}/nginx
+nginx-vhost-configuration = $${:nginx-configuration}/vhost
+nginx-log = $${:home}/logs
+nginx-cache = $${:var}/cache
+nginx-temp-path = $${:srv}/nginx-proxy
+
+cron-entries = $${:etc}/cron.d
+crontabs = $${:etc}/crontabs
+cronstamps = $${:etc}/cronstamps
+
+logrotate-entries = $${:etc}/logrotate.d
+logrotate-backup = $${:backup}/logrotate
+
+
+# Deploy nginx
+[nginx-configuration]
+recipe = slapos.cookbook:configurationfile
+configuration-template-path = ${nginx.conf.in:location}/nginx.conf.in
+configuration-file-path = $${directory:nginx-configuration}/nginx.conf
+
+vhost-configuration-directory-location = $${directory:nginx-vhost-configuration}
+nginx-prefix = ${nginx-enable-sub:location}
+nginx-temp-path = $${directory:nginx-temp-path}
+pid-file = $${directory:run}/nginx.pid
+home-directory = $${directory:home}
+
+
+[nginx]
+recipe = slapos.cookbook:wrapper
+nginx-executable = $${:nginx-prefix}/sbin/nginx
+nginx-prefix = ${nginx-enable-sub:location}
+command-line = $${:nginx-executable} -c $${nginx-configuration:configuration-file-path} -p $${directory:home}
+wrapper-path = $${directory:service}/nginx
+
+
+# Deploy administration API server
+[watermarkadmin-configuration]
+recipe = slapos.cookbook:configurationfile
+configuration-template-path = ${watermarkadmin.ini.in:location}/watermarkadmin.ini.in
+configuration-file-path = $${directory:etc}/watermarkadmin.ini
+
+flask-database-location = $${directory:srv}/flask.db
+
+nginx-prefix = $${directory:home}
+nginx-port = $${instance-parameter:http-port}
+nginx-configuration-file-location = $${nginx-configuration:configuration-file-path}
+nginx-executable-location = $${nginx:nginx-executable}
+nginx-pidfile-location = $${nginx-configuration:pid-file}
+nginx-vhost-configuration-directory-location = $${directory:nginx-vhost-configuration}
+nginx-log-directory-location = $${directory:nginx-log}
+nginx-cache-directory-location = $${directory:nginx-cache}
+global-ip = $${instance-parameter:ipv6-random}
+
+[watermarkadmin]
+recipe = slapos.cookbook:wrapper
+command-line =
+  ${buildout:directory}/bin/api $${watermarkadmin-configuration:configuration-file-path}
+wrapper-path = $${directory:service}/watermarkingadmin
+
+
+# Deploy logrotate
+[logrotate]
+recipe = slapos.cookbook:logrotate
+# Binaries
+logrotate-binary = ${logrotate:location}/usr/sbin/logrotate
+gzip-binary = ${gzip:location}/bin/gzip
+gunzip-binary = ${gzip:location}/bin/gunzip
+# Directories
+wrapper = $${directory:bin}/logrotate
+conf = $${directory:etc}/logrotate.conf
+logrotate-entries = $${directory:logrotate-entries}
+backup = $${directory:logrotate-backup}
+state-file = $${directory:srv}/logrotate.status
+
+[logrotate-entry-nginx]
+<= logrotate
+recipe = slapos.cookbook:logrotate.d
+name = nginx
+log = $${watermarkadmin-configuration:nginx-log-directory-location}/*.log
+frequency = daily
+rotate-num = 30
+post = ${buildout:bin-directory}/killpidfromfile $${nginx-configuration:pid-file} SIGUSR1
+sharedscripts = true
+notifempty = true
+create = true
+
+
+# Deploy cron and configure it
+[cron-simplelogger]
+recipe = slapos.cookbook:simplelogger
+wrapper = $${directory:bin}/cron_simplelogger
+log = $${directory:log}/crond.log
+
+[cron]
+recipe = slapos.cookbook:cron
+dcrond-binary = ${dcron:location}/sbin/crond
+cron-entries = $${directory:cron-entries}
+crontabs = $${directory:crontabs}
+cronstamps = $${directory:cronstamps}
+catcher = $${cron-simplelogger:wrapper}
+binary = $${directory:service}/crond
+
+[cron-entry-logrotate]
+<= cron
+recipe = slapos.cookbook:cron.d
+name = logrotate
+frequency = 0 0 * * *
+command = $${logrotate:wrapper}
+
+
+
+
+# Request frontend
+[request-frontend]
+<= slap-connection
+recipe = slapos.cookbook:requestoptional
+name = Frontend for $${slap-connection:computer-id} $${slap-connection:partition-id}
+# XXX We have hardcoded SR URL here.
+software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
+slave = true
+config = url
+config-url = http://[$${instance-parameter:ipv6-random}]:5000
+return = site_url
+
+
+# Check promises
+[watermarkadmin-promise]
+recipe = slapos.cookbook:check_port_listening
+path = $${directory:promise}/watermarkadmin-promise
+hostname = $${instance-parameter:ipv6-random}
+port = $${instance-parameter:administration-port}
+
+[watermarkadmin-promise-frontend]
+recipe = slapos.cookbook:check_page_content
+path = $${directory:promises}/watermarkadmin-frontend-promise
+url = $${request-frontend:connection-site_url}
+dash_path = ${dash:location}/bin/dash
+curl_path = ${curl:location}/bin/curl
+match = If you entered the URL manually please check your spelling and try again.
+
+# Publish instance connection parameters
+[publish-connection-parameter]
+recipe = slapos.cookbook:publish
+url = http://[$${instance-parameter:ipv6-random}]:$${instance-parameter:http-port}
+# XXX-Cedric: hardcoded
+admin-url-ipv6 = http://[$${instance-parameter:ipv6-random}]:5000
+admin-url = $${request-frontend:connection-site_url}
+

software/hexaglobe-watermarking/instance.cfg.in

+[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 = ${watermarking-instance-profile:output}
+watermarking = ${watermarking-instance-profile:output}
+edge = ${edge-instance-profile:output}
+

software/hexaglobe-watermarking/template/nginx.conf.in

+daemon off;
+
+worker_processes  1;
+
+pid %(pid-file)s;
+
+events {
+    worker_connections  1024;
+}
+
+http {
+    log_format up_log '$remote_addr - $remote_user [$time_local]  $request '
+                  'upstream_response_time $upstream_response_time '
+                  'msec $msec request_time $request_time'
+                  'cache_status $upstream_cache_status';
+
+    log_format  sysl  '"$time_local", "$http_referer", "$host", "$request", '
+                  '"$status", "$http_user_agent", "$remote_addr", '
+                  '"$bytes_sent", "$request_time"';
+
+    proxy_temp_path   %(nginx-temp-path)s;
+
+    include       %(nginx-prefix)s/conf/mime.types;
+    default_type  application/octet-stream;
+    sendfile        on;
+
+    keepalive_timeout  65;
+
+    include %(vhost-configuration-directory-location)s/*.conf;
+}

software/hexaglobe-watermarking/template/watermarkadmin.ini.in

+[nginx]
+vhosts   = %(nginx-vhost-configuration-directory-location)s
+log      = %(nginx-log-directory-location)s
+data     = %(nginx-cache-directory-location)s
+max_size = 1024m
+inactive = 120m
+port     = %(nginx-port)s
+pidfile  = %(nginx-pidfile-location)s
+nginx_bin = %(nginx-executable-location)s
+conf     = %(nginx-configuration-file-location)s
+prefix   = %(nginx-prefix)s
+
+[flask]
+DATABASE = %(flask-database-location)s
+MAX_CONTENT_LENGTH = 4096
+
+[api]
+user = admin
+pass = 276eeed9056ac2486f9c0237bb0be227
+ip   = %(global-ip)s