Merge branch 'main' into stable

manifests/app_type.pp

@@ -60,6 +60,9 @@ define sunetdrive::app_type (
   } else {
     $php_memory_limit_mb = 512
   }
+  if $::facts['dockerhost2'] == 'yes' {
+    $hostnet = true
+  }
 
   # These are encrypted values from local.eyaml
 

manifests/lookup.pp

@@ -14,7 +14,7 @@ class sunetdrive::lookup (
   $nextcloud_ip = hiera_array("${location}_app", [])
   $tug_office = hiera_array('tug_office')
 
-  $dbhost = 'proxysql_proxysql_1'
+  $dbhost = '127.0.0.1'
   $gss_jwt_key = safe_hiera('gss_jwt_key')
   $replication_auth = safe_hiera('replication_auth')
   $mysql_user_password = safe_hiera('mysql_user_password')
@@ -25,7 +25,7 @@ class sunetdrive::lookup (
   user { 'www-data': ensure => present, system => true }
 
   file { '/opt/lookup/config.php':
-    ensure  => present,
+    ensure  => file,
     owner   => 'www-data',
     group   => 'root',
     content => template('sunetdrive/lookup/config.php.erb'),

manifests/proxysql.pp

@@ -26,6 +26,9 @@ class sunetdrive::proxysql (
   $mysql_user = safe_hiera('mysql_user')
 
   $transaction_persistent = 1
+  if $::facts['dockerhost2'] == 'yes' {
+    $hostnet = true
+  }
 
   file { '/usr/local/bin/proxysql':
     ensure  => file,

templates/application/config.php.erb

@@ -25,7 +25,11 @@ $CONFIG = array (
   'csrf.disabled' => true,
   'datadirectory' => '/var/www/html/data',
   'davstorage.request_timeout' => 86401,
+<%- if @hostnet -%>
+  'dbhost' => '127.0.0.1',
+<%- else -%>
   'dbhost' => '<%= @dbhost %>',
+<%- end -%>
   'dbname' => '<%= @dbname %>',
   'dbpassword' => '<%= @mysql_user_password %>',
   'dbport' => '3306',
@@ -93,6 +97,7 @@ $CONFIG = array (
       'region' => 'us-east-1',
       'hostname' => '<%= @s3_host %>',
       'port' => '',
+      'useMultipartCopy' => false,
       'objectPrefix' => 'urn:oid:',
       'autocreate' => false,
       'use_ssl' => true,
@@ -122,6 +127,24 @@ $CONFIG = array (
     ],
     'timeout' => 1.1
   ],
+<% elsif @location == 'gss-prod' -%>
+  'redis.cluster' => [
+    'failover_mode' => \RedisCluster::FAILOVER_ERROR,
+    'password' => '<%= @redis_cluster_password %>',
+    'read_timeout' => 0.0,
+    'seeds' => [
+      'redis1.drive.sunet.se:6379',
+      'redis2.drive.sunet.se:6379',
+      'redis3.drive.sunet.se:6379',
+      'redis1.drive.sunet.se:6380',
+      'redis2.drive.sunet.se:6380',
+      'redis3.drive.sunet.se:6380',
+      'redis1.drive.sunet.se:6381',
+      'redis2.drive.sunet.se:6381',
+      'redis3.drive.sunet.se:6381'
+    ],
+    'timeout' => 1.1
+  ],
 <% elsif @environment == 'test' && ! @is_multinode -%>
   'redis.cluster' => [
     'failover_mode' => \RedisCluster::FAILOVER_ERROR,

templates/application/docker-compose_nextcloud.yml.erb

@@ -6,6 +6,9 @@ services:
     image:  docker.sunet.se/drive/nextcloud-custom:<%= @nextcloud_version %>
     restart: always
     container_name: nextcloud_app_1
+<%- if @hostnet -%>
+    network_mode: host
+<%- end -%>
     environment:
       - NC_PASS=<%= @admin_password%>
     volumes:
@@ -28,18 +31,24 @@ services:
 <% if @location =~ /^kau/ -%>
       - /mnt:/opt/tmp/
 <%- end -%>
+<%- if ! @hostnet -%>
     networks:
       - default
       - proxysql_proxysql
+<%- end -%>
     dns:
       - 89.46.20.75
       - 89.46.21.29
       - 89.32.32.32
+<%- if !@hostnet -%>
     ports:
       - 443:443
+<%- end -%>
     command: sh -c 'tail -f  /var/www/html/data/nextcloud.log | tee -a /proc/1/fd/2 & apachectl -D FOREGROUND'
     tty: true
 
+<%- if !@hostnet -%>
 networks:
   proxysql_proxysql:
     external: true
+<%- end -%>

templates/lookup/docker-compose_lookup.yml.erb

@@ -3,13 +3,12 @@ version: '3.2'
 services:
 
   app:
+    container_name: lookup_app_1
     image:  docker.sunet.se/drive/nextcloud-lookup:<%= @lookup_version %>
     restart: always
     volumes:
       - /opt/lookup/config.php:/var/www/html/config/config.php
-    networks:
+    network_mode: host
-      - default
-      - proxysql_proxysql
     dns:
       - 89.46.20.75
       - 89.46.21.29
@@ -18,7 +17,3 @@ services:
       - 443:443
     command: apachectl -D FOREGROUND
     tty: true
-
-networks:
-  proxysql_proxysql:
-    external: true

templates/proxysql/docker-compose_proxysql.yml.erb

@@ -5,18 +5,24 @@ services:
   proxysql:
     image: docker.sunet.se/drive/proxysql:<%= @proxysql_version %>
     container_name: proxysql_proxysql_1
+<%- if @hostnet -%>
+    network_mode: host
+<%- else -%>
     ports:
       - 3306:3306
       - 6032:6032
       - 6080:6080
+<%- end -%>
     environment:
       INITIALIZE: 1
     dns:
       - 89.46.20.75
       - 89.46.21.29
       - 89.32.32.32
+<%- if !@hostnet -%>
     networks:
       - proxysql
+<%- end -%>
     restart: unless-stopped
     volumes:
       - proxysql:/var/lib/proxysql
@@ -26,6 +32,8 @@ services:
 volumes:
   proxysql:
 
+<%- if !@hostnet -%>
 networks:
   proxysql:
     driver: bridge
+<%- end -%>

templates/scriptreceiver/create_bucket.erb.sh

@@ -38,7 +38,7 @@ preexisting="$(docker exec -u www-data -i "${container}" php --define apc.enable
 if [[ -z ${preexisting} ]]; then
 	docker exec -u www-data -i "${container}" php --define apc.enable_cli=1 /var/www/html/occ files_external:create "${user_bucket_name}" \
 		amazons3 -c bucket="${bucket}" -c key="${key}" -c secret="${secret}" -c hostname="${endpoint}" -c use_ssl=true -c use_path_style=true -c region=us-east-1 \
-		amazons3::accesskey --user ${user}
+		-c useMultipartCopy=false amazons3::accesskey --user ${user}
 	for shareid in $(docker exec -u www-data -i ${container} php --define apc.enable_cli=1 /var/www/html/occ files_external:export ${user} | jq -r '.[].mount_id'); do
 		docker exec -u www-data -i ${container} php --define apc.enable_cli=1 /var/www/html/occ files_external:option ${shareid} enable_sharing true
 	done

templates/scriptreceiver/create_bucket_without_question.sh

@@ -7,7 +7,7 @@ bucket=${4}
 user=${5}
 /usr/local/bin/occ files_external:create "${bucket}" \
 	amazons3 -c bucket="${bucket}" -c key="${key}" -c secret="${secret}" -c hostname="${endpoint}" -c use_ssl=true -c use_path_style=true -c region=us-east-1 \
-	amazons3::accesskey --user "${user}"
+	-c useMultipartCopy=false amazons3::accesskey --user "${user}"
 for shareid in $(/usr/local/bin/occ files_external:export "${user}" | jq -r '.[].mount_id'); do
 	/usr/local/bin/occ files_external:option "${shareid}" enable_sharing true
 done