Update release candidate

component/apache-php/buildout.cfg

@@ -3,6 +3,7 @@ parts = apache-php
 
 extends =
   ../apache/buildout.cfg
+  ../argon2/buildout.cfg
   ../bzip2/buildout.cfg
   ../cclient/buildout.cfg
   ../curl/buildout.cfg
@@ -56,6 +57,7 @@ configure-options =
 environment =
   PATH=${autoconf:location}/bin:${automake:location}/bin:${m4:location}/bin:${apache-php:location}/bin:%(PATH)s
 
+
 [apache-php]
 # Note: Shall react on each build of apache and reinstall itself
 recipe = slapos.recipe.cmmi
@@ -85,6 +87,7 @@ configure-options =
   --with-openssl=${openssl:location}
   --with-libzip=${libzip:location}
   --with-icu-dir=${icu:location}
+  --with-password-argon2=${argon2:location}
   --enable-apcu-bc
   --enable-intl
   --enable-libxml
@@ -106,7 +109,7 @@ environment =
   PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${libzip:location}/lib/pkgconfig
   PATH=${pkgconfig:location}/bin:${bzip2:location}/bin:${libxml2:location}/bin:%(PATH)s
   CPPFLAGS=-I${libzip:location}/include
-  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -Wl,-rpath -Wl,${curl:location}/lib -L${libtool:location}/lib -Wl,-rpath -Wl,${libtool:location}/lib -L${mariadb:location}/lib -Wl,-rpath -Wl,${mariadb:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${libmcrypt:location}/lib -Wl,-rpath -Wl,${libmcrypt:location}/libblkid -L${libzip:location}/lib -Wl,-rpath -Wl,${libzip:location}/lib
+  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -Wl,-rpath -Wl,${curl:location}/lib -L${libtool:location}/lib -Wl,-rpath -Wl,${libtool:location}/lib -L${mariadb:location}/lib -Wl,-rpath -Wl,${mariadb:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${libmcrypt:location}/lib -Wl,-rpath -Wl,${libmcrypt:location}/libblkid -L${libzip:location}/lib -Wl,-rpath -Wl,${libzip:location}/lib -L${argon2:location}/lib/x86_64-linux-gnu -Wl,-rpath -Wl,${argon2:location}/lib/x86_64-linux-gnu
   TMPDIR=${buildout:parts-directory}/${:_buildout_section_name_}
   HOME=${apache:location}
 

component/argon2/buildout.cfg

+[buildout]
+
+parts =
+  argon2
+
+
+[argon2]
+recipe = slapos.recipe.cmmi
+url = https://github.com/P-H-C/phc-winner-argon2/archive/20190702.tar.gz
+md5sum = 0f234cc21ac6cebfe373da6afa70bb1d
+configure-command = :
+make-options =
+  PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}
\ No newline at end of file

slapos/test/recipe/test_pbs.py

@@ -27,7 +27,7 @@ class PBSTest(unittest.TestCase):
                                 local_dir='TEST_LOCAL_DIR',
                                 remote_dir='TEST_REMOTE_DIR',
                                 rdiff_wrapper_path=rdiff_wrapper.name)
-            content = rdiff_wrapper.read()
+            content = open(rdiff_wrapper.name, 'r').read()
             self.assertIn('--remote-schema TEST_REMOTE_SCHEMA', content)
             self.assertIn('TEST_LOCAL_DIR', content)
             self.assertIn('TEST_REMOTE_DIR', content)
@@ -41,7 +41,7 @@ class PBSTest(unittest.TestCase):
                                 remote_dir='TEST_REMOTE_DIR',
                                 rdiff_wrapper_path=rdiff_wrapper.name,
                                 remove_backup_older_than='TEST_OLDER')
-            content = rdiff_wrapper.read()
+            content = open(rdiff_wrapper.name, 'r').read()
             self.assertIn('--remote-schema TEST_REMOTE_SCHEMA', content)
             self.assertIn('TEST_LOCAL_DIR', content)
             self.assertIn('TEST_REMOTE_DIR', content)

slapos/test/recipe/test_plugin.py

 import os, shutil, tempfile, unittest
 from slapos.recipe import promise_plugin
 from slapos.test.utils import makeRecipe
+from pprint import pformat
 import stat, json
 
 class TestPromisePlugin(unittest.TestCase):
@@ -33,7 +34,7 @@ in multi line
     recipe.install()
 
     self.assertTrue(os.path.exists(self.output))
-    with open(self.output) as f:
+    with open(self.output, 'r') as f:
       content = f.read()
     self.assertIn("from slapos.promise.plugin.check_site_available import RunPromise", content)
     self.assertEqual(stat.S_IMODE(os.stat(self.output).st_mode), int('644', 8))
@@ -44,7 +45,7 @@ in multi line
       param3=self.options['config-param3'],
       param4=self.options['config-param4'],
     )
-    self.assertIn('extra_config_dict = json.loads("""%s""", strict=False)' % json.dumps(expected_dict, indent=2, sort_keys=True), content)
+    self.assertIn('extra_config_dict = %s' % pformat(expected_dict, indent=2), content)
 
   def test_no_module_set(self):
     recipe = makeRecipe(
@@ -67,7 +68,7 @@ in multi line
     with open(self.output) as f:
       content = f.read()
     self.assertIn("from slapos.promise.plugin.check_site_available import RunPromise", content)
-    self.assertIn('extra_config_dict = json.loads("""{}""", strict=False)', content)
+    self.assertIn('extra_config_dict = { }', content)
 
 
   def test_bad_parameters(self):
@@ -84,8 +85,8 @@ in multi line
     with open(self.output) as f:
       content = f.read()
 
-    expected_param1 = '"param1; print \\"toto\\"": "#xxxx\\"\\nimport os; os.stat(f)",'
-    expected_param2 = '"param2\\n@domething": "\\"#$$*PPP\\n\\n p = 2*5; print \\"result is %s\\" % p"'
+    expected_param1 = r"""'param1; print "toto"': '#xxxx"\nimport os; os.stat(f)',"""
+    expected_param2 = r"""'param2\n@domething': '"#$$*PPP\n\n p = 2*5; print "result is %s" % p'"""
     self.assertIn(expected_param1, content)
     self.assertIn(expected_param2, content)
 

software/caddy-frontend/buildout.hash.cfg

@@ -118,4 +118,4 @@ md5sum = 38792c2dceae38ab411592ec36fff6a8
 
 [template-kedifa]
 filename = instance-kedifa.cfg.in
-md5sum = 299cea88789c8904e0e4414a55fd3a5c
+md5sum = 2136723657cb10bafea4fe6bff7b6481

software/caddy-frontend/common.cfg

@@ -36,7 +36,7 @@ parts +=
 recipe = slapos.recipe.build:gitclone
 repository = https://lab.nexedi.com/nexedi/kedifa.git
 git-executable = ${git:location}/bin/git
-revision = c89c31a5cdc9367e196411d91c4dcd0229bb7893
+revision = 70cb07427bc68c23092ec38ad5ce95c9c0c64519
 
 [kedifa-develop]
 recipe = zc.recipe.egg:develop

software/caddy-frontend/instance-kedifa.cfg.in

@@ -5,11 +5,13 @@
 extends =
   {{ parameter_dict['common_profile'] }}
   {{ parameter_dict['monitor_template'] }}
+  {{ parameter_dict['logrotate_base_instance'] }}
 
 parts =
   monitor-base
   directory
   kedifa
+  logrotate-entry-kedifa
   promise-kedifa-http-reply
   slave-kedifa-information
   caucased
@@ -213,6 +215,7 @@ ca-certificate = ${directory:etc-kedifa}/ca-certificate.pem
 crl = ${directory:etc-kedifa}/crl.pem
 template-csr = ${directory:etc-kedifa}/template-csr.pem
 pidfile = ${directory:run}/kedifa.pid
+logfile = ${directory:log}/kedfia.log
 
 [kedifa-reloader]
 recipe = slapos.cookbook:wrapper
@@ -223,11 +226,17 @@ wrapper-path = ${directory:etc-run}/kedifa-reloader
 <= promise-plugin-base
 module = check_url_available
 name = kedifa-http-reply.py
-# Kedifa replies 500 on /, so use it to be sure that Kedifa replied
-config-http_code = 500
+# Kedifa replies 400 on /, so use it to be sure that Kedifa replied
+config-http_code = 400
 config-url = https://[${kedifa-config:ip}]:${kedifa-config:port}
 config-ca-cert-file = ${kedifa-config:ca-certificate}
 
+[logrotate-entry-kedifa]
+<= logrotate-entry-base
+name = kedifa
+log = ${kedifa-config:logfile}
+rotate-num = 30
+
 [kedifa]
 recipe = slapos.cookbook:wrapper
 command-line = {{ parameter_dict['kedifa'] }}
@@ -238,6 +247,7 @@ command-line = {{ parameter_dict['kedifa'] }}
   --ca-certificate ${kedifa-config:ca-certificate}
   --crl ${kedifa-config:crl}
   --pidfile ${kedifa-config:pidfile}
+  --logfile ${kedifa-config:logfile}
 
 wrapper-path = ${directory:service}/kedifa
 hash-files = ${buildout:directory}/software_release/buildout.cfg

software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_file_list_log-CADDY.txt

 T-0/var/log/slapgrid-T-0-error.log
-T-1/var/log/expose-csr_id.log
\ No newline at end of file
+T-1/var/log/expose-csr_id.log
+T-1/var/log/kedfia.log
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_file_list_log-CADDY.txt

 T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
+T-1/var/log/kedfia.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
 T-2/var/log/httpd-csr_id/expose-csr_id.log

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_log-CADDY.txt

 T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
+T-1/var/log/kedfia.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
 T-2/var/log/httpd-csr_id/expose-csr_id.log

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_log-CADDY.txt

 T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
+T-1/var/log/kedfia.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
 T-2/var/log/httpd-csr_id/expose-csr_id.log

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_log-CADDY.txt

 T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
+T-1/var/log/kedfia.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
 T-2/var/log/httpd-csr_id/expose-csr_id.log

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_log-CADDY.txt

 T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
+T-1/var/log/kedfia.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
 T-2/var/log/httpd-csr_id/expose-csr_id.log

software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_file_list_log-CADDY.txt

 T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
+T-1/var/log/kedfia.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
 T-2/var/log/httpd-csr_id/expose-csr_id.log

software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_log-CADDY.txt

 T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
-T-1/var/log/expose-csr_id.log
\ No newline at end of file
+T-1/var/log/expose-csr_id.log
+T-1/var/log/kedfia.log
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_log-CADDY.txt

 T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
-T-1/var/log/expose-csr_id.log
\ No newline at end of file
+T-1/var/log/expose-csr_id.log
+T-1/var/log/kedfia.log
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_file_list_log-CADDY.txt

 T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
+T-1/var/log/kedfia.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
 T-2/var/log/httpd-csr_id/expose-csr_id.log

software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_log-CADDY.txt

 T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
+T-1/var/log/kedfia.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
 T-2/var/log/httpd-csr_id/expose-csr_id.log

software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_file_list_log-CADDY.txt

 T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
+T-1/var/log/kedfia.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
 T-2/var/log/httpd-csr_id/expose-csr_id.log

software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_file_list_log-CADDY.txt

 T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
+T-1/var/log/kedfia.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
 T-2/var/log/httpd-csr_id/expose-csr_id.log

software/caddy-frontend/test/test_data/test.TestSlave.test_file_list_log-CADDY.txt

 T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
+T-1/var/log/kedfia.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
 T-2/var/log/httpd-cache-direct/_enable_cache-disable-no-cache-request_access_log

software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_file_list_log-CADDY.txt

 T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
+T-1/var/log/kedfia.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
 T-2/var/log/httpd-csr_id/expose-csr_id.log

software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test_file_list_log-CADDY.txt

 T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
+T-1/var/log/kedfia.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
 T-2/var/log/httpd-csr_id/expose-csr_id.log

software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_file_list_log-CADDY.txt

 T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
+T-1/var/log/kedfia.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
 T-2/var/log/httpd-cache-direct/_enable_cache-disable-no-cache-request_access_log

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_file_list_log-CADDY.txt

 T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
+T-1/var/log/kedfia.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
 T-2/var/log/httpd-csr_id/expose-csr_id.log

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_file_list_log-CADDY.txt

 T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
+T-1/var/log/kedfia.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
 T-2/var/log/httpd-csr_id/expose-csr_id.log

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_file_list_log-CADDY.txt

 T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
+T-1/var/log/kedfia.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
 T-2/var/log/httpd-csr_id/expose-csr_id.log

software/nayuos/instance.cfg

@@ -99,7 +99,7 @@ context =
 recipe = slapos.recipe.template:jinja2
 template = {{ software_dir }}/scripts/cros_full_build.in
 rendered = ${directory:run}/cros_full_build
-md5sum = 5227b64852644d9874e3f67254f243ef
+md5sum = 5b00c5a841fdef28d8d8e373ea5c4e3b
 mode = 0700
 context =
   key bash_path                         bin:bash

software/nayuos/scripts/cros_full_build.in

@@ -276,7 +276,7 @@ crew() {
   if [[ ! -x /usr/local/bin/crew ]] ; then
     read -p "Chromebrew is not on this machine; do you want to install it? [Y/n] " -r -n 1 crew_install
     echo ""
-    if [[ ! $crew_install =~ ^[Nn]$ ]] ; then
+    if [[ ! \$crew_install =~ ^[Nn]$ ]] ; then
         echo "Fetching installation file..."
               curl -Ls https://lab.nexedi.com/nexedi/chromebrew/raw/nexedi/install.sh | bash
     else

software/nayuos/software.cfg

@@ -26,7 +26,7 @@ recipe = slapos.recipe.template:jinja2
 template = ${:_profile_base_location_}/instance.cfg
 rendered = ${buildout:directory}/instance.cfg
 mode = 0644
-md5sum = 462a8632f90a121029a90785a62841c4
+md5sum = 8a8af23968a57af9a3c82fc11e7bd193
 context =
   key software_dir            :_profile_base_location_
   key instance_dir            buildout:directory

stack/slapos.cfg

@@ -140,7 +140,7 @@ slapos.cookbook = 1.0.92
 slapos.core = 1.4.25
 slapos.extension.strip = 0.4
 slapos.extension.shared = 1.0
-slapos.libnetworkcache = 0.18
+slapos.libnetworkcache = 0.19
 slapos.rebootstrap = 4.1
 slapos.recipe.build = 0.41
 slapos.recipe.cmmi = 0.10