From 0ded3c46aa89d84d6f8266260886cfd7c06436e3 Mon Sep 17 00:00:00 2001
From: Micke Nordin <kano@sunet.se>
Date: Mon, 10 Feb 2025 10:25:36 +0100
Subject: [PATCH] Containers changed names

---
 manifests/multinode.pp                                       | 4 ++--
 manifests/script.pp                                          | 2 +-
 templates/script/create_folders_in_singlenode_buckets.erb.sh | 2 +-
 templates/script/listusers.erb.sh                            | 2 +-
 templates/scriptreceiver/create_bucket.erb.sh                | 4 ++--
 templates/scriptreceiver/list_files_for_user.erb.sh          | 2 +-
 templates/scriptreceiver/list_users.erb.sh                   | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/manifests/multinode.pp b/manifests/multinode.pp
index f973dc9..5c4dff0 100644
--- a/manifests/multinode.pp
+++ b/manifests/multinode.pp
@@ -213,7 +213,7 @@ MACAddressPolicy=none'
   }
 #  if $nodenumber == '2' {
 #    cron { 'add_back_bucket_for_karin_nordgren':
-#      command => '(/usr/local/bin/occ nextcloud-kmh_app_1 files_external:list karin_nordgren@kmh.se  &&  /home/script/bin/create_bucket.sh nextcloud-kmh_app_1 karin_nordgren@kmh.se karin-nordgren-drive-sunet-se) || /bin/true',
+#      command => '(/usr/local/bin/occ nextcloud-kmh-app-1 files_external:list karin_nordgren@kmh.se  &&  /home/script/bin/create_bucket.sh nextcloud-kmh-app-1 karin_nordgren@kmh.se karin-nordgren-drive-sunet-se) || /bin/true',
 #      user    => 'root',
 #      minute  =>  '*/10',
 #    }
@@ -222,7 +222,7 @@ MACAddressPolicy=none'
     $customer_config_full = hiera_hash($customer)
     $customer_config = $customer_config_full[$environment]
     cron { "multinode_cron_${customer}":
-      command => "/opt/nextcloud/cron.sh nextcloud-${customer}_app_1",
+      command => "/opt/nextcloud/cron.sh nextcloud-${customer}-app-1",
       require => File['/opt/nextcloud/cron.sh'],
       user    => 'root',
       minute  =>  '*/10',
diff --git a/manifests/script.pp b/manifests/script.pp
index daa22bc..56a910d 100644
--- a/manifests/script.pp
+++ b/manifests/script.pp
@@ -388,7 +388,7 @@ class sunetdrive::script (
     $singlenodes.each | $singlenode| {
       $multinode = hiera_hash('multinode_mapping')[$singlenode]['server']
       $multinodeserver = "${multinode}.${site_name}"
-      $nccontainer = "nextcloud-${singlenode}_app_1"
+      $nccontainer = "nextcloud-${singlenode}-app-1"
 
       sunet::scriptherder::cronjob { "backup${singlenode}db":
         ensure => absent,
diff --git a/templates/script/create_folders_in_singlenode_buckets.erb.sh b/templates/script/create_folders_in_singlenode_buckets.erb.sh
index 27e1fb7..904ab58 100644
--- a/templates/script/create_folders_in_singlenode_buckets.erb.sh
+++ b/templates/script/create_folders_in_singlenode_buckets.erb.sh
@@ -5,7 +5,7 @@ shift
 include_userbuckets="${1}"
 shift
 environment="<%= @environment %>"
-container="nextcloud-${customer}_app_1"
+container="nextcloud-${customer}-app-1"
 
 yq="/usr/local/bin/yq"
 if ! [[ -x ${yq} ]]; then
diff --git a/templates/script/listusers.erb.sh b/templates/script/listusers.erb.sh
index c261e31..d065ee1 100644
--- a/templates/script/listusers.erb.sh
+++ b/templates/script/listusers.erb.sh
@@ -4,7 +4,7 @@ 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 "script@${multinode}" "sudo /home/script/bin/list_users.sh nextcloud-${customer}-app-1") 
 project="statistics"
 bucket="drive-server-coms"
 base_dir="${project}:${bucket}"
diff --git a/templates/scriptreceiver/create_bucket.erb.sh b/templates/scriptreceiver/create_bucket.erb.sh
index b5b970a..c18c0b5 100755
--- a/templates/scriptreceiver/create_bucket.erb.sh
+++ b/templates/scriptreceiver/create_bucket.erb.sh
@@ -11,7 +11,7 @@ function usage {
 	exit 1
 }
 
-if ! [[ ${container} == 'nextcloud_app_1' ]] && ! [[ ${container} =~ ^nextcloud-[a-z]*_app_1$ ]]; then
+if ! [[ ${container} == 'nextcloud_app_1' ]] && ! [[ ${container} =~ ^nextcloud-[a-z]*-app-1$ ]]; then
 	usage
 fi
 if ! [[ ${bucket} =~ ^[a-zA-Z0-9]+ ]]; then
@@ -26,7 +26,7 @@ echo "$(date): Start executing create_bucket.sh ${1} ${2} ${3}"
 
 rclone_config="/opt/nextcloud/rclone.conf"
 if [[ "${container}" != "nextcloud_app_1" ]]; then
-  customer=$(echo "${container}" | sed -e 's/^nextcloud-//' -e 's/_app_1$//')
+  customer=$(echo "${container}" | sed -e 's/^nextcloud-//' -e 's/-app-1$//')
   rclone_config="/opt/multinode/${customer}/rclone.conf"
 fi
 
diff --git a/templates/scriptreceiver/list_files_for_user.erb.sh b/templates/scriptreceiver/list_files_for_user.erb.sh
index b6e6214..4e71834 100644
--- a/templates/scriptreceiver/list_files_for_user.erb.sh
+++ b/templates/scriptreceiver/list_files_for_user.erb.sh
@@ -9,7 +9,7 @@ function usage {
 	exit 1
 }
 
-if ! [[ ${container} == 'nextcloud_app_1' ]] && ! [[ ${container} =~ ^nextcloud-[a-z]*_app_1$ ]]; then
+if ! [[ ${container} == 'nextcloud_app_1' ]] && ! [[ ${container} =~ ^nextcloud-[a-z]*-app-1$ ]]; then
 	usage
 fi
 
diff --git a/templates/scriptreceiver/list_users.erb.sh b/templates/scriptreceiver/list_users.erb.sh
index f69f3b8..3216870 100644
--- a/templates/scriptreceiver/list_users.erb.sh
+++ b/templates/scriptreceiver/list_users.erb.sh
@@ -2,7 +2,7 @@
 
 container=${1}
 
-if ! [[ ${container} == 'nextcloud_app_1' ]] && ! [[ ${container} =~ ^nextcloud-[a-z]*_app_1$ ]]; then
+if ! [[ ${container} == 'nextcloud_app_1' ]] && ! [[ ${container} =~ ^nextcloud-[a-z]*-app-1$ ]]; then
 	echo "Usage: ${0} <nextcloud container name>"
 	echo "Example : ${0} nextcloud_app_1"
 	exit 1