Merge branch 'main' into testing

This commit is contained in:
Micke Nordin 2023-11-22 11:53:34 +01:00
commit 31b1bcb92a
2 changed files with 43 additions and 0 deletions

View file

@ -327,6 +327,13 @@ class sunetdrive::script (
group => 'root', group => 'root',
mode => '0700', mode => '0700',
} }
file { '/root/tasks/delete_announcement_with_subject.sh':
ensure => file,
content => template('sunetdrive/script/delete_announcement_with_subject.erb.sh'),
owner => 'root',
group => 'root',
mode => '0700',
}
file { '/root/tasks/backupmultinodedb.sh': file { '/root/tasks/backupmultinodedb.sh':
ensure => file, ensure => file,
content => template('sunetdrive/script/backupmultinodedb.erb.sh'), content => template('sunetdrive/script/backupmultinodedb.erb.sh'),

View file

@ -0,0 +1,36 @@
#!/bin/bash
VALID_ARGS=$(getopt -o s --long subject -- "$@")
# shellcheck disable=SC2181
if [[ ${?} -ne 0 ]]; then
exit 1;
fi
usage () {
echo "${0}: -s|--subject <subject>"
exit 1
}
eval set -- "${VALID_ARGS}"
# shellcheck disable=SC2078
while [ : ]; do
case "$1" in
-s | --subject)
subject="${2}"
shift 2
;;
*)
break
;;
esac
done
if [[ -z ${subject} ]]; then
usage
fi
fi
id=$(/root/tasks/announce.sh --get | xmlstarlet sel -t -i '//subject="'${subject}'"' -m "/ocs/data/element/id" -v .)
if [[ -n ${id} ]]; then
/root/tasks/announce.sh --delete --id "${id}"
fi