Merge branch 'main' into testing

Install xmlstarlet
Make curl silent
2023-11-22 11:04:36 +01:00 · 2023-11-22 11:04:20 +01:00 · 2023-11-22 11:01:52 +01:00
2 changed files with 5 additions and 1 deletions
--- a/manifests/script.pp
+++ b/manifests/script.pp
@ -80,6 +80,10 @@ class sunetdrive::script (
    ensure   => installed,
    provider => apt,
  }
+  package { 'xmlstarlet':
+    ensure   => installed,
+    provider => apt,
+  }
  $drive_version = '0.3.1'
  if $facts['os']['distro']['id'] == 'Debian' {
    $pip_cmd = 'pip3 install --break-system-packages'
--- a/templates/script/announce.erb.sh
+++ b/templates/script/announce.erb.sh
@ -69,7 +69,7 @@ curl_cmd(){
  fi
  local admin_app_password="<%= @admin_app_password %>"
  domain="$(hostname -d)"
-  curl -X "${method}" -u "admin:${admin_app_password}" "${payload[@]}" -H 'OCS-APIRequest: true' "https://${domain}/ocs/v2.php/apps/announcementcenter/api/v1/announcements${id}"
+  curl -s -X "${method}" -u "admin:${admin_app_password}" "${payload[@]}" -H 'OCS-APIRequest: true' "https://${domain}/ocs/v2.php/apps/announcementcenter/api/v1/announcements${id}"
 }
 curl_cmd "${method}" "${argument}"
Author	SHA1	Message	Date
Micke Nordin	a150d23f1a	Merge branch 'main' into testing	2023-11-22 11:04:36 +01:00
Micke Nordin	b40beeb420	Install xmlstarlet	2023-11-22 11:04:20 +01:00
Micke Nordin	300e877b3a	Make curl silent	2023-11-22 11:01:52 +01:00