Merge remote-tracking branch 'origin/master' into zope4py2

component/jupyter-py2/buildout.cfg

@@ -79,7 +79,6 @@ mistune = 0.7.3
 nbformat = 4.3.0
 notebook = 4.4.1
 pandas = 0.19.2
-plone.recipe.command = 1.1
 prompt-toolkit = 1.0.13
 ptyprocess = 0.5.1
 pyzmq = 16.0.2
@@ -92,7 +91,6 @@ tornado = 4.4.2
 widgetsnbextension = 2.0.0
 # numpy >= 1.13.1 is required for numpy.core.multiarray
 numpy = 1.13.1
-certifi = 2020.6.20
 
 # nbconvert 4.2.0 depends on entrypoints egg that is not available as tar/zip source.
 nbconvert = 4.1.0

setup.py

@@ -79,7 +79,6 @@ setup(name=name,
           'addresiliency = slapos.recipe.addresiliency:Recipe',
           'apacheperl = slapos.recipe.apacheperl:Recipe',
           'apachephp = slapos.recipe.apachephp:Recipe',
-          'apachephpconfigure = slapos.recipe.apachephpconfigure:Recipe',
           'apacheproxy = slapos.recipe.apacheproxy:Recipe',
           'certificate_authority = slapos.recipe.certificate_authority:Recipe',
           'certificate_authority.request = slapos.recipe.certificate_authority:Request',
@@ -108,14 +107,12 @@ setup(name=name,
           'generic.memcached = slapos.recipe.generic_memcached:Recipe',
           'generic.mysql.wrap_update_mysql = slapos.recipe.generic_mysql:WrapUpdateMySQL',
           'gitinit = slapos.recipe.gitinit:Recipe',
-          'haproxy = slapos.recipe.haproxy:Recipe',
           'ipv4toipv6 = slapos.recipe.6tunnel:FourToSix',
           'ipv6toipv4 = slapos.recipe.6tunnel:SixToFour',
           'jsondump = slapos.recipe.jsondump:Recipe',
           'logrotate = slapos.recipe.logrotate:Recipe',
           'logrotate.d = slapos.recipe.logrotate:Part',
           'mkdirectory = slapos.recipe.mkdirectory:Recipe',
-          'mioga.instantiate = slapos.recipe.mioga.instantiate:Recipe',
           'nbdserver = slapos.recipe.nbdserver:Recipe',
           'neoppod.cluster = slapos.recipe.neoppod:Cluster',
           'neoppod.admin = slapos.recipe.neoppod:Admin',

slapos/recipe/apachephpconfigure/__init__.py

-##############################################################################
-#
-# Copyright (c) 2012 Vifib SARL and Contributors. All Rights Reserved.
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsibility of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# guarantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 3
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-from __future__ import print_function
-
-from slapos.recipe.librecipe import GenericBaseRecipe
-import zc.buildout
-import sys
-import zc.recipe.egg
-
-class Recipe(GenericBaseRecipe):
-  def install(self):
-    """
-    Taken out from the old "lamp" recipe. Allows do configure a LAMP instance.
-    """
-    self.path_list = []
-
-    document_root = self.options['htdocs']
-    url = self.options.get('url', '')
-    mysql_conf = {'mysql_host': self.options['mysql-host'],
-                  'mysql_port': self.options['mysql-port'],
-                  'mysql_user': self.options['mysql-username'],
-                  'mysql_password': self.options['mysql-password'],
-                  'mysql_database': self.options['mysql-database'],
-                 }
-    self.configureInstallation(document_root, url, mysql_conf)
-
-    return self.path_list
-
-  def configureInstallation(self, document_root, url, mysql_conf):
-    """Start process which can launch python scripts, move or remove files or
-    directories when installing software.
-    """
-    if not self.options.has_key('delete') and not self.options.has_key('rename') and not\
-        self.options.has_key('chmod') and not self.options.has_key('script') and not self.options.has_key('sql-script'):
-      return ""
-    delete = []
-    chmod = []
-    data = []
-    rename = []
-    rename_list = ""
-    argument = [self.options['lampconfigure'], "-H", mysql_conf['mysql_host'], "-P", mysql_conf['mysql_port'],
-                             "-p", mysql_conf['mysql_password'], "-u", mysql_conf['mysql_user']]
-    if not self.options.has_key('file_token'):
-      argument = argument + ["-d", mysql_conf['mysql_database'],
-                             "--table", self.options['table_name'].strip(), "--cond",
-                             self.options.get('constraint', '1').strip()]
-    else:
-      argument = argument + ["-f", self.options['file_token'].strip()]
-    argument += ["-t", document_root]
-
-    if self.options.has_key('delete'):
-      delete = ["delete"]
-      for fname in self.options['delete'].split(','):
-        delete.append(fname.strip())
-    if self.options.has_key('rename'):
-      for fname in self.options['rename'].split(','):
-        if fname.find("=>") < 0:
-          old_name = fname
-          fname = []
-          fname.append(old_name)
-          fname.append(old_name + '-' + mysql_conf['mysql_user'])
-        else:
-          fname = fname.split("=>")
-        cmd = ["rename"]
-        if self.options.has_key('rename_chmod'):
-          cmd += ["--chmod", self.options['rename_chmod'].strip()]
-        rename.append(cmd + [fname[0].strip(), fname[1].strip()])
-        rename_list += fname[0] + " to " + fname[1] + " "
-    if self.options.has_key('chmod'):
-      chmod = ["chmod", self.options['mode'].strip()]
-      for fname in self.options['chmod'].split(','):
-        chmod.append(fname.strip())
-    if self.options.has_key('script') and \
-        self.options['script'].strip().endswith(".py"):
-      data = ["run", self.options['script'].strip(), "-v", mysql_conf['mysql_database'], url, document_root]
-    if self.options.has_key('sql-script'):
-      data = ["sql", self.options['sql-script'].strip(), "-v", mysql_conf['mysql_database'], url, document_root]
-
-
-    # TODO factor
-    if delete != []:
-      print("Creating lampconfigure with 'delete' arguments")
-      command = argument + delete
-    if rename != []:
-      for parameters in rename:
-        print("Creating lampconfigure with 'rename' arguments")
-        command = argument + rename
-    if chmod != []:
-      print("Creating lampconfigure with 'chmod' arguments")
-      command = argument + chmod
-    if data != []:
-      print("Creating lampconfigure with 'run' arguments")
-      command = argument + data
-
-
-    configureinstall_wrapper_path = self.createPythonScript(
-        self.options['configureinstall-location'],
-        __name__ + '.runner.executeRunner',
-        (argument, delete, rename, chmod, data)
-    )
-    
-    #TODO finish to port this and remove upper one
-    #configureinstall_wrapper_path = self.createPythonScript(
-    #    self.options['configureinstall-location'],
-    #    'slapos.lamp.run',
-    #    [command]
-    #)
-    self.path_list.append(configureinstall_wrapper_path)
-
-    return rename_list

slapos/recipe/apachephpconfigure/runner.py

-import subprocess
-
-def executeRunner(arguments, delete, rename, chmod, data):
-  """Start the instance configure. this may run a python script, move or/and rename
-  file or directory when dondition is filled. the condition may be when file exist or when an entry
-  exist into database.
-  """
-  if delete:
-    print "Calling lampconfigure with 'delete' arguments"
-    subprocess.call(arguments + delete)
-  if rename:
-    for parameters in rename:
-      print "Calling lampconfigure with 'rename' arguments"
-      subprocess.call(arguments + parameters)
-  if chmod:
-    print "Calling lampconfigure with 'chmod' arguments"
-    subprocess.call(arguments + chmod)
-  if data:
-    print "Calling lampconfigure with 'run' arguments"
-    print arguments + data
-    subprocess.call(arguments + data)
-

slapos/recipe/haproxy/__init__.py

-##############################################################################
-#
-# Copyright (c) 2011 Vifib SARL and Contributors. All Rights Reserved.
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsibility of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# guarantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 3
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-from slapos.recipe.librecipe import GenericBaseRecipe
-
-class Recipe(GenericBaseRecipe):
-  """
-  haproxy instance configuration.
-
-  name -- local name of the haproxy
-
-  wrapper-path -- location of the init script to generate
-
-  binary-path -- location of the haproxy command
-
-  ctl-path -- location of the haproxy control script
-
-  conf-path -- location of the configuration file
-
-  socket-path -- location of the socket file for administration
-
-  ip -- ip of the haproxy server
-
-  port -- port of the haproxy server
-
-  server-check-path -- path of the domain to check
-
-  address -- string with list of all url to check
-    Example: 127.0.0.1:12004 127.0.0.1:12005
-  """
-
-  def install(self):
-    # inter must be quite short in order to detect quickly an unresponsive node
-    #      and to detect quickly a node which is back
-    # rise must be minimal possible : 1, indeed, a node which is back don't need
-    #      to sleep more time and we can give him work immediately
-    # fall should be quite sort. with inter at 3, and fall at 2, a node will be
-    #      considered as dead after 6 seconds.
-    # maxconn should be set as the maximum thread we have per zope, like this
-    #      haproxy will manage the queue of request with the possibility to
-    #      move a request to another node if the initially selected one is dead
-    # maxqueue is the number of waiting request in the queue of every zope client.
-    #      It allows to make sure that there is not a zope client handling all
-    #      the work while other clients are doing nothing. This was happening
-    #      even thoug we have round robin distribution because when a node dies
-    #      some seconds, all request are dispatched to other nodes, and then users
-    #      stick in other nodes and are not coming back. Please note this option
-    #      is not an issue if you have more than (maxqueue * node_quantity) requests
-    #      because haproxy will handle a top-level queue
-    try:
-      backend_dict = self.options['backend-dict']
-    except KeyError:
-      backend_list = self.options['backend-list']
-      if isinstance(backend_list, str):
-        # BBB
-        backend_list = backend_list.split()
-      backend_dict = {
-        self.options['name']: (self.options['port'], backend_list),
-      }
-
-    server_snippet_filename = self.getTemplateFilename(
-      'haproxy-server-snippet.cfg.in')
-    listen_snippet_filename = self.getTemplateFilename(
-      'haproxy-listen-snippet.cfg.in')
-    server_snippet = ""
-    ip = self.options['ip']
-    server_check_path = self.options.get('server-check-path', None)
-    if server_check_path:
-      httpchk = 'option httpchk GET %s' % server_check_path
-    else:
-      httpchk = ''
-    # FIXME: maxconn must be provided per-backend, not globally
-    maxconn = self.options['maxconn']
-    i = 0
-    for name, (port, backend_list) in backend_dict.iteritems():
-      server_snippet += self.substituteTemplate(
-        listen_snippet_filename, {
-          'name': name,
-          'ip': ip,
-          'port': port,
-          'httpchk': httpchk,
-        })
-      for address in backend_list:
-        i += 1
-        server_snippet += self.substituteTemplate(
-          server_snippet_filename, {
-            'name': '%s_%s' % (name, i),
-            'address': address,
-            'cluster_zope_thread_amount': maxconn,
-          })
-
-    configuration_path = self.createFile(
-      self.options['conf-path'],
-      self.substituteTemplate(
-        self.getTemplateFilename('haproxy.cfg.in'),
-        {'socket_path': self.options['socket-path'],
-         'server_text': server_snippet},
-      )
-    )
-    wrapper_path = self.createWrapper(
-      self.options['wrapper-path'],
-      (self.options['binary-path'].strip(), '-f', configuration_path))
-    ctl_path = self.createPythonScript(
-      self.options['ctl-path'],
-      __name__ + '.haproxy.haproxyctl',
-      (self.options['socket-path'],))
-    return [configuration_path, wrapper_path, ctl_path]

slapos/recipe/haproxy/haproxy.py

-import socket
-try:
-  import readline
-except ImportError:
-  pass
-
-def haproxyctl(socket_path):
-  while True:
-    try:
-      l = raw_input('> ')
-    except EOFError:
-      print
-      break
-    if l == 'quit':
-      break
-    s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-    s.connect(socket_path)
-    s.send('%s\n' % l)
-    while True:
-      r = s.recv(1024)
-      if not r:
-        break
-      print r
-    s.close()

slapos/recipe/haproxy/template/haproxy-listen-snippet.cfg.in

-listen %(name)s
-  bind %(ip)s:%(port)s
-  cookie  SERVERID insert
-  balance roundrobin
-  %(httpchk)s
-  stats uri /haproxy
-  stats realm Global\ statistics

slapos/recipe/haproxy/template/haproxy-server-snippet.cfg.in

-  server %(name)s %(address)s cookie %(name)s check inter 3s rise 1 fall 2 maxqueue 5 maxconn %(cluster_zope_thread_amount)s

slapos/recipe/haproxy/template/haproxy.cfg.in

-global
-  maxconn 4096
-  stats socket %(socket_path)s level admin
-
-defaults
-  mode  http
-  retries 1
-  option redispatch
-  maxconn 2000
-  # it is useless to have timeout much bigger than the one of apache.
-  # By default apache use 300s, so we set slightly more in order to
-  # make sure that apache will first stop the connection.
-  timeout server 305s
-  # Stop waiting in queue for a zope to become available.
-  # If no zope can be reached after one minute, consider the request will
-  # never succeed.
-  timeout queue 60s
-  # The connection should be immediate on LAN,
-  # so we should not set more than 5 seconds, and it could be already too much
-  timeout connect 5s
-  # As requested in haproxy doc, make this "at least equal to timeout server".
-  timeout client 305s
-  # Use "option httpclose" to not preserve client & server persistent connections
-  # while handling every incoming request individually, dispatching them one after
-  # another to servers, in HTTP close mode. This is really needed when haproxy
-  # is configured with maxconn to 1, without this options browser are unable
-  # to render a page
-  option httpclose
-
-%(server_text)s

software/erp5testnode/software.cfg

@@ -22,13 +22,10 @@ parts =
   git
   apache
 
-[python]
-part = python3
-
 [eggs]
 recipe = zc.recipe.egg
 eggs =
-  erp5.util[testnode,benchmark]
+  erp5.util[testnode]
   ${lxml-python:egg}
 
 
@@ -41,20 +38,3 @@ output = ${buildout:directory}/template.cfg
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/${:filename}
 output = ${buildout:directory}/template-default.cfg.jinja
-
-[versions]
-dnspython = 1.15.0
-PyXML = 0.8.5
-WebOb = 1.8.5
-WebTest = 2.0.33
-soupsieve = 1.8
-waitress = 1.4.4
-z3c.etestbrowser = 3.0.1
-zope.testbrowser = 5.3.2
-WSGIProxy2 = 0.4.6
-beautifulsoup4 = 4.7.1
-zope.cachedescriptors = 4.3.1
-zope.event = 4.4
-zope.schema = 4.9.3
-zope.deferredimport = 4.3.1
-zope.proxy = 4.3.5

software/erp5testnode/testsuite/deploy-test/runTestSuite.py

@@ -189,7 +189,7 @@ def main():
 
   assert revision == test_result.revision, (revision, test_result.revision)
   while suite.acquire():
-    test = test_result.start(suite.running.keys())
+    test = test_result.start(list(suite.running.keys()))
     if test is not None:
       suite.start(test.name, lambda status_dict,
                   __test=test: __test.stop(**status_dict))

software/headless-chromium/README.md

@@ -26,5 +26,8 @@ The following instance parameters can be configured:
 - remote-debugging-port:  Port for Chromium to listen on.
 - nginx-proxy-port:       Port for Ningx proxy to listen on.
 - monitor-httpd-port:     Port for monitor.
+- incognito:              Force Incognito mode
+- window-size:            Initial windo size
+- block-new-web-contents: Block new web contents
 
 See `instance-headless-chromium-input-schema.json` for default values.

software/headless-chromium/buildout.hash.cfg

 [template-cfg]
 filename = instance.cfg.in
-md5sum = 4d73fe3c5d286163974bdb79c838e030
+md5sum = 6315598b2c7c19f9e2d9cdf090492e2c
 
 [instance-headless-chromium]
 _update_hash_filename_ = instance-headless-chromium.cfg.in
-md5sum = d72e5f6e159081f1c204ceb7ec0c0caf
+md5sum = a350b7b5ac03971f1b8d66949905c164
 
 [template-nginx-conf]
 _update_hash_filename_ = templates/nginx.conf.in
-md5sum = c4d09d2b819f624087ef4c38551dfe2f
+md5sum = 1f35f91fa7e490cd1e2194264a8a6ed8
 
 [template-mime-types]
 _update_hash_filename_ = templates/mime-types.in

software/headless-chromium/instance-headless-chromium-input-schema.json

 {
   "type": "object",
   "$schema": "http://json-schema.org/draft-04/schema",
+  "required": [
+    "target-url"
+  ],
   "title": "Input Parameters",
   "properties": {
     "target-url": {
-      "description": "URL for Chromium to load on startup.",
-      "title": "Target URL",
-      "type": "string",
-      "default": "https://www.example.com"
+      "description": "Web site URL to load on headless chromium.",
+      "title": "Application target URL",
+      "type": "string"
     },
     "remote-debugging-port": {
       "description": "Port for Chromium to listen on.",
       "title": "Remote Debugging Port",
       "type": "integer",
-      "default": 8081
+      "default": 9222
     },
     "nginx-proxy-port": {
       "description": "Port for Nginx proxy to listen on.",
       "title": "Nginx Proxy Port",
       "type": "integer",
-      "default": 8082
+      "default": 9224
+    },
+    "incognito": {
+      "description": "Force Incognito mode",
+      "title": "Force Incognito mode",
+      "type": "boolean",
+      "default": true
+    },
+    "window-size": {
+      "description": "Set the initial window size. Provided as string in the format \"800,600\".",
+      "title": "Initial windo size",
+      "type": "string",
+      "default": "800,600"
+    },
+    "block-new-web-contents": {
+      "description": "If true, then all pop-ups and calls to window.open will fail.",
+      "title": "Block new web contents",
+      "type": "boolean",
+      "default": false
     },
     "monitor-httpd-port": {
       "description": "Port for monitor frontend.",

software/headless-chromium/instance-headless-chromium.cfg.in

 {% set parameter_dict = dict(default_parameter_dict, **slapparameter_dict) %}
 
-[buildout]
-parts =
-  chromium-launcher
-  generate-passwd-file
-  nginx-config
-  nginx-mime-types
-  nginx-launcher
-  logrotate-entry-nginx
-  publish-connection-information
-  frontend-ok-promise
-  frontend-secure-promise
-
-eggs-directory = {{ buildout['eggs-directory'] }}
-develop-eggs-directory = {{ buildout['develop-eggs-directory'] }}
-offline = true
-
-extends = {{ parameter_list['template-monitor'] }}
-
 # Create necessary directories.
 [directory]
 recipe = slapos.cookbook:mkdirectory
@@ -34,7 +16,10 @@ service = ${:etc}/service
 ipv4 = {{ partition_ipv4 }}
 ipv6 = {{ partition_ipv6 }}
 remote-debugging-port = {{ parameter_dict['remote-debugging-port'] }}
-url = {{ parameter_dict['target-url'] }}
+target-url = {{ parameter_dict['target-url'] }}
+incognito = {{ parameter_dict['incognito'] }}
+window-size = {{ parameter_dict['window-size'] }}
+block-new-web-contents = {{ parameter_dict['block-new-web-contents'] }}
 remote-debugging-address = ${:ipv4}:${:remote-debugging-port}
 devtools-frontend-root = {{ parameter_list['devtools-frontend'] }}
 
@@ -51,19 +36,29 @@ nginx-cert-file = ${frontend-instance-certificate:cert-file}
 nginx-mime-types = ${directory:etc}/mime-types
 
 
-# Create a launcher script in /etc/service for the headless shell
+# Create a wrapper script in /bin/chromium for the headless shell
 # executable.
-[chromium-launcher]
-recipe = slapos.recipe.template
-inline =
-  #!/bin/sh
+[chromium-wrapper]
+recipe = slapos.cookbook:wrapper
+wrapper-path = ${directory:bin}/chromium
+command-line =
+  {{ parameter_list['chromium-wrapper'] }}
+  --remote-debugging-address=${headless-chromium:ipv4}
+  --remote-debugging-port=${headless-chromium:remote-debugging-port}
+  --user-data-dir=${directory:tmp}
+  --window-size="${headless-chromium:window-size}"
+  {% if parameter_dict['incognito'] %}--incognito{% endif -%}
+  {% if parameter_dict['block-new-web-contents'] %}--block-new-web-contents{% endif -%}
+{{ '\n  "${headless-chromium:target-url}"' }}
+environment =
+  FONTCONFIG_FILE=${font-config:output}
 
-  export FONTCONFIG_FILE=${font-config:output}
-  exec {{ parameter_list['chromium-wrapper'] }} \
-    --remote-debugging-address=${headless-chromium:ipv4} \
-    --remote-debugging-port=${headless-chromium:remote-debugging-port} \
-    ${headless-chromium:url}
-output = ${directory:service}/chromium
+[chromium-launcher]
+recipe = slapos.cookbook:wrapper
+command-line = ${chromium-wrapper:wrapper-path}
+wrapper-path = ${directory:service}/chromium
+hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
+hash-files = ${chromium-wrapper:wrapper-path}
 
 
 # Configure and launch the proxy server.
@@ -81,7 +76,9 @@ output = ${headless-chromium:nginx-mime-types}
 
 [nginx-launcher]
 recipe = slapos.cookbook:wrapper
-command-line = {{ parameter_list['nginx-location'] }}/sbin/nginx -c ${headless-chromium:nginx-config-target}
+command-line =
+  {{ parameter_list['nginx-location'] }}/sbin/nginx
+  -c ${headless-chromium:nginx-config-target}
 wrapper-path = ${directory:service}/nginx
 
 [logrotate-entry-nginx]
@@ -189,3 +186,22 @@ name = headless-chromium-frontend-secure.py
 url = ${remote-debugging-frontend:connection-secure_access}
 config-url = ${:url}
 config-http-code = 401
+
+[buildout]
+extends = {{ parameter_list['template-monitor'] }}
+
+parts =
+  chromium-launcher
+  generate-passwd-file
+  nginx-config
+  nginx-mime-types
+  nginx-launcher
+  logrotate-entry-nginx
+  remote-debugging-frontend
+  publish-connection-information
+  frontend-ok-promise
+  frontend-secure-promise
+
+eggs-directory = {{ buildout['eggs-directory'] }}
+develop-eggs-directory = {{ buildout['develop-eggs-directory'] }}
+offline = true

software/headless-chromium/instance.cfg.in

@@ -32,8 +32,11 @@ context =
   jsonkey default_parameter_dict :default-parameters
 default-parameters =
   {
-    "remote-debugging-port": 8081,
-    "nginx-proxy-port": 8082,
+    "remote-debugging-port": 9222,
+    "nginx-proxy-port": 9224,
+    "incognito": true,
+    "window-size": "800,600",
+    "block-new-web-contents": false,
     "target-url": "https://www.example.com",
     "monitor-httpd-port": 8083
   }

software/headless-chromium/templates/nginx.conf.in

 pid {{ param_headless_chromium['nginx-pid-path'] }};
 error_log {{ param_headless_chromium['nginx-error-log'] }};
 
+daemon off;
+
 events {
   worker_connections 1024;
 }
@@ -11,12 +13,6 @@ http {
   include {{ param_headless_chromium['nginx-mime-types'] }};
   default_type application/octet-stream;
 
-  types {
-    text/html html;
-    text/css css;
-    application/javascript js;
-  }
-
   server {
     listen {{ param_headless_chromium['proxy-address'] }} ssl;
 

software/headless-chromium/test/test.py

@@ -68,3 +68,26 @@ class TestHeadlessChromium(SlapOSInstanceTestCase):
     response = requests.get(proxyURL + frontend, verify=False,
                             auth=(username, password))
     self.assertEqual(requests.codes['ok'], response.status_code)
+
+class TestHeadlessChromiumParameters(SlapOSInstanceTestCase):
+
+  instance_parameter_dict = {
+    # this website echoes the get request for debugging purposes
+    'target-url': 'https://httpbin.org/get?a=6&b=4',
+    'incognito': True,
+    "block-new-web-contents": False,
+    "window-size": "900,600"
+  }
+
+  @classmethod
+  def getInstanceParameterDict(cls):
+    return cls.instance_parameter_dict
+
+  def setUp(self):
+    self.connection_parameters = self.requestDefaultInstance().getConnectionParameterDict()
+
+  def test_chromium_loads_target_url_parameter(self):
+    url = self.connection_parameters['remote-debug-url']
+    response = requests.get('%s/json' % url)
+    loaded_url = response.json()[0]['url']
+    self.assertEqual(loaded_url, self.instance_parameter_dict['target-url'])

software/jupyter/software.cfg

@@ -72,7 +72,6 @@ notebook = 6.1.5
 numpy = 1.14.6
 pandas = 0.25.3
 pandocfilters = 1.4.3
-plone.recipe.command = 1.1
 prompt-toolkit = 1.0.13
 ptyprocess = 0.5.1
 pyzmq = 20.0.0
@@ -86,7 +85,6 @@ tornado = 6.1
 traitlets = 5.0.5
 webencodings = 0.5.1
 widgetsnbextension = 2.0.0
-certifi = 2020.6.20
 Send2Trash = 1.5.0
 argon2-cffi = 20.1.0
 nbconvert = 6.0.7

software/neoppod/software-common.cfg

@@ -129,6 +129,5 @@ coverage = 4.5.1
 ecdsa = 0.13
 mysqlclient = 1.3.12
 pycrypto = 2.6.1
-pycurl = 7.43.0
 cython-zstd = 0.2
 funcsigs = 1.0.2

software/plantuml/test/setup.py

@@ -46,6 +46,7 @@ setup(name=name,
         'slapos.libnetworkcache',
         'erp5.util',
         'supervisor',
+        'pillow',
         'psutil',
         'plantuml',
         'requests'

software/seleniumserver/test/setup.py

@@ -48,7 +48,7 @@ setup(
         'erp5.util',
         'selenium',
         'psutil',
-        'image',
+        'pillow',
         'requests',
         'paramiko',
     ],

software/slapos-sr-testing/software.cfg

@@ -394,28 +394,21 @@ tests =
 [versions]
 # slapos.core is used from the clone always
 slapos.core =
+
 # Various needed versions
-Pillow = 5.3.0
-PyNaCl = 1.3.0
-bcrypt = 3.1.4
+Pillow = 9.2.0
 forcediphttpsadapter = 1.0.1
-httplib2 = 0.11.3
+httplib2 = 0.20.4
 image = 1.5.25
-paramiko = 2.4.2
 plantuml = 0.3.0:whl
 pysftp = 0.2.9
 requests-toolbelt = 0.8.0
 selenium = 3.141.0
-
-# Patched eggs
-PyPDF2 = 1.26.0+SlapOSPatched001
-
-# Django 1.11 is python 2 compatible
-Django = 1.11
-
 testfixtures = 6.11.0
-funcsigs = 1.0.2
-mysqlclient = 1.3.12
+mysqlclient = 2.1.1
 pexpect = 4.8.0
 ptyprocess = 0.6.0
 psycopg2 = 2.8.6
+
+# Patched eggs
+PyPDF2 = 1.26.0+SlapOSPatched001

software/slapos-testing/software.cfg

@@ -244,19 +244,12 @@ slapos.toolbox =
 rubygemsrecipe =
 
 # All other depencies should be pinned.
-Pygments = 2.1.3
-zc.lockfile = 1.4
-bcrypt = 3.1.4
-dnspython = 1.15.0
-funcsigs = 1.0.2
+Pygments = 2.13.0
 httmock = 1.2.6
 manuel = 1.9.0
-mock = 2.0.0:whl
 testfixtures = 6.11.0
-pycurl = 7.43.0.2
 pyflakes = 2.0.0
 zope.testing = 4.6.2
-urllib3 = 1.24.1
 pathlib = 1.0.1
 psycopg2 = 2.8.6
 iniparse = 0.5

software/unstable/mioga/instance-apacheperl.cfg

-[buildout]
-parts =
-  postgres-urlparse
-#  apacheperl-promise
-  mioga-instance
-  cron-entry-crawler
-  sshkeys-dropbear
-  dropbear-server-add-authorized-key
-  sshkeys-authority
-  publish-connection-information
-
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
-offline = true
-
-[rootdirectory]
-recipe = slapos.cookbook:mkdirectory
-bin = $${buildout:directory}/bin
-etc = $${buildout:directory}/etc
-srv = $${buildout:directory}/srv
-log = $${buildout:directory}/log
-var = $${buildout:directory}/var
-buildinst = $${buildout:directory}/buildinst
-
-[basedirectory]
-recipe = slapos.cookbook:mkdirectory
-services = $${rootdirectory:etc}/run
-promises = $${rootdirectory:etc}/promise
-htdocs = $${rootdirectory:srv}/htdocs
-cronstamps = $${rootdirectory:etc}/cronstamps/
-cron-entries = $${rootdirectory:etc}/cron.d/
-crontabs = $${rootdirectory:etc}/crontabs/
-sshkeys = $${rootdirectory:srv}/sshkeys
-ssh = $${rootdirectory:etc}/ssh
-
-[cron-simplelogger]
-recipe = slapos.cookbook:simplelogger
-wrapper = $${rootdirectory:bin}/cron_simplelogger
-log = $${rootdirectory:log}/crond.log
-
-[cron]
-recipe = slapos.cookbook:cron
-dcrond-binary = ${dcron:location}/sbin/crond
-cronstamps = $${basedirectory:cronstamps}
-cron-entries = $${basedirectory:cron-entries}
-crontabs = $${basedirectory:crontabs}
-catcher = $${cron-simplelogger:wrapper}
-binary = $${basedirectory:services}/crond
-
-[cron-entry-crawler]
-<= cron
-recipe = slapos.cookbook:cron.d
-name = logrotate
-frequency = 23 50 * * *
-command = $${mioga-instance:bin_dir}/crawl.sh
-
-[apacheperl-promise]
-recipe = slapos.cookbook:check_port_listening
-path = $${basedirectory:promises}/httpd_promise
-hostname = $${apacheperl-instance:ip}
-port = $${apacheperl-instance:port}
-
-[publish-connection-information]
-recipe = slapos.cookbook:publish
-direct_url = $${mioga-url:direct_url}
-ssh_command = ssh $${dropbear-server:host} -p $${dropbear-server:port}
-url = $${request-frontend:connection-site_url}
-
-# Request POSTGRES INSTANCE and parse its URL
-
-[request-postgres]
-<= slap-connection
-recipe = slapos.cookbook:request
-name = Postgres
-software-url = $${slap-connection:software-release-url}
-software-type = postgres
-return = url
-sla-computer_guid = $${slap-connection:computer-id}
-
-[postgres-urlparse]
-recipe = slapos.cookbook:urlparse
-url = $${request-postgres:connection-url}
-
-[symlinks]
-recipe = cns.recipe.symlink
-symlink_target = $${rootdirectory:bin}
-symlink_base = ${postgresql:location}/bin
-
-# SSH SERVER
-
-[sshkeys-directory]
-recipe = slapos.cookbook:mkdirectory
-requests = $${basedirectory:sshkeys}/requests/
-keys = $${basedirectory:sshkeys}/keys/
-
-[sshkeys-authority]
-recipe = slapos.cookbook:sshkeys_authority
-request-directory = $${sshkeys-directory:requests}
-keys-directory = $${sshkeys-directory:keys}
-wrapper = $${basedirectory:services}/sshkeys_authority
-keygen-binary = ${dropbear:location}/bin/dropbearkey
-
-[dropbear-server]
-recipe = slapos.cookbook:dropbear
-host = $${slap-network-information:global-ipv6}
-port = 2222
-home = $${basedirectory:ssh}
-wrapper = $${rootdirectory:bin}/raw_sshd
-shell = /bin/bash
-rsa-keyfile = $${basedirectory:ssh}/server_key.rsa
-dropbear-binary = ${dropbear:location}/sbin/dropbear
-
-[sshkeys-dropbear]
-<= sshkeys-authority
-recipe = slapos.cookbook:sshkeys_authority.request
-name = dropbear
-type = rsa
-executable = $${dropbear-server:wrapper}
-public-key = $${dropbear-server:rsa-keyfile}.pub
-private-key = $${dropbear-server:rsa-keyfile}
-wrapper = $${basedirectory:services}/sshd
-
-[dropbear-server-add-authorized-key]
-<= dropbear-server
-recipe = slapos.cookbook:dropbear.add_authorized_key
-key = $${slap-parameter:authorized-key}
-
-[slap-parameter]
-# Default value if no ssh key is specified
-authorized-key =
-
-# IPv4 AND PORT 80 FRONTEND
-
-[request-frontend]
-<= slap-connection
-recipe = slapos.cookbook:requestoptional
-name = Frontend
-# 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 = $${mioga-url:direct_url}
-return = site_url
-
-# MIOGA INSTANCE
-
-[mioga-instance]
-recipe = slapos.cookbook:mioga.instantiate
-# mioga_compile_dir = ${template-apacheperl:compile-directory}
-# Pity that the following line does not work. Or does it?
-# mioga_compile_env = ${mioga:environment}
-mioga_location = ${mioga:location}
-mioga_buildinst = ${mioga:buildinst}
-libxslt_bin = ${libxslt:location}/bin
-libxml2_bin = ${libxml2:location}/bin
-rsync_bin = ${rsync:location}/bin
-var_directory = $${rootdirectory:var}
-buildinst_directory = $${rootdirectory:buildinst}
-instance_root = $${buildout:directory}
-perl_bin = ${perl:location}/bin
-postgres_bin = ${postgresql:location}/bin
-htdocs = $${apacheperl-instance:htdocs}
-db_host = $${postgres-urlparse:host}
-db_port = $${postgres-urlparse:port}
-db_dbname = $${postgres-urlparse:path}
-db_username = $${postgres-urlparse:username}
-db_password = $${postgres-urlparse:password}
-public_ipv6 = $${slap-network-information:global-ipv6}
-public_ipv6_port = 8080
-private_ipv4 = $${slap-network-information:local-ipv4}
-httpd_binary = ${apache-2.2:location}/bin/httpd
-path = $${basedirectory:services}/apacheperl
-htdocs = $${basedirectory:htdocs}
-httpd_conf = $${rootdirectory:etc}/httpd.conf
-pid_file = $${basedirectory:services}/apache.pid
-lock_file = $${basedirectory:services}/apache.lock
-dav_locks = $${buildout:directory}/var/dav_locks
-services_dir = $${basedirectory:services}
-error_log = $${rootdirectory:log}/error.log
-access_log = $${rootdirectory:log}/access.log
-bin_dir = $${rootdirectory:bin}
-log_dir = $${rootdirectory:log}
-site_perl = ${perl:siteprefix}
-
-[mioga-url]
-direct_url = http://[$${slap-network-information:global-ipv6}]:$${mioga-instance:public_ipv6_port}
\ No newline at end of file

software/unstable/mioga/instance-postgres.cfg

-[buildout]
-parts =
-  symlinks
-  publish
-  postgres-instance
-  postgres-promise
-
-
-# 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
-
-
-[instance-parameters]
-# Fetches parameters defined in SlapOS Master for this instance
-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}
-
-
-[rootdirectory]
-recipe = slapos.cookbook:mkdirectory
-bin = $${buildout:directory}/bin
-etc = $${buildout:directory}/etc
-services = $${rootdirectory:etc}/run/
-promises = $${rootdirectory:etc}/promise/
-var = $${buildout:directory}/var
-
-
-[symlinks]
-recipe = cns.recipe.symlink
-symlink_target = $${rootdirectory:bin}
-symlink_base = ${postgresql:location}/bin
-
-[postgres-instance]
-# create cluster, configuration files and a database
-recipe = slapos.cookbook:postgres
-
-# Options
-ipv6_host = $${slap-network-information:global-ipv6}
-user = mioga
-port = 5432
-dbname = mioga2
-# pgdata_directory is created by initdb, and should not exist beforehand.
-pgdata-directory = $${rootdirectory:var}/data
-services = $${rootdirectory:services}
-bin = $${rootdirectory:bin}
-
-
-# Deploy promises scripts
-[postgres-promise]
-recipe = slapos.cookbook:check_port_listening
-path = $${rootdirectory:promises}/postgres
-hostname = $${slap-network-information:global-ipv6}
-port = $${postgres-instance:port}
-
-
-[publish]
-recipe = slapos.cookbook:publishurl
-url = $${postgres-instance:url}

software/unstable/mioga/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-apacheperl:output}
-postgres = ${template-postgres:output}
-

software/unstable/mioga/mioga-hooks.py

-
-import fnmatch
-import grp
-import os
-import pprint
-import pwd
-import re
-import shutil
-import sys
-
-class FileModifier:
-  def __init__(self, filename):
-    self.filename = filename
-    f = open(filename, 'rb')
-    self.content = f.read()
-    f.close()
-  
-  def modify(self, key, value):
-    (self.content, count) = re.subn(
-      r'(<parameter[^>]*\sname\s*=\s*"' + re.escape(key) + r'"[^>]*\sdefault\s*=\s*")[^"]*',
-      r"\g<1>" + value,
-      self.content)
-    return count
-      
-  def save(self):
-    f = open(self.filename, 'w')
-    f.write(self.content)
-    f.close()
-
-
-def pre_configure_hook(options, bo, env):
-  location = options['location']
-
-  # TODO: double-check which one of these values must be set
-  # at instantiation time!
-
-  fm = FileModifier('conf/Config.xml')
-  fm.modify('apache_user',  pwd.getpwuid(os.getuid())[0])
-  fm.modify('apache_group', grp.getgrgid(os.getgid())[0])
-  mioga_base = os.path.join(location, 'var', 'lib', 'Mioga2')
-  fm.modify('install_dir', mioga_base)
-  fm.modify('tmp_dir', os.path.join(mioga_base, 'tmp'))
-  fm.modify('search_tmp_dir', os.path.join(mioga_base, 'mioga_search'))
-  fm.modify('maildir', os.path.join(location, 'var', 'spool', 'mioga', 'maildir'))
-  fm.modify('maildirerror', os.path.join(location, 'var', 'spool', 'mioga', 'error'))
-  fm.modify('mailfifo', os.path.join(location, 'var', 'spool', 'mioga', 'fifo'))
-  fm.save()
-
-  # TODO: mail settings are certainly wrong, what is the domain name?
-
-  # Correct shebangs to the right Perl
-  for root, dirnames, filenames in os.walk('.'):
-    for filename in fnmatch.filter(filenames, '*.pl'):
-      with open(os.path.join(root, filename), "r+") as f:
-        lines = f.readlines()
-        (lines[0], count) = re.subn(r'^#!/usr/bin/perl',
-                                    '#!' + options['perl-binary'],
-                                    lines[0], 1)
-        if count > 0:
-          f.seek(0)
-          f.writelines(lines)
-          print "Corrected interpreter for script "+filename
-
-
-
-# def post_make_hook(options, buildout):
-#   location = options['location']
-#   print "Mioga - postmakehook"
-#   print "We are currently in", os.getcwd()
-#   shutil.move("var", location)
-#   return None

software/unstable/mioga/software.cfg

-[buildout]
-develop =
-  /srv/slapgrid/slappart9/srv/runner/project/slapos
-  /opt/slapdev_build
-
-extends =
-  ../../component/rsync/buildout.cfg
-  ../../component/apache-perl/buildout.cfg
-  ../../component/perl-XML-Parser/buildout.cfg
-  ../../component/perl-XML-LibXML/buildout.cfg
-  ../../component/perl-Term-ReadLine-Gnu/buildout.cfg
-  ../../component/perl-Image-Magick/buildout.cfg
-  ../../component/postgresql/buildout.cfg
-  ../../component/libxslt/buildout.cfg
-  ../../component/dcron/buildout.cfg
-  ../../component/dropbear/buildout.cfg
-  ../../component/lxml-python/buildout.cfg
-  ../../stack/slapos.cfg
-
-parts = 
-  eggs
-  apache-perl
-  perl-Apache2-Request
-  perl-Crypt-SSLeay
-  perl-DBD-Pg
-  perl-XML-Parser
-  perl-XML-LibXML
-  perl-XML-LibXSLT
-  perl-Term-ReadLine-Gnu
-  perl-Text-Iconv
-  perl-Image-Magick
-  perl-String-Checker-mioga
-  perl-Search-Xapian
-  cpan-simple-modules
-  rsync
-  mioga
-  template
-  template-apacheperl
-  template-postgres
-
-
-# Those were unmaintained components inlined here
-# slapos.recipe.build:cpan no longer exist, we now use perl-CPAN-package macro instead
-
-# ../../component/perl-Crypt-SSLeay/buildout.cfg
-[buildout]
-extends +=
-  ../../component/openssl/buildout.cfg
-  ../../component/zlib/buildout.cfg
-[perl-Crypt-SSLeay]
-recipe = slapos.recipe.build:cpan
-modules =
-  G/GA/GAAS/URI-1.60.tar.gz
-  N/NA/NANIS/Crypt-SSLeay-0.64.tar.gz
-cpan-configuration =
-  make_arg=('OTHERLDFLAGS="-L${zlib:location}/lib -Wl,-R${zlib:location}/lib -L${openssl:location}/lib -Wl,-R${openssl:location}/lib"')
-  makepl_arg=('INC=-I${openssl:location}/include')
-environment =
-  OPENSSL_PREFIX=${openssl:location}
-perl = perl
-
-# ../../component/perl-XML-LibXSLT/buildout.cfg
-[buildout]
-extends +=
-  ../libxslt/buildout.cfg
-  ../libxml2/buildout.cfg
-  ../zlib/buildout.cfg
-[perl-XML-LibXSLT]
-recipe = slapos.recipe.build:cpan
-cpan-configuration =
-  makepl_arg='LIBS="-L${libxslt:location}/lib -Wl,-R${libxslt:location}/lib -L${zlib:location}/lib -Wl,-R${zlib:location}/lib -L${libxml2:location}/lib -Wl,-R${libxml2:location}/lib" INC="-I${libxslt:location}/include -I${libxml2:location}/include/libxml2"'
-modules =
-  S/SH/SHLOMIF/XML-LibXSLT-1.78.tar.gz
-perl = perl
-
-# ../../component/perl-Text-Iconv/buildout.cfg
-[buildout]
-extends +=
-  ../libiconv/buildout.cfg
-[perl-Text-Iconv]
-recipe = slapos.recipe.build:cpan
-cpan-configuration =
-  makepl_arg='LIBS="-L${libiconv:location}/lib -Wl,-R${libiconv:location}/lib" INC="-I${libiconv:location}/include"'
-modules =
-  M/MP/MPIOTR/Text-Iconv-1.7.tar.gz
-perl = perl
-
-# ../../component/perl-DBD-Pg/buildout.cfg
-[buildout]
-extends +=
-  ../postgresql/buildout.cfg
-[perl-DBD-Pg]
-recipe = slapos.recipe.build:cpan
-modules =
-  T/TU/TURNSTEP/DBD-Pg-2.19.3.tar.gz
-environment =
-  POSTGRES_HOME=${postgresql:location}
-perl = perl
-
-# ../../component/perl-Search-Xapian/buildout.cfg
-[buildout]
-extends +=
-  ../xapian/buildout.cfg
-[perl-Search-Xapian]
-recipe = slapos.recipe.build:cpan
-modules =
-  O/OL/OLLY/Search-Xapian-1.2.10.0.tar.gz
-environment =
-  XAPIAN_CONFIG=${xapian:location}/bin/xapian-config
-perl = perl
-
-
-
-[eggs]
-recipe = zc.recipe.egg
-eggs =
-  ${lxml-python:egg}
-  slapos.cookbook
-  cns.recipe.symlink
-
-# override perl here to keep using 5.14.x.
-[perl]
-recipe = hexagonit.recipe.cmmi
-version = 5.14.2
-url = http://www.cpan.org/src/5.0/perl-${:version}.tar.bz2
-md5sum = 04a4c5d3c1f9f19d77daff8e8cd19a26
-siteprefix = ${buildout:parts-directory}/site_${:_buildout_section_name_}
-patch-options = -p1
-patches =
-  ${perl-keep-linker-flags-in-ldflags.patch:location}/${perl-keep-linker-flags-in-ldflags.patch:filename}
-# Viktor has adapted the following commands for AMD64 compilation
-# TODO: find out how we can write a generic code that suits all architectures
-configure-command =
-  sh Configure -des \
-    -A ccflags=-fPIC \
-    -Dprefix=${buildout:parts-directory}/${:_buildout_section_name_} \
-    -Dsiteprefix=${:siteprefix} \
-    -Dcflags=-I${gdbm:location}/include \
-    -Dldflags="-L${gdbm:location}/lib -Wl,-rpath=${gdbm:location}/lib" \
-    -Ui_db \
-    -Dnoextensions=ODBM_File \
-    -Dusethreads
-environment =
-  PATH=${patch:location}/bin:%(PATH)s
-  CFLAGS='-m64 -mtune=nocona'
-post-make-hook = ${perl-postmakehook-download:location}/${perl-postmakehook-download:filename}:post_make_hook
-
-[cpan-simple-modules]
-recipe = slapos.recipe.build:cpan
-modules =
-  S/ST/STBEY/Date-Calc-6.3.tar.gz
-  D/DC/DCOPPIT/Benchmark-Timer-0.7102.tar.gz
-  R/RB/RBOW/Date-ICal-2.678.tar.gz
-  S/SB/SBECK/Date-Manip-6.37.tar.gz
-  G/GB/GBARR/TimeDate-1.20.tar.gz
-  S/SH/SHLOMIF/Error-0.17018.tar.gz
-  P/PA/PARDUS/File-MimeInfo/File-MimeInfo-0.16.tar.gz
-  O/OV/OVID/HTML-TokeParser-Simple-3.15.tar.gz
-  D/DS/DSKOLL/MIME-tools-5.503.tar.gz
-  D/DS/DSKOLL/IO-stringy-2.110.tar.gz
-  C/CO/COSIMO/HTTP-DAV-0.47.tar.gz
-  M/MA/MARSCHAP/perl-ldap-0.48.tar.gz
-  F/FD/FDESAR/Parse-Yapp-1.05.tar.gz
-  S/SN/SNOWHARE/Unicode-MapUTF8-1.11.tar.gz
-  G/GA/GAAS/Unicode-String-2.09.tar.gz
-  T/TY/TYEMQ/Algorithm-Diff-1.1902.tar.gz
-  J/JG/JGMYERS/Encode-Detect-1.01.tar.gz
-  G/GU/GUIDO/libintl-perl-1.20.tar.gz
-  K/KE/KEN/XML-XML2JSON-0.06.tar.gz
-  A/AR/ARISTOTLE/XML-Atom-SimpleFeed-0.86.tar.gz
-  P/PE/PETDANCE/Test-WWW-Mechanize-1.44.tar.gz
-  G/GR/GRANTM/XML-Simple-2.20.tar.gz
-  A/AD/ADAMK/Archive-Zip-1.30.tar.gz
-  D/DU/DURIST/Proc-ProcessTable-0.45.tar.gz
-  S/SU/SULLR/Net-INET6Glue-0.5.tar.gz
-perl = perl
-cpan-configuration =
-  makepl_arg=''
-  make_arg=''
-
-[perl-String-Checker-mioga]
-recipe = hexagonit.recipe.cmmi
-url = http://packages.alixen.org/contribs/String-Checker-0.03.tar.gz
-md5sum = c750a33505609544f95eace7a2896c84
-configure-command =
-  ${perl:location}/bin/perl Makefile.PL
-
-[mioga]
-recipe = hexagonit.recipe.cmmi
-version = 2.4.16
-# No use re-using "version", the whole URL will change for the next one
-url = http://www.alixen.org/attachments/download/89/Mioga2-2.4.16.tar.gz
-md5sum = 1d2e76c798ee6d5f233011997200e125
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-buildinst = ${mioga:location}/buildinst
-static = ${mioga:location}/static
-environment =
-  MIOGA_BASE=${mioga:location}
-  MIOGA_BUILDINST=${mioga:buildinst}
-  MIOGA_STATIC=${mioga:static}
-  MIOGA_SITEPERL=${perl:siteprefix}
-  PATH=${libxslt:location}/bin:${libxml2:location}/bin:${perl:location}/bin:${perl:siteprefix}/bin:${rsync:location}/bin:%(PATH)s
-patch-options = -p1
-patches =
-  ${mioga-patch:location}/${mioga-patch:filename}
-# post-make-hook = ${mioga-postmakehook:location}/${mioga-postmakehook:filename}:post_make_hook
-pre-configure-hook = ${mioga-hooks:location}/${mioga-hooks:filename}:pre_configure_hook
-configure-command =
-  ${perl:location}/bin/perl Makefile.PL
-make-targets =
-  slapos-compilation
-keep-compile-dir = true
-perl-binary = ${perl:location}/bin/perl
-
-[mioga-patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-# md5sum = b836ad89902d1ea68b091a5b9800edd8
-download-only = true
-filename = ${:_buildout_section_name_}
-
-[mioga-hooks]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-# md5sum = c7ceec7788749238cb5fbe09beb647b1
-download-only = true
-filename = mioga-hooks.py
-
-[template]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance.cfg
-# md5sum = 
-output = ${buildout:directory}/template.cfg
-mode = 0644
-
-[template-apacheperl]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-apacheperl.cfg
-# md5sum = 
-output = ${buildout:directory}/template-apacheperl.cfg
-mode = 0644
-compile-directory = ${mioga:compile-directory}/Mioga2-${mioga:version}
-
-
-[template-postgres]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-postgres.cfg
-# md5sum = 
-output = ${buildout:directory}/template-postgres.cfg
-mode = 0644

software/unstable/tt-rss/development.cfg

-# Exactly the same as software.cfg, but fetch the slapos.cookbook and
-# slapos.toolbox from git repository instead of fetching stable version,
-# allowing to play with bleeding edge environment.
-
-# You'll need to run buildout twice for this profile.
-
-[buildout]
-extends =
-  ../../component/git/buildout.cfg
-  software.cfg
-
-
-parts +=
-# Development parts
-  slapos.cookbook-repository
-  slapos.core-repository
-  slapos.toolbox-repository
-  check-recipe
-
-develop =
-  ${:parts-directory}/slapos.cookbook-repository
-  ${:parts-directory}/slapos.core-repository
-  ${:parts-directory}/slapos.toolbox-repository
-
-
-[slapos.toolbox-repository]
-recipe = slapos.recipe.build:gitclone
-repository = https://lab.nexedi.com/nexedi/slapos.toolbox.git
-branch = master
-git-executable = ${git:location}/bin/git
-
-[slapos.cookbook-repository]
-recipe = slapos.recipe.build:gitclone
-repository = https://lab.nexedi.com/nexedi/slapos.git
-branch = tt-rss
-git-executable = ${git:location}/bin/git
-
-[slapos.core-repository]
-recipe = slapos.recipe.build:gitclone
-repository = https://lab.nexedi.com/nexedi/slapos.core.git
-branch = master
-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 &&
-  grep parts ${buildout:develop-eggs-directory}/slapos.core.egg-link &&
-  grep parts ${buildout:develop-eggs-directory}/slapos.toolbox.egg-link
-
-[versions]
-slapos.cookbook =
-slapos.toolbox =
-slapos.core =
-

software/unstable/tt-rss/instance-custom.cfg.in

-[buildout]
-
-# Run a SQL script to populate DB at first run
-[tt-rss-init]
-recipe = slapos.cookbook:apachephpconfigure
-table_name = db.ttrss_users
-#constraint = `pn_id`>0
-lampconfigure = ${buildout:bin-directory}/lampconfigure
-htdocs = $${apache-php:htdocs}
-mysql-username = $${apache-php:mysql-username}
-mysql-password = $${apache-php:mysql-password}
-mysql-database = $${apache-php:mysql-database}
-mysql-host = $${apache-php:mysql-host}
-mysql-port = $${apache-php:mysql-port}
-configureinstall-location = $${basedirectory:scripts}/configureInstall
-sql-script = ${sql-script:location}/${sql-script:filename}
-
-# Give the correct information to apache recipe to put the hostname in the
-# tt-rss config file
-[apache-php]
-application-url = $${request-frontend:connection-site_url}

software/unstable/tt-rss/software.cfg

-[buildout]
-extends =
-  ../../stack/lamp/buildout.cfg
-
-[versions]
-slapos.cookbook = 
-
-[application]
-recipe = slapos.recipe.build:download-unpacked
-url = https://github.com/gothfox/Tiny-Tiny-RSS/archive/1.7.8.tar.gz
-md5sum = efd7eec1629db379896fb7e74bba400e
-strip-top-level-dir = true
-
-[application-template]
-recipe = slapos.recipe.build:download
-url = ${:_profile_base_location_}/template/config.php.in
-#md5sum = Student may put here md5sum of this file, this is good idea
-filename = template.in
-mode = 0644
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-
-[application-configuration]
-location = config.php
-
-
-[sql-script]
-recipe = slapos.recipe.build:download
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-url = ${:_profile_base_location_}/script/tt-rss.sql
-#md5sum = c4d5f87d8f02cad3f20e679160195f48
-filename = tt-rss.sql
-mode = 0744
-
-# XXX Should disappear and be integrated into apachephpconfigure
-[configure-script]
-recipe = slapos.recipe.build:download
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-url = ${:_profile_base_location_}/configure-tt-rss.py
-#md5sum = c4d5f87d8f02cad3f20e679160195f48
-filename = configure-tt-rss.py
-mode = 0744
-
-[custom-application-deployment-template]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-custom.cfg.in
-output = ${buildout:directory}/instance-custom.cfg
-#md5sum = 283cb53ff8cd34635703e771062db919
-mode = 0644
-
-[custom-application-deployment]
-path = ${custom-application-deployment-template:output}
-part-list = tt-rss-init

software/unstable/tt-rss/template/config.php.in

-<?php
-  // *******************************************
-	// *** Database configuration (important!) ***
-	// *******************************************
-
-	define('DB_TYPE', "mysql"); // or mysql
-	define('DB_HOST', "%(mysql_host)s");
-	define('DB_USER', "%(mysql_user)s");
-	define('DB_NAME', "%(mysql_database)s");
-	define('DB_PASS', "%(mysql_password)s");
-
-	define('MYSQL_CHARSET', 'UTF8');
-	// Connection charset for MySQL. If you have a legacy database and/or experience
-	// garbage unicode characters with this option, try setting it to a blank string.
-
-	// ***********************************
-	// *** Basic settings (important!) ***
-	// ***********************************
-
-	define('SELF_URL_PATH', '%(url)s');
-	// Full URL of your tt-rss installation. This should be set to the
-	// location of tt-rss directory, e.g. http://yourserver/tt-rss/
-	// You need to set this option correctly otherwise several features
-	// including PUSH, bookmarklets and browser integration will not work properly.
-
-	define('SINGLE_USER_MODE', true);
-	// Operate in single user mode, disables all functionality related to
-	// multiple users.
-
-  define('SIMPLE_UPDATE_MODE', false);
-	// Enables fallback update mode where tt-rss tries to update feeds in
-	// background while tt-rss is open in your browser. 
-	// If you don't have a lot of feeds and don't want to or can't run 
-	// background processes while not running tt-rss, this method is generally 
-	// viable to keep your feeds up to date.
-	// Still, there are more robust (and recommended) updating methods 
-	// available, you can read about them here: http://tt-rss.org/wiki/UpdatingFeeds
-
-
-	// *****************************
-	// *** Files and directories ***
-	// *****************************
-
-  //FIXME
-	define('PHP_EXECUTABLE', '/usr/bin/php');
-	// Path to PHP executable, used for various command-line tt-rss programs
-
-
-  define('LOCK_DIRECTORY', 'lock');
-	// Directory for lockfiles, must be writable to the user you run
-	// daemon process or cronjobs under.
-
-	define('CACHE_DIR', 'cache');
-	// Local cache directory for RSS feed content.
-
-	define('ICONS_DIR', "feed-icons");
-	define('ICONS_URL', "feed-icons");
-	// Local and URL path to the directory, where feed favicons are stored.
-	// Unless you really know what you're doing, please keep those relative
-	// to tt-rss main directory.
-
-	// **********************
-	// *** Authentication ***
-	// **********************
-
-	// Please see PLUGINS below to configure various authentication modules.
-
-	define('AUTH_AUTO_CREATE', true);
-	// Allow authentication modules to auto-create users in tt-rss internal
-	// database when authenticated successfully.
-
-	define('AUTH_AUTO_LOGIN', true);
-	// Automatically login user on remote or other kind of externally supplied
-	// authentication, otherwise redirect to login form as normal.
-	// If set to true, users won't be able to set application language
-	// and settings profile.
-
-	// *********************
-	// *** Feed settings ***
-	// *********************
-
-	define('FORCE_ARTICLE_PURGE', 0);
-	// When this option is not 0, users ability to control feed purging
-	// intervals is disabled and all articles (which are not starred) 
-	// older than this amount of days are purged.
-
-	// *** PubSubHubbub settings ***
-
-	define('PUBSUBHUBBUB_HUB', '');
-	// URL to a PubSubHubbub-compatible hub server. If defined, "Published
-	// articles" generated feed would automatically become PUSH-enabled.
-
-	define('PUBSUBHUBBUB_ENABLED', false);
-	// Enable client PubSubHubbub support in tt-rss. When disabled, tt-rss
-	// won't try to subscribe to PUSH feed updates.
-
-	// *********************
-	// *** Sphinx search ***
-	// *********************
-
-	define('SPHINX_ENABLED', false);
-	// Enable fulltext search using Sphinx (http://www.sphinxsearch.com)
-	// Please see http://tt-rss.org/wiki/SphinxSearch for more information.
-
-	define('SPHINX_INDEX', 'ttrss');
-	// Index name in Sphinx configuration. You can specify multiple indexes
-	// as a comma-separated string.
-
-	// ***********************************
-	// *** Self-registrations by users ***
-	// ***********************************
-
-	define('ENABLE_REGISTRATION', false);
-	// Allow users to register themselves. Please be vary that allowing
-	// random people to access your tt-rss installation is a security risk
-	// and potentially might lead to data loss or server exploit. Disabled
-	// by default.
-
-	define('REG_NOTIFY_ADDRESS', 'user@your.domain.dom');
-	// Email address to send new user notifications to.
-
-	define('REG_MAX_USERS', 10);
-	// Maximum amount of users which will be allowed to register on this
-	// system. 0 - no limit.
-
-	// **********************************
-	// *** Cookies and login sessions ***
-	// **********************************
-	
-	define('SESSION_COOKIE_LIFETIME', 86400*30);
-	// Default lifetime of a session (e.g. login) cookie. In seconds, 
-	// 0 means cookie will be deleted when browser closes.
-	// Setting this to zero will affect several user preferences
-	// like widescreen mode not saving.
-
-	define('SESSION_EXPIRE_TIME', 86400*30);
-	// Hard expiration limit for sessions. Should be
-	// greater or equal to SESSION_COOKIE_LIFETIME
-
-	define('SESSION_CHECK_ADDRESS', 1);
-	// Check client IP address when validating session:
-	// 0 - disable checking
-	// 1 - check first 3 octets of an address (recommended)
-	// 2 - check first 2 octets of an address
-	// 3 - check entire address
-
-	// *********************************
-	// *** Email and digest settings ***
-	// *********************************
-
-	define('SMTP_FROM_NAME', 'Tiny Tiny RSS');
-	define('SMTP_FROM_ADDRESS', 'noreply@your.domain.dom');
-	// Name, address and subject for sending outgoing mail. This applies
-	// to password reset notifications, digest emails and any other mail.
-
-	define('DIGEST_SUBJECT', '[tt-rss] New headlines for last 24 hours');
-	// Subject line for email digests
-
-	define('SMTP_HOST', '');
-	// SMTP Host to send outgoing mail. Blank - use system MTA.
-	
-	define('SMTP_PORT','');
-	// SMTP port to sent outgoing mail. Default is 25.
-
-	define('SMTP_LOGIN', '');
-	define('SMTP_PASSWORD', '');
-	// These two options enable SMTP authentication when sending
-	// outgoing mail. Only used with SMTP_HOST
-
-	// ***************************************
-	// *** Other settings (less important) ***
-	// ***************************************
-
-	define('CHECK_FOR_NEW_VERSION', false);
-	// Check for new versions of tt-rss automatically.
-
-	define('ENABLE_GZIP_OUTPUT', false);
-	// Selectively gzip output to improve wire performance. This requires
-	// PHP Zlib extension on the server.
-	// Enabling this can break tt-rss in several httpd/php configurations,
-	// if you experience weird errors and tt-rss failing to start, blank pages
-	// after login, or content encoding errors, disable it.
-
-	define('PLUGINS', 'auth_remote, auth_internal, note');
-	// Comma-separated list of plugins to load automatically for all users.
-	// System plugins have to be specified here. Please enable at least one
-	// authentication plugin here (auth_*).
-	// Users may enable other user plugins from Preferences/Plugins but may not
-	// disable plugins specified in this list.
-
-	define('CONFIG_VERSION', 26);
-	// Expected config version. Please update this option in config.php
-	// if necessary (after migrating all new options from this file).
-
-	// vim:ft=php
-?>

stack/caucase/buildout.cfg

@@ -37,4 +37,7 @@ depends = ${caucase-jinja2-library-eggs:eggs}
 [versions]
 caucase = 0.9.12
 pem = 21.1.0
+PyJWT = 2.4.0
+
+[versions:python2]
 PyJWT = 1.7.1

stack/erp5/buildout.cfg

@@ -59,6 +59,8 @@ extends =
   ../../component/wendelin.core/buildout.cfg
   ../../component/jupyter-py2/buildout.cfg
   ../../component/pygolang/buildout.cfg
+  ../../component/bcrypt/buildout.cfg
+  ../../component/python-pynacl/buildout.cfg
   ../../stack/caucase/buildout.cfg
   ../../software/neoppod/software-common.cfg
 # keep neoppod extends last
@@ -488,6 +490,8 @@ eggs = ${neoppod:eggs}
   mock
   oauthlib
   objgraph
+  ${python-pynacl:egg}
+  ${bcrypt:egg}
   paramiko
   ply
   pyflakes
@@ -740,7 +744,6 @@ pprofile = 2.0.4
 pyasn1-modules = 0.0.8
 pycountry = 17.1.8
 pycrypto = 2.6.1
-pycurl = 7.43.0
 pyflakes = 1.5.0
 python-memcached = 1.58
 pytracemalloc = 1.2
@@ -765,7 +768,6 @@ dask = 0.18.1
 toolz = 0.9.0
 zope.globalrequest = 1.5
 waitress = 1.4.4
-xlrd = 1.1.0
 fpconst = 0.7.2
 graphviz = 0.5.2
 olefile = 0.44
@@ -773,11 +775,8 @@ python-libmilter = 1.0.3
 zope.app.debug = 3.4.1
 zope.app.dependable = 3.5.1
 zope.app.form = 4.0.2
-et-xmlfile = 1.0.1
-h5py = 2.7.1
 mpmath = 0.19
 openpyxl = 2.4.8
-sympy = 1.1.1
 jdcal = 1.3
 deepdiff = 3.3.0
 unidiff = 0.5.5

stack/slapos.cfg

@@ -167,7 +167,7 @@ importlib-metadata = 1.7.0:whl
 inotify-simple = 1.1.1
 itsdangerous = 0.24
 lock-file = 2.0
-lxml = 4.6.5
+lxml = 4.9.1
 meld3 = 1.0.2
 mock = 3.0.5
 more-itertools = 5.0.0
@@ -179,7 +179,7 @@ plone.recipe.command = 1.1
 prettytable = 0.7.2
 psutil = 5.8.0
 pluggy = 0.13.1:whl
-py = 1.9.0:whl
+py = 1.11.0:whl
 pyOpenSSL = 19.1.0
 pyparsing = 3.0.9:whl
 py-mld = 1.0.3
@@ -208,12 +208,14 @@ unicodecsv = 0.14.1
 wcwidth = 0.2.5
 wheel = 0.35.1:whl
 xml-marshaller = 1.0.2
-zc.lockfile = 1.0.2
+zc.lockfile = 1.4
 zdaemon = 4.2.0
 zipp = 1.2.0:whl
 zodburi = 2.5.0
 zope.event = 4.5.0
-paramiko = 2.1.3
+paramiko = 2.11.0
+PyNaCl = 1.3.0
+bcrypt = 3.1.4
 CacheControl = 0.12.6:whl
 msgpack = 0.6.2
 Flask = 1.1.2
@@ -235,7 +237,6 @@ pytest-runner = 5.2:whl
 ipaddress = 1.0.23
 jsonschema = 3.0.2:whl
 lockfile = 0.12.2:whl
-# XXX 'slapos node format' raises an exception with netifaces 0.10.5.
 netifaces = 0.10.7
 packaging = 16.8
 passlib = 1.7.1