kunsi/bundlewrap
1
0
Fork 0
Code Issues 1 Pull requests 2 Releases Activity

bundles/apt: fix metadata key mess (unattended-upgrades vs unattended_upgrades)
All checks were successful
kunsi/bundlewrap/pipeline/head This commit looks good
Details

Browse source
This commit is contained in:
Franzi 2022-01-23 05:47:42 +01:00
parent 07157b6335
commit 0ccb983b28
Signed by: kunsi
GPG key ID: 12E3D2136B818350
13 changed files with 66 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bundles/apt/files/upgrade-and-reboot.conf
View file

@ -1,3 +1,3 @@
nodename="${node.name}"
reboot_mail_to="${node.metadata.get('apt/unattended-upgrades/reboot_mail_to', '')}"
auto_reboot_enabled="${node.metadata.get('apt/unattended-upgrades/reboot-enabled', True)}"
auto_reboot_enabled="${node.metadata.get('apt/unattended-upgrades/reboot_enabled', True)}"

6
bundles/apt/metadata.py
View file

@ -1,6 +1,6 @@
defaults = {
'apt': {
'unattended_upgrades': {
'unattended-upgrades': {
'day': 5,
'hour': 21,
},
@ -21,8 +21,8 @@ defaults = {
'cron/upgrade-and-reboot'
)
def patchday(metadata):
day = metadata.get('apt/unattended_upgrades/day')
hour = metadata.get('apt/unattended_upgrades/hour')
day = metadata.get('apt/unattended-upgrades/day')
hour = metadata.get('apt/unattended-upgrades/hour')
return {
'cron': {

6
bundles/c3voc-addons/metadata.py
View file

@ -1,6 +1,6 @@
defaults = {
'apt': {
'unattended_upgrades': {
'unattended-upgrades': {
'day': 5,
'hour': 21,
},
@ -28,8 +28,8 @@ defaults = {
'cron/upgrade-and-reboot'
)
def patchday(metadata):
day = metadata.get('apt/unattended_upgrades/day')
hour = metadata.get('apt/unattended_upgrades/hour')
day = metadata.get('apt/unattended-upgrades/day')
hour = metadata.get('apt/unattended-upgrades/hour')
return {
'cron': {

2
bundles/icinga2/files/icinga2/downtimes.conf
View file

@ -9,7 +9,7 @@ object ScheduledDowntime "unattended_upgrades" {
fixed = true
ranges = {
"${days[monitored_node.metadata.get('apt/unattended_upgrades/day')]}" = "${monitored_node.metadata.get('apt/unattended_upgrades/hour')}:${monitored_node.magic_number%30}-${monitored_node.metadata.get('apt/unattended_upgrades/hour')}:${(monitored_node.magic_number%30)+30}"
"${days[monitored_node.metadata.get('apt/unattended-upgrades/day')]}" = "${monitored_node.metadata.get('apt/unattended-upgrades/hour')}:${monitored_node.magic_number%30}-${monitored_node.metadata.get('apt/unattended-upgrades/hour')}:${(monitored_node.magic_number%30)+30}"
}
child_options = "DowntimeTriggeredChildren"