Update LAMP stack (and nextcloud) to use python3

See merge request !1163

software/gitlab/buildout.hash.cfg

@@ -54,11 +54,11 @@ md5sum = 0f1ec4077dab586cc003ae13f689eda2
 
 [instance-gitlab.cfg.in]
 _update_hash_filename_ = instance-gitlab.cfg.in
-md5sum = c115c88d5798dcb5e16b9d50432f2551
+md5sum = 0b023c7efd027f65b14e752484be2ec7
 
 [instance-gitlab-export.cfg.in]
 _update_hash_filename_ = instance-gitlab-export.cfg.in
-md5sum = da2e3d6f67c92233d370dae55fb3b35f
+md5sum = 9ed8220bb3ad71ff7e8638354127412c
 
 [instance-gitlab-test.cfg.in]
 _update_hash_filename_ = instance-gitlab-test.cfg.in

software/gitlab/instance-gitlab-export.cfg.in

@@ -74,7 +74,7 @@ context =
   raw     unicorn_script          ${service-unicorn:wrapper-path}
   raw     sidekiq_script          ${service-sidekiq:wrapper-path}
   raw     gitlab_backup_dir       ${gitlab-backup-directory:backup-gitlab.git}
-  raw     redis_pid_file          ${service-redis:pid_file}
+  raw     redis_pid_file          ${service-redis:pid-file}
   raw     postgres_pid_file       ${service-postgresql:pgdata-directory}/postmaster.pid
   raw     gitlab_work_location    ${gitlab-work:location}
   raw     promise_lab_location    ${directory:promise.slow}

software/gitlab/instance-gitlab.cfg.in

@@ -497,19 +497,20 @@ log     = ${directory:log}/redis
 [service-redis]
 recipe  = slapos.cookbook:redis.server
 wrapper = ${directory:service}/redis
-promise_wrapper = ${directory:bin}/redis-promise
-
-server_dir  = ${redis:srv}
-config_file = ${directory:etc}/redis.conf
-log_file    = ${redis:log}/redis.log
-pid_file    = ${directory:run}/redis.pid
-use_passwd  = false
-unixsocket  = ${:server_dir}/redis.socket
+promise-wrapper = ${directory:bin}/redis-promise
+
+server-dir  = ${redis:srv}
+config-file = ${directory:etc}/redis.conf
+log-file    = ${redis:log}/redis.log
+pid-file    = ${directory:run}/redis.pid
+use-passwd  = false
+unixsocket  = ${:server-dir}/redis.socket
 # port = 0 means "don't listen on TCP at all" - listen only on unix socket
 ipv6    = ::1
 port    = 0
 
-server_bin  = {{ redis_binprefix }}/redis-server
+server-bin  = {{ redis_binprefix }}/redis-server
+cli-bin  = {{ redis_binprefix }}/redis-cli
 depend  =
     ${logrotate-entry-redis:recipe}
 
@@ -517,9 +518,7 @@ depend  =
 <= monitor-promise-base
 promise = check_command_execute
 name = promise-redis.py
-config-command = ${service-redis:promise_wrapper}
-
-# NOTE slapos.cookbook:redis.server setups promise automatically
+config-command = ${service-redis:promise-wrapper}
 
 [logrotate-entry-redis]
 <= logrotate-entry-base

software/matomo/software.cfg

@@ -17,10 +17,6 @@ parts =
 # to create file instance.cfg of all instances
   instance
 
-#to make sure we use python3
-[python]
-part = python3
-
 # download bas
 # inherited by modules that need to download files
 [matomo-download]

software/nextcloud/buildout.hash.cfg

@@ -26,4 +26,4 @@ md5sum = 6f42f0a8c5e5c0c657541a65c4d9ee57
 
 [template-nextcloud-instance]
 filename = nextcloud-instance.cfg.in
-md5sum = 495b1693e451f6c5044c67ce5f1194fe
+md5sum = 4426b5e62c61efec2e68e7f548bc6463

software/nextcloud/nextcloud-input-schema.json

@@ -129,6 +129,11 @@
       "title": "Third authorized domain on nextcloud",
       "description": "Trusted domain used to connect to Nextcloud instance.",
       "type": "string"
+    },
+    "instance.trusted-proxy-list": {
+      "title": "Trusted proxies",
+      "description": "IP adresses of trusted proxies, space separated.",
+      "type": "string"
     }
   }
 }

software/nextcloud/nextcloud-instance.cfg.in

@@ -12,17 +12,18 @@ backup   = ${directory:backup}/nextcloud
 [service-redis]
 recipe  = slapos.cookbook:redis.server
 wrapper = ${directory:services}/redis
-promise_wrapper = ${directory:bin}/redis-promise
-server_dir  = ${nc-directory:redis}
-config_file = ${directory:etc}/redis.conf
-log_file    = ${nc-directory:redis-log}/redis.log
-pid_file    = ${directory:run}/redis.pid
-use_passwd  = false
-unixsocket  = ${:server_dir}/redis.socket
+promise-wrapper = ${directory:bin}/redis-promise
+server-dir  = ${nc-directory:redis}
+config-file = ${directory:etc}/redis.conf
+log-file    = ${nc-directory:redis-log}/redis.log
+pid-file    = ${directory:run}/redis.pid
+use-passwd  = false
+unixsocket  = ${:server-dir}/redis.socket
 # port = 0 means "don't listen on TCP at all" - listen only on unix socket
 ipv6    = ::1
 port    = 0
-server_bin  = {{ redis_bin }}
+server-bin  = {{ redis_bin }}
+cli-bin  = {{ redis_cli }}
 depend  =
     ${logrotate-entry-redis:recipe}
 
@@ -30,7 +31,7 @@ depend  =
 <= monitor-promise-base
 promise = check_command_execute
 name = redis.py
-config-command = ${service-redis:promise_wrapper}
+config-command = ${service-redis:promise-wrapper}
 
 [logrotate-entry-redis]
 <= logrotate-entry-base

software/nextcloud/test/test.py

@@ -272,7 +272,7 @@ class TestServices(NextCloudTestCase):
     news_config_file = os.path.join(self.partition_dir, 'srv/data/news/config/config.ini')
     with open(news_config_file) as f:
       config = f.read()
-    self.assertRegexpMatches(config, r"(useCronUpdates\s+=\s+false)")
+    self.assertRegex(config, r"(useCronUpdates\s+=\s+false)")
 
 
 class TestNextCloudParameters(NextCloudTestCase):

software/slapos-sr-testing/software-py3.cfg

@@ -21,6 +21,7 @@ extra =
   jupyter ${slapos.test.jupyter-setup:setup}
   matomo ${slapos.test.matomo-setup:setup}
   monitor ${slapos.test.monitor-setup:setup}
+  nextcloud ${slapos.test.nextcloud-setup:setup}
   nginx-push-stream ${slapos.test.nginx-push-stream-setup:setup}
   plantuml ${slapos.test.plantuml-setup:setup}
   powerdns ${slapos.test.powerdns-setup:setup}

software/slapos-sr-testing/software.cfg

@@ -371,7 +371,6 @@ extra =
   htmlvalidatorserver ${slapos.test.htmlvalidatorserver-setup:setup}
   jscrawler ${slapos.test.jscrawler-setup:setup}
   jstestnode ${slapos.test.jstestnode-setup:setup}
-  nextcloud ${slapos.test.nextcloud-setup:setup}
   re6stnet ${slapos.test.re6stnet-setup:setup}
   seleniumserver ${slapos.test.seleniumserver-setup:setup}
   slapos-master ${slapos.test.slapos-master-setup:setup}

stack/lamp/buildout.cfg

@@ -38,6 +38,9 @@ url = ${:_profile_base_location_}/${:filename}
 [application]
 recipe = slapos.recipe.build:download-unpacked
 
+[python]
+part = python3
+
 #----------------
 #--
 #-- Optional part allowing applications using this stack to run a custom

stack/slapos.cfg

@@ -189,7 +189,7 @@ setproctitle = 1.1.10
 setuptools-dso = 1.7
 rubygemsrecipe  = 0.4.3
 six = 1.12.0
-slapos.cookbook = 1.0.237
+slapos.cookbook = 1.0.244
 slapos.core = 1.7.6
 slapos.extension.strip = 0.4
 slapos.extension.shared = 1.0