Drive/sunetdrive
7
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'main' into testing

Browse source
This commit is contained in:
Micke Nordin 2023-11-22 11:04:36 +01:00
parent 8cf9f0eafa b40beeb420
commit a150d23f1a
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
manifests/script.pp
View file

@ -80,6 +80,10 @@ class sunetdrive::script (
ensure => installed, ensure => installed,
provider => apt, provider => apt,
} }
package { 'xmlstarlet':
ensure => installed,
provider => apt,
}
$drive_version = '0.3.1' $drive_version = '0.3.1'
if $facts['os']['distro']['id'] == 'Debian' { if $facts['os']['distro']['id'] == 'Debian' {
$pip_cmd = 'pip3 install --break-system-packages' $pip_cmd = 'pip3 install --break-system-packages'

2
templates/script/announce.erb.sh
View file

@ -69,7 +69,7 @@ curl_cmd(){
fi fi
local admin_app_password="<%= @admin_app_password %>" local admin_app_password="<%= @admin_app_password %>"
domain="$(hostname -d)" 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}" curl_cmd "${method}" "${argument}"