From 83fcc67c915dc9aeb98e4a4995b10fb91564bc43 Mon Sep 17 00:00:00 2001 From: Rikard Danielsson Date: Mon, 3 Mar 2025 13:22:40 +0100 Subject: [PATCH 1/4] - bucketnames have to be lower case - output from occ changed so --show-password is needed now --- templates/script/makebuckets.erb.sh | 4 +++- templates/scriptreceiver/create_bucket.erb.sh | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/templates/script/makebuckets.erb.sh b/templates/script/makebuckets.erb.sh index cb9d992..7e541f2 100755 --- a/templates/script/makebuckets.erb.sh +++ b/templates/script/makebuckets.erb.sh @@ -43,9 +43,11 @@ for eppn in $(echo "${users}" | jq -r keys[]); do username=${eppn%@*} # Remove underscore from username user=${username//_/-} + # convert user to lower case for bucket naming rules + user_lower=${user,,} echo "$(date) - Check bucket status for ${eppn}" - bucketname="${user}-${site_name//./-}" + bucketname="${user_lower}-${site_name//./-}" if ! echo "${buckets}" | grep "${bucketname}" &> /dev/null; then echo "$(date) - ${eppn} has no mounts configured, adding bucket and mounts..." ${rclone} mkdir "${rcp}:${bucketname}" diff --git a/templates/scriptreceiver/create_bucket.erb.sh b/templates/scriptreceiver/create_bucket.erb.sh index c18c0b5..6a2b2f9 100755 --- a/templates/scriptreceiver/create_bucket.erb.sh +++ b/templates/scriptreceiver/create_bucket.erb.sh @@ -33,7 +33,7 @@ fi key=$(grep access_key_id "${rclone_config}" | awk '{print $3}') secret=$(grep secret_access_key "${rclone_config}"| awk '{print $3}') endpoint=$(grep endpoint "${rclone_config}" | awk '{print $3}') -preexisting="$(docker exec -u www-data -i "${container}" php --define apc.enable_cli=1 /var/www/html/occ files_external:list --output json "${user}" | jq -r '.[] | .configuration.bucket' | grep "${bucket}")" +preexisting="$(docker exec -u www-data -i "${container}" php --define apc.enable_cli=1 /var/www/html/occ files_external:list --output json --show-password "${user}" | jq -r '.[] | .configuration.bucket' | grep "${bucket}")" 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}" \ From aa6be0ce345a88943b5d3bc74866249139f7f238 Mon Sep 17 00:00:00 2001 From: Rikard Danielsson Date: Mon, 3 Mar 2025 15:39:57 +0100 Subject: [PATCH 2/4] StrictHostKeyChecking=no to avoid problems whith re-install --- templates/script/listusers.erb.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/script/listusers.erb.sh b/templates/script/listusers.erb.sh index d065ee1..cef3076 100644 --- a/templates/script/listusers.erb.sh +++ b/templates/script/listusers.erb.sh @@ -1,10 +1,10 @@ #!/bin/bash -customer="${1}" -multinode="${2}" +customer="${1}" +multinode="${2}" environment="<%= @environment %>" location="${customer}-${environment}" -userjson=$(ssh "script@${multinode}" "sudo /home/script/bin/list_users.sh nextcloud-${customer}-app-1") +userjson=$(ssh -o StrictHostKeyChecking=no "script@${multinode}" "sudo /home/script/bin/list_users.sh nextcloud-${customer}-app-1") project="statistics" bucket="drive-server-coms" base_dir="${project}:${bucket}" From d332a810b9f378fed51533d632a47fa832592105 Mon Sep 17 00:00:00 2001 From: Micke Nordin Date: Wed, 5 Mar 2025 15:38:44 +0100 Subject: [PATCH 3/4] Add webmail --- manifests/db_type.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/db_type.pp b/manifests/db_type.pp index 376334b..71b30e4 100644 --- a/manifests/db_type.pp +++ b/manifests/db_type.pp @@ -34,7 +34,7 @@ define sunetdrive::db_type( if $location =~ /^multinode/ { $from = $db_ip + $nextcloud_ip + $backup_ip + $backup_ipv6 + $db_ipv6 + $config['kube'] + $config['kube_v6'] } elsif $location == 'sunet-test' or $location == 'sunet-prod' { - $from = $db_ip + $nextcloud_ip + $backup_ip + $backup_ipv6 + $db_ipv6 + $config['imap'] + $config['imap_v6'] + $config['smtp'] + $config['smtp_v6'] + $from = $db_ip + $nextcloud_ip + $backup_ip + $backup_ipv6 + $db_ipv6 + $config['imap'] + $config['imap_v6'] + $config['smtp'] + $config['smtp_v6'] + $config['webmail'] + $config['webmail_v6'] } else { $from = $db_ip + $nextcloud_ip + $backup_ip + $backup_ipv6 + $db_ipv6 } From 33389e842a9807a8a85af4823597365ce3d0b29d Mon Sep 17 00:00:00 2001 From: Micke Nordin Date: Mon, 10 Mar 2025 14:49:29 +0100 Subject: [PATCH 4/4] Set useMultiPartCopy=true everywhere and switch to nocc --- templates/application/config.php.erb | 2 +- templates/application/remount_user_bucket_as_project.sh | 2 +- templates/scriptreceiver/create_bucket.erb.sh | 2 +- templates/scriptreceiver/create_bucket_without_question.sh | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/application/config.php.erb b/templates/application/config.php.erb index 575ac05..809cd9f 100644 --- a/templates/application/config.php.erb +++ b/templates/application/config.php.erb @@ -76,7 +76,7 @@ $CONFIG = array ( 'region' => 'us-east-1', 'hostname' => '<%= @s3_host %>', 'port' => '', - 'useMultipartCopy' => false, + 'useMultipartCopy' => true, 'objectPrefix' => 'urn:oid:', 'autocreate' => false, 'use_ssl' => true, diff --git a/templates/application/remount_user_bucket_as_project.sh b/templates/application/remount_user_bucket_as_project.sh index e5a1a7f..568574f 100755 --- a/templates/application/remount_user_bucket_as_project.sh +++ b/templates/application/remount_user_bucket_as_project.sh @@ -52,7 +52,7 @@ echo ' "region": "'${region}'", "secret": "'${secret}'", "storageClass": "", - "useMultipartCopy": false, + "useMultipartCopy": true, "use_path_style": true, "use_ssl": true }, diff --git a/templates/scriptreceiver/create_bucket.erb.sh b/templates/scriptreceiver/create_bucket.erb.sh index 6a2b2f9..eb75000 100755 --- a/templates/scriptreceiver/create_bucket.erb.sh +++ b/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 \ - -c useMultipartCopy=false amazons3::accesskey --user ${user} + -c useMultipartCopy=true 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 diff --git a/templates/scriptreceiver/create_bucket_without_question.sh b/templates/scriptreceiver/create_bucket_without_question.sh index e128360..48f9bad 100644 --- a/templates/scriptreceiver/create_bucket_without_question.sh +++ b/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 \ - -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 + -c useMultipartCopy=true amazons3::accesskey --user "${user}" +for shareid in $(/usr/local/bin/nocc files_external:export "${user}" | jq -r '.[].mount_id'); do + /usr/local/bin/nocc files_external:option "${shareid}" enable_sharing true done